diff --git a/.dockerignore b/.dockerignore
index c5f51dc81c789..984013bc97e2a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,5 @@
 # macOS
-.DS_Store
+**/*.DS_Store
 
 # Visual Studio Code
 .vscode/
diff --git a/.gitattributes b/.gitattributes
index 6c73bee6f834e..becfd0ec71edf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,7 +2,5 @@
 src/tests/regress/data/** linguist-vendored
 # source test data
 scripts/source/test_data/** linguist-vendored
-# generated proto for dashboard
-dashboard/proto/gen/** linguist-generated
 # generated grafana dashboard
 grafana/risingwave-dashboard.json linguist-generated
diff --git a/.github/workflows/connector-node-integration.yml b/.github/workflows/connector-node-integration.yml
index 1b0a429006e22..dce7651cadbbf 100644
--- a/.github/workflows/connector-node-integration.yml
+++ b/.github/workflows/connector-node-integration.yml
@@ -3,7 +3,7 @@ name: Connector Node Integration tests
 on:
   push:
     branches: [main]
-    path: [java/**, proto/**]
+    paths: [java/**, proto/**]
   pull_request:
     branches: [main]
     paths: [java/**, proto/**]
diff --git a/.github/workflows/dashboard_main.yml b/.github/workflows/dashboard_main.yml
index b20fb0956d4a8..ee7e670bf4ec8 100644
--- a/.github/workflows/dashboard_main.yml
+++ b/.github/workflows/dashboard_main.yml
@@ -1,8 +1,8 @@
 name: Dashboard (main)
 on:
   push:
-    branches: [main]
-    paths: [dashboard/**]
+    branches: [ main ]
+    paths: [ dashboard/** ]
 jobs:
   dashboard-ui-deploy:
     runs-on: ubuntu-latest
@@ -11,6 +11,10 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '18'
+      - uses: arduino/setup-protoc@v1
+        with:
+          version: "3.x"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: build
         working-directory: ./dashboard
         run: |
diff --git a/.github/workflows/intergration_tests.yml b/.github/workflows/intergration_tests.yml
index 106783e792d39..033425bbb9d57 100644
--- a/.github/workflows/intergration_tests.yml
+++ b/.github/workflows/intergration_tests.yml
@@ -4,6 +4,12 @@ on:
   schedule:
   # Currently we build docker images at 12:00 (UTC), so run this at 13:00
   - cron: '0 13 * * *'
+  push:
+    branches: [main]
+    paths: [integration_tests/**]
+  pull_request:
+    branches: [main]
+    paths: [integration_tests/**]
 
 jobs:
   golangci:
diff --git a/.gitignore b/.gitignore
index 43da088879425..7766e090fb83c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # macOS
-.DS_Store
+**/*.DS_Store
 
 # Visual Studio Code
 .vscode/*
diff --git a/Cargo.lock b/Cargo.lock
index d1d774ee6437c..e1295d4674f56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -85,9 +85,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anyhow"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
 dependencies = [
  "backtrace",
 ]
@@ -333,12 +333,11 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
 dependencies = [
  "event-listener",
- "futures-lite",
 ]
 
 [[package]]
@@ -408,9 +407,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
 name = "async-trait"
-version = "0.1.64"
+version = "0.1.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"
+checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -445,32 +444,10 @@ dependencies = [
 
 [[package]]
 name = "auto_enums"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0dfe45d75158751e195799f47ea02e81f570aa24bc5ef999cdd9e888c4b5c3"
-dependencies = [
- "auto_enums_core",
- "auto_enums_derive",
-]
-
-[[package]]
-name = "auto_enums_core"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da47c46001293a2c4b744d731958be22cff408a2ab76e2279328f9713b1267b4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "auto_enums_derive"
-version = "0.7.12"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41aed1da83ecdc799503b7cb94da1b45a34d72b49caf40a61d9cf5b88ec07cfd"
+checksum = "10143e1d6fc660ac7bfc268c6ec2f9699129a3cfbb241eed50393d1562e0a4ce"
 dependencies = [
- "autocfg",
  "derive_utils",
  "proc-macro2",
  "quote",
@@ -885,13 +862,13 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd379e511536bad07447f899300aa526e9bae8e6f66dc5e5ca45d7587b7c1ec"
+checksum = "13d8068b6ccb8b34db9de397c7043f91db8b4c66414952c6db944f238c4d3db3"
 dependencies = [
  "async-trait",
  "axum-core",
- "bitflags",
+ "bitflags 1.3.2",
  "bytes",
  "futures-util",
  "http",
@@ -911,16 +888,15 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tower",
- "tower-http",
  "tower-layer",
  "tower-service",
 ]
 
 [[package]]
 name = "axum-core"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34"
+checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e"
 dependencies = [
  "async-trait",
  "bytes",
@@ -998,7 +974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce860f38082f1544a557dfa447838143e1b0bfa061c0369e407ebadf640001d1"
 dependencies = [
  "bcc-sys",
- "bitflags",
+ "bitflags 1.3.2",
  "byteorder",
  "libc",
  "socket2",
@@ -1032,6 +1008,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1"
+
 [[package]]
 name = "bk-tree"
 version = "0.4.0"
@@ -1044,9 +1026,9 @@ dependencies = [
 
 [[package]]
 name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
  "generic-array",
 ]
@@ -1112,9 +1094,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
+checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
 dependencies = [
  "memchr",
  "serde",
@@ -1128,19 +1110,20 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
 [[package]]
 name = "bytecheck"
-version = "0.6.9"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f"
+checksum = "13fe11640a23eb24562225322cd3e452b93a3d4091d62fab69c70542fcd17d1f"
 dependencies = [
  "bytecheck_derive",
  "ptr_meta",
+ "simdutf8",
 ]
 
 [[package]]
 name = "bytecheck_derive"
-version = "0.6.9"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf"
+checksum = "e31225543cb46f81a7e224762764f4a6a0f097b1db0b175f69e8065efaa42de5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1155,9 +1138,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
 
 [[package]]
 name = "byteorder"
@@ -1216,9 +1199,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6031a462f977dd38968b6f23378356512feeace69cef817e1a4475108093cec3"
+checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2"
 dependencies = [
  "serde",
 ]
@@ -1280,9 +1263,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.23"
+version = "0.4.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -1351,7 +1334,7 @@ version = "3.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "clap_lex 0.2.4",
  "indexmap",
  "textwrap",
@@ -1359,13 +1342,13 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.1.8"
+version = "4.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
+checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098"
 dependencies = [
- "bitflags",
+ "bitflags 2.0.2",
  "clap_derive",
- "clap_lex 0.3.2",
+ "clap_lex 0.3.3",
  "is-terminal",
  "once_cell",
  "strsim",
@@ -1374,9 +1357,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.1.8"
+version = "4.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0"
+checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644"
 dependencies = [
  "heck 0.4.1",
  "proc-macro-error",
@@ -1396,9 +1379,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
+checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646"
 dependencies = [
  "os_str_bytes",
 ]
@@ -1691,9 +1674,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -1701,9 +1684,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
 dependencies = [
  "cfg-if",
  "crossbeam-epoch",
@@ -1712,14 +1695,14 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset 0.8.0",
  "scopeguard",
 ]
 
@@ -1735,9 +1718,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
 dependencies = [
  "cfg-if",
 ]
@@ -1748,7 +1731,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crossterm_winapi",
  "libc",
  "mio",
@@ -1831,9 +1814,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.60+curl-7.88.1"
+version = "0.4.61+curl-8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f"
+checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79"
 dependencies = [
  "cc",
  "libc",
@@ -1846,9 +1829,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.91"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62"
+checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -1858,9 +1841,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.91"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690"
+checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -1873,15 +1856,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.91"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf"
+checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.91"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892"
+checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1900,12 +1883,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
 dependencies = [
- "darling_core 0.14.3",
- "darling_macro 0.14.3",
+ "darling_core 0.14.4",
+ "darling_macro 0.14.4",
 ]
 
 [[package]]
@@ -1924,9 +1907,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
 dependencies = [
  "fnv",
  "ident_case",
@@ -1949,11 +1932,11 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
- "darling_core 0.14.3",
+ "darling_core 0.14.4",
  "quote",
  "syn",
 ]
@@ -2057,7 +2040,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
 dependencies = [
- "darling 0.14.3",
+ "darling 0.14.4",
  "proc-macro2",
  "quote",
  "syn",
@@ -2075,9 +2058,9 @@ dependencies = [
 
 [[package]]
 name = "derive_utils"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532b4c15dccee12c7044f1fcad956e98410860b22231e44a3b827464797ca7bf"
+checksum = "7590f99468735a318c254ca9158d0c065aa9b5312896b5a043b5e39bc96f5fa2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2174,9 +2157,9 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60"
+checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
 
 [[package]]
 name = "easy-ext"
@@ -2231,18 +2214,18 @@ dependencies = [
 
 [[package]]
 name = "enum-iterator"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea166b3f7dc1032f7866d13f8d8e02c8d87507b61750176b86554964dc6a7bf"
+checksum = "706d9e7cf1c7664859d79cd524e4e53ea2b67ea03c98cc2870c5e539695d597e"
 dependencies = [
  "enum-iterator-derive",
 ]
 
 [[package]]
 name = "enum-iterator-derive"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce"
+checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2347,7 +2330,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "084632422a59165633e28f8436545a6694b3d659405ceb3be0a441d4bfbf25d1"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -2380,7 +2363,7 @@ version = "23.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77f5399c2c9c50ae9418e522842ad362f61ee48b346ac106807bd355a8a7c619"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "rustc_version",
 ]
 
@@ -2475,9 +2458,9 @@ checksum = "673464e1e314dd67a0fd9544abc99e8eb28d0c7e3b69b033bcff9b2d00b87333"
 
 [[package]]
 name = "futures"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
+checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2512,9 +2495,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
+checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2522,15 +2505,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
+checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2539,9 +2522,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
+checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91"
 
 [[package]]
 name = "futures-lite"
@@ -2560,9 +2543,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
+checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2571,15 +2554,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2"
 
 [[package]]
 name = "futures-task"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
+checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879"
 
 [[package]]
 name = "futures-timer"
@@ -2589,9 +2572,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
+checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2787,9 +2770,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
+checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
 dependencies = [
  "bytes",
  "fnv",
@@ -3004,9 +2987,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.24"
+version = "0.14.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
+checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3132,9 +3115,9 @@ dependencies = [
 
 [[package]]
 name = "indextree"
-version = "4.5.0"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497f036ac2fae75c34224648a77802e5dd4e9cfb56f4713ab6b12b7160a0523b"
+checksum = "c40411d0e5c63ef1323c3d09ce5ec6d84d71531e18daed0743fccea279d7deb6"
 
 [[package]]
 name = "indicatif"
@@ -3189,10 +3172,11 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
 dependencies = [
+ "hermit-abi 0.3.1",
  "libc",
  "windows-sys 0.45.0",
 ]
@@ -3205,9 +3189,9 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
+checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e"
 dependencies = [
  "hermit-abi 0.3.1",
  "io-lifetimes",
@@ -3259,9 +3243,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
 [[package]]
 name = "jni"
@@ -3285,9 +3269,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
 dependencies = [
  "libc",
 ]
@@ -3303,11 +3287,11 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "8.2.0"
+version = "8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828"
+checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.0",
  "pem",
  "ring",
  "serde",
@@ -3423,9 +3407,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
 
 [[package]]
 name = "libflate"
@@ -3459,7 +3443,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7b603516767d1ab23d0de09d023e62966c3322f7148297c35cf3d97aa8b37fa"
 dependencies = [
- "clap 4.1.8",
+ "clap 4.1.11",
  "termcolor",
  "threadpool",
 ]
@@ -3590,9 +3574,9 @@ dependencies = [
 
 [[package]]
 name = "madsim"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3c98b41d46214f4ae435a95e246710ad7fb1100754f809dd7c18606a7607c4"
+checksum = "c846a15d407458f1ac5da7da965810277229be9c96ed8082a3eaf2787ef81c23"
 dependencies = [
  "ahash 0.7.6",
  "async-channel",
@@ -3606,12 +3590,13 @@ dependencies = [
  "madsim-macros",
  "naive-timer",
  "rand 0.8.5",
+ "rand_xoshiro",
  "rustversion",
  "serde",
- "spin 0.9.5",
+ "spin 0.9.6",
  "tokio",
  "tokio-util",
- "toml 0.7.2",
+ "toml 0.7.3",
  "tracing",
  "tracing-subscriber",
 ]
@@ -3629,15 +3614,15 @@ dependencies = [
  "bytes",
  "http",
  "madsim",
- "spin 0.9.5",
+ "spin 0.9.6",
  "tracing",
 ]
 
 [[package]]
 name = "madsim-etcd-client"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb918383c4f5966f29760ec48820e1c2846739e4ae411c2a8aaa4466ce1421b7"
+checksum = "72b3894525ac4b7d5732b2123f9d29d018005c96a218e5a7c38d1f42601b927d"
 dependencies = [
  "etcd-client",
  "futures-util",
@@ -3645,10 +3630,10 @@ dependencies = [
  "madsim",
  "serde",
  "serde_with 2.3.1",
- "spin 0.9.5",
+ "spin 0.9.6",
  "thiserror",
  "tokio",
- "toml 0.7.2",
+ "toml 0.7.3",
  "tonic",
  "tracing",
 ]
@@ -3659,7 +3644,7 @@ version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3d248e97b1a48826a12c3828d921e8548e714394bf17274dd0a93910dc946e1"
 dependencies = [
- "darling 0.14.3",
+ "darling 0.14.4",
  "proc-macro2",
  "quote",
  "syn",
@@ -3682,7 +3667,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "slab",
- "spin 0.9.5",
+ "spin 0.9.6",
  "thiserror",
  "tokio",
  "tracing",
@@ -3700,9 +3685,9 @@ dependencies = [
 
 [[package]]
 name = "madsim-tonic"
-version = "0.2.14"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420ca55ac297f5a3555cb03fdb085e7e91b1287dd872751a6b30dd3c3573277c"
+checksum = "0a0d4e7468777e5885b6c3b88a97e3dd81547e0f3304324126c1a07ae89be470"
 dependencies = [
  "async-stream",
  "chrono",
@@ -3806,18 +3791,18 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "mime"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
@@ -3837,25 +3822,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "minitrace"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a07fdf302cc0591c97eb45939550ddaddd9962e400c20b319aa16c244cb1f16"
+checksum = "317e28b8c337ada2fd437611c241ce053d5b7f5480b79e945597996b87b1de96"
 dependencies = [
- "crossbeam",
  "futures",
  "minitrace-macro",
  "minstant",
  "once_cell",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "pin-project",
- "retain_mut",
 ]
 
 [[package]]
 name = "minitrace-jaeger"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e130c7db911742ff545bb42d4d32c360cb272204ce021c50fd1c9f89fa65cf5b"
+checksum = "7a5abe3273cd524b57b11925721595df5f8e957344c70e285a3a31c7e21523ac"
 dependencies = [
  "async-std",
  "minitrace",
@@ -3864,9 +3847,9 @@ dependencies = [
 
 [[package]]
 name = "minitrace-macro"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4132dfe6097f4a90c0bbb34be0687c38d14303dd2e74f8442ae80e9bc5a34c47"
+checksum = "77814d165883613a1846517efdc50b88fabd9c210b7ff4d3745b38b99d539652"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -3989,7 +3972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
 dependencies = [
  "autocfg",
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "memoffset 0.6.5",
@@ -4002,7 +3985,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "static_assertions",
@@ -4018,15 +4001,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nom8"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "ntapi"
 version = "0.4.0"
@@ -4186,7 +4160,7 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
- "proc-macro-crate 1.3.0",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn",
@@ -4250,9 +4224,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "opendal"
-version = "0.30.1"
+version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b63493afc5a8fb8cafbfa87118ffd0aea076935a7ae2375da9e03c1f49aaf3"
+checksum = "ecd1bedb1311f05ef3a0cf6dbeb58ee0e01e75735d74003343c802d623b4c6d2"
 dependencies = [
  "anyhow",
  "async-compat",
@@ -4283,9 +4257,9 @@ dependencies = [
 
 [[package]]
 name = "openidconnect"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a0f47b0f1499d08c4a8480c963d49c5ec77f4249c2b6869780979415f45809"
+checksum = "98dd5b7049bac4fdd2233b8c9767d42c05da8006fdb79cc903258556d2b18009"
 dependencies = [
  "base64 0.13.1",
  "chrono",
@@ -4310,11 +4284,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.45"
+version = "0.10.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -4342,18 +4316,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "111.25.0+1.1.1t"
+version = "111.25.2+1.1.1t"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6"
+checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.80"
+version = "0.9.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
+checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
 dependencies = [
  "autocfg",
  "cc",
@@ -4464,9 +4438,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "6.4.1"
+version = "6.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
 
 [[package]]
 name = "ouroboros"
@@ -4606,9 +4580,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
 
 [[package]]
 name = "path-absolutize"
@@ -4850,16 +4824,18 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "2.5.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
+checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa"
 dependencies = [
  "autocfg",
+ "bitflags 1.3.2",
  "cfg-if",
+ "concurrent-queue",
  "libc",
  "log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
+ "pin-project-lite",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -4970,6 +4946,12 @@ dependencies = [
  "getopts",
 ]
 
+[[package]]
+name = "pretty-xmlish"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a14b10003fc996819269d0f74cc1c241707eec6d53f2bba6980758977ce386"
+
 [[package]]
 name = "pretty_assertions"
 version = "1.3.0"
@@ -4984,9 +4966,9 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.1.23"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78"
+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
 dependencies = [
  "proc-macro2",
  "syn",
@@ -5003,12 +4985,12 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit 0.18.1",
+ "toml_edit",
 ]
 
 [[package]]
@@ -5056,7 +5038,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0941606b9934e2d98a3677759a971756eb821f75764d0e0d26946d08e74d9104"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "byteorder",
  "hex",
  "lazy_static",
@@ -5069,7 +5051,7 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "byteorder",
  "hex",
  "lazy_static",
@@ -5259,7 +5241,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "getopts",
  "memchr",
  "unicase",
@@ -5335,6 +5317,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.23"
@@ -5415,6 +5407,15 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rand_xoshiro"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "random-string"
 version = "1.0.0"
@@ -5426,18 +5427,18 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "10.6.1"
+version = "10.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307f7aacdbab3f0adee67d52739a1d71112cc068d6fab169ddeb18e48877fad"
+checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
 dependencies = [
  "either",
  "rayon-core",
@@ -5445,9 +5446,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.10.2"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -5489,7 +5490,7 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -5546,9 +5547,9 @@ dependencies = [
 
 [[package]]
 name = "reqsign"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4d5fefeaaa1e64f4aabb79da4ea68bf6d0e7935ad927728280d2a8e95735fc"
+checksum = "a7db6d8d2cd7fa61403d14de670f98d7cedac38143681c124943d7bb69258b3a"
 dependencies = [
  "anyhow",
  "backon",
@@ -5563,7 +5564,7 @@ dependencies = [
  "log",
  "once_cell",
  "percent-encoding",
- "quick-xml 0.27.1",
+ "quick-xml 0.28.1",
  "rand 0.8.5",
  "rsa",
  "rust-ini",
@@ -5577,9 +5578,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.14"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9"
+checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949"
 dependencies = [
  "base64 0.21.0",
  "bytes",
@@ -5657,7 +5658,7 @@ version = "0.2.0-alpha"
 dependencies = [
  "anyhow",
  "chrono",
- "clap 4.1.8",
+ "clap 4.1.11",
  "console",
  "dialoguer",
  "enum-iterator",
@@ -5703,7 +5704,7 @@ dependencies = [
 name = "risingwave_backup_cmd"
 version = "0.2.0-alpha"
 dependencies = [
- "clap 4.1.8",
+ "clap 4.1.11",
  "madsim-tokio",
  "risingwave_backup",
  "risingwave_meta",
@@ -5763,7 +5764,7 @@ dependencies = [
  "bcc",
  "bytes",
  "bytesize",
- "clap 4.1.8",
+ "clap 4.1.11",
  "futures",
  "hdrhistogram",
  "isahc",
@@ -5780,7 +5781,7 @@ dependencies = [
  "risingwave_storage",
  "serde",
  "tokio-stream",
- "toml 0.5.11",
+ "toml 0.7.3",
  "tracing",
  "tracing-opentelemetry",
  "tracing-subscriber",
@@ -5792,7 +5793,7 @@ name = "risingwave_cmd"
 version = "0.2.0-alpha"
 dependencies = [
  "anyhow",
- "clap 4.1.8",
+ "clap 4.1.11",
  "madsim-tokio",
  "risingwave_common",
  "risingwave_compactor",
@@ -5812,7 +5813,7 @@ name = "risingwave_cmd_all"
 version = "0.2.0-alpha"
 dependencies = [
  "anyhow",
- "clap 4.1.8",
+ "clap 4.1.11",
  "console",
  "madsim-tokio",
  "risingwave_common",
@@ -5840,12 +5841,12 @@ dependencies = [
  "arrow-schema",
  "async-trait",
  "auto_enums",
- "bitflags",
+ "bitflags 2.0.2",
  "byteorder",
  "bytes",
  "chrono",
  "chrono-tz",
- "clap 4.1.8",
+ "clap 4.1.11",
  "comfy-table",
  "crc32fast",
  "criterion",
@@ -5877,6 +5878,7 @@ dependencies = [
  "prost 0.11.8",
  "rand 0.8.5",
  "regex",
+ "reqwest",
  "risingwave_pb",
  "rust_decimal",
  "ryu",
@@ -5888,10 +5890,11 @@ dependencies = [
  "sysinfo",
  "tempfile",
  "thiserror",
- "toml 0.5.11",
+ "toml 0.7.3",
  "tracing",
  "twox-hash",
  "url",
+ "uuid",
  "workspace-hack",
 ]
 
@@ -5932,7 +5935,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bytes",
- "clap 4.1.8",
+ "clap 4.1.11",
  "futures",
  "itertools",
  "madsim-tokio",
@@ -5956,8 +5959,9 @@ dependencies = [
 name = "risingwave_compactor"
 version = "0.2.0-alpha"
 dependencies = [
+ "anyhow",
  "async-trait",
- "clap 4.1.8",
+ "clap 4.1.11",
  "madsim-tokio",
  "madsim-tonic",
  "prometheus",
@@ -5969,6 +5973,8 @@ dependencies = [
  "risingwave_pb",
  "risingwave_rpc_client",
  "risingwave_storage",
+ "serde",
+ "serde_json",
  "tracing",
  "workspace-hack",
 ]
@@ -5980,7 +5986,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "await-tree",
- "clap 4.1.8",
+ "clap 4.1.11",
  "either",
  "futures",
  "futures-async-stream",
@@ -6005,12 +6011,14 @@ dependencies = [
  "risingwave_storage",
  "risingwave_stream",
  "risingwave_tracing",
+ "serde",
  "serde_json",
  "tempfile",
  "tikv-jemalloc-ctl",
  "tokio-stream",
  "tower",
  "tracing",
+ "uuid",
  "workspace-hack",
 ]
 
@@ -6087,13 +6095,14 @@ dependencies = [
  "anyhow",
  "bytes",
  "chrono",
- "clap 4.1.8",
+ "clap 4.1.11",
  "comfy-table",
  "futures",
  "itertools",
  "madsim-tokio",
  "regex",
  "risingwave_common",
+ "risingwave_connector",
  "risingwave_frontend",
  "risingwave_hummock_sdk",
  "risingwave_object_store",
@@ -6109,6 +6118,21 @@ dependencies = [
  "workspace-hack",
 ]
 
+[[package]]
+name = "risingwave_e2e_extended_mode_test"
+version = "0.2.0-alpha"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "clap 4.1.11",
+ "pg_interval",
+ "rust_decimal",
+ "tokio",
+ "tokio-postgres",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "risingwave_expr"
 version = "0.2.0-alpha"
@@ -6121,6 +6145,7 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "criterion",
+ "ctor",
  "dyn-clone",
  "either",
  "futures-util",
@@ -6133,14 +6158,28 @@ dependencies = [
  "paste",
  "regex",
  "risingwave_common",
+ "risingwave_expr_macro",
  "risingwave_pb",
  "risingwave_udf",
+ "serde_json",
  "speedate",
  "static_assertions",
  "thiserror",
+ "tracing",
  "workspace-hack",
 ]
 
+[[package]]
+name = "risingwave_expr_macro"
+version = "0.1.0"
+dependencies = [
+ "itertools",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "risingwave_frontend"
 version = "0.2.0-alpha"
@@ -6153,7 +6192,7 @@ dependencies = [
  "async-trait",
  "bk-tree",
  "bytes",
- "clap 4.1.8",
+ "clap 4.1.11",
  "derivative",
  "downcast-rs",
  "dyn-clone",
@@ -6177,6 +6216,7 @@ dependencies = [
  "pgwire",
  "pin-project-lite",
  "postgres-types",
+ "pretty-xmlish",
  "prometheus",
  "rand 0.8.5",
  "risingwave_batch",
@@ -6281,7 +6321,7 @@ dependencies = [
  "aws-sdk-ec2",
  "axum",
  "bytes",
- "clap 4.1.8",
+ "clap 4.1.11",
  "crepe",
  "easy-ext",
  "either",
@@ -6315,6 +6355,7 @@ dependencies = [
  "risingwave_object_store",
  "risingwave_pb",
  "risingwave_rpc_client",
+ "risingwave_sqlparser",
  "risingwave_test_runner",
  "scopeguard",
  "serde",
@@ -6354,7 +6395,7 @@ dependencies = [
  "prometheus",
  "random-string",
  "risingwave_common",
- "spin 0.9.5",
+ "spin 0.9.6",
  "tempfile",
  "thiserror",
  "tracing",
@@ -6401,7 +6442,7 @@ name = "risingwave_regress_test"
 version = "0.2.0-alpha"
 dependencies = [
  "anyhow",
- "clap 4.1.8",
+ "clap 4.1.11",
  "madsim-tokio",
  "path-absolutize",
  "similar",
@@ -6457,7 +6498,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 4.1.8",
+ "clap 4.1.11",
  "console",
  "futures",
  "glob",
@@ -6469,6 +6510,7 @@ dependencies = [
  "madsim-rdkafka",
  "madsim-tokio",
  "paste",
+ "pin-project",
  "pretty_assertions",
  "rand 0.8.5",
  "risingwave_common",
@@ -6545,7 +6587,7 @@ version = "0.2.0-alpha"
 dependencies = [
  "anyhow",
  "chrono",
- "clap 4.1.8",
+ "clap 4.1.11",
  "itertools",
  "libtest-mimic",
  "madsim-tokio",
@@ -6568,7 +6610,7 @@ version = "0.2.0-alpha"
 dependencies = [
  "anyhow",
  "chrono",
- "clap 4.1.8",
+ "clap 4.1.11",
  "futures",
  "itertools",
  "madsim-tokio",
@@ -6578,7 +6620,7 @@ dependencies = [
  "serde_with 2.3.1",
  "tokio-postgres",
  "tokio-stream",
- "toml 0.4.10",
+ "toml 0.7.3",
  "tracing",
  "workspace-hack",
 ]
@@ -6594,6 +6636,7 @@ dependencies = [
  "bytes",
  "criterion",
  "crossbeam",
+ "darwin-libproc",
  "dashmap",
  "dyn-clone",
  "enum-as-inner",
@@ -6601,9 +6644,11 @@ dependencies = [
  "fiemap",
  "futures",
  "futures-async-stream",
+ "hex",
  "itertools",
  "libc",
  "lz4",
+ "mach",
  "madsim-tokio",
  "memcomparable",
  "minitrace",
@@ -6611,6 +6656,7 @@ dependencies = [
  "moka",
  "nix 0.25.1",
  "parking_lot 0.12.1",
+ "procfs 0.12.0",
  "prometheus",
  "prost 0.11.8",
  "rand 0.8.5",
@@ -6625,8 +6671,9 @@ dependencies = [
  "risingwave_tracing",
  "scopeguard",
  "sled",
- "spin 0.9.5",
+ "spin 0.9.6",
  "sync-point",
+ "sysinfo",
  "tempfile",
  "thiserror",
  "tokio-retry",
@@ -6691,6 +6738,7 @@ dependencies = [
  "tokio-metrics",
  "tokio-stream",
  "tracing",
+ "tracing-test",
  "workspace-hack",
 ]
 
@@ -6763,9 +6811,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
 
 [[package]]
 name = "rsa"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b3896c9b7790b70a9aa314a30e4ae114200992a19c96cbe0ca6070edd32ab8"
+checksum = "55a77d189da1fee555ad95b7e50e7457d91c0e089ec68ca69ad2989413bbdab4"
 dependencies = [
  "byteorder",
  "digest",
@@ -6829,11 +6877,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.8"
+version = "0.36.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
@@ -6876,15 +6924,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
 name = "same-file"
@@ -6919,9 +6967,9 @@ dependencies = [
 
 [[package]]
 name = "scheduled-thread-pool"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"
+checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
 dependencies = [
  "parking_lot 0.12.1",
 ]
@@ -6940,9 +6988,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scratch"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "sct"
@@ -6966,7 +7014,7 @@ version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -6985,18 +7033,18 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.156"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4"
 dependencies = [
  "serde_derive",
 ]
@@ -7013,9 +7061,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.156"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7024,9 +7072,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
 dependencies = [
  "itoa",
  "ryu",
@@ -7035,9 +7083,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341"
+checksum = "db0969fff533976baadd92e08b1d102c5a3d8a8049eadfd69d4d1e3c5b2ed189"
 dependencies = [
  "serde",
 ]
@@ -7127,7 +7175,7 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cbcd6104f8a4ab6af7f6be2a0da6be86b9de3c401f6e86bb856ab2af739232f"
 dependencies = [
- "darling 0.14.3",
+ "darling 0.14.4",
  "proc-macro2",
  "quote",
  "syn",
@@ -7135,9 +7183,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.17"
+version = "0.9.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567"
+checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10"
 dependencies = [
  "indexmap",
  "itoa",
@@ -7382,9 +7430,9 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
 
 [[package]]
 name = "socket2"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
 dependencies = [
  "libc",
  "winapi",
@@ -7408,9 +7456,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spin"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc"
+checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34"
 dependencies = [
  "lock_api",
 ]
@@ -7573,7 +7621,7 @@ version = "0.1.0"
 dependencies = [
  "futures-util",
  "madsim-tokio",
- "spin 0.9.5",
+ "spin 0.9.6",
  "thiserror",
 ]
 
@@ -7594,7 +7642,6 @@ dependencies = [
  "libc",
  "ntapi",
  "once_cell",
- "rayon",
  "winapi",
 ]
 
@@ -7642,18 +7689,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.38"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7705,12 +7752,12 @@ dependencies = [
 
 [[package]]
 name = "thrift_codec"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb61fb3d0a0af14949f3a6949b2639112e13226647112824f4d081533f9b1a8"
+checksum = "fce3200b189fd4733eb2bb22235755c8aa0361ba1c66b67db54893144d147279"
 dependencies = [
  "byteorder",
- "trackable 0.2.24",
+ "trackable",
 ]
 
 [[package]]
@@ -7820,9 +7867,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.25.0"
+version = "1.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
+checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
 dependencies = [
  "autocfg",
  "bytes",
@@ -7836,7 +7883,7 @@ dependencies = [
  "socket2",
  "tokio-macros",
  "tracing",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -7961,15 +8008,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "toml"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml"
 version = "0.5.11"
@@ -7981,22 +8019,16 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6"
+checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
 dependencies = [
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.1",
- "toml_edit 0.19.4",
+ "toml_datetime",
+ "toml_edit",
 ]
 
-[[package]]
-name = "toml_datetime"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.1"
@@ -8008,25 +8040,14 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.18.1"
+version = "0.19.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
-dependencies = [
- "indexmap",
- "nom8",
- "toml_datetime 0.5.1",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825"
+checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.1",
+ "toml_datetime",
  "winnow",
 ]
 
@@ -8105,7 +8126,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "bytes",
  "futures-core",
  "futures-util",
@@ -8119,7 +8140,6 @@ dependencies = [
  "pin-project-lite",
  "tokio",
  "tokio-util",
- "tower",
  "tower-layer",
  "tower-service",
 ]
@@ -8226,13 +8246,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "trackable"
-version = "0.2.24"
+name = "tracing-test"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98abb9e7300b9ac902cc04920945a874c1973e08c310627cc4458c04b70dd32"
+checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4"
 dependencies = [
- "trackable 1.2.0",
- "trackable_derive",
+ "lazy_static",
+ "tracing-core",
+ "tracing-subscriber",
+ "tracing-test-macro",
+]
+
+[[package]]
+name = "tracing-test-macro"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08"
+dependencies = [
+ "lazy_static",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -8279,7 +8312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
- "rand 0.7.3",
+ "rand 0.8.5",
  "static_assertions",
 ]
 
@@ -8320,15 +8353,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
 
 [[package]]
 name = "unicode-normalization"
@@ -8353,9 +8386,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2"
+checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c"
 
 [[package]]
 name = "untrusted"
@@ -8456,12 +8489,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
@@ -8607,15 +8639,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "which"
 version = "4.4.0"
@@ -8693,9 +8716,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -8708,51 +8731,51 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "winnow"
-version = "0.3.3"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658"
+checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966"
 dependencies = [
  "memchr",
 ]
@@ -8807,7 +8830,6 @@ dependencies = [
  "anyhow",
  "arrayvec",
  "auto_enums",
- "auto_enums_derive",
  "aws-sdk-s3",
  "aws-smithy-client",
  "aws-types",
@@ -8815,7 +8837,7 @@ dependencies = [
  "bytes",
  "cc",
  "chrono",
- "clap 4.1.8",
+ "clap 4.1.11",
  "combine",
  "criterion",
  "crossbeam-channel",
@@ -8872,6 +8894,7 @@ dependencies = [
  "regex-syntax",
  "reqwest",
  "ring",
+ "rust_decimal",
  "scopeguard",
  "serde",
  "serde_json",
@@ -8883,12 +8906,12 @@ dependencies = [
  "syn",
  "time 0.3.17",
  "tokio",
+ "tokio-postgres",
  "tokio-stream",
  "tokio-util",
  "tonic",
  "tonic-build",
  "tower",
- "tower-http",
  "tracing",
  "tracing-core",
  "tracing-futures",
diff --git a/Cargo.toml b/Cargo.toml
index 1be6dbbbc2884..640214a213d91 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@ members = [
   "src/connector",
   "src/ctl",
   "src/expr",
+  "src/expr/macro",
   "src/frontend",
   "src/frontend/planner_test",
   "src/java_binding",
@@ -32,6 +33,7 @@ members = [
   "src/stream",
   "src/test_runner",
   "src/tests/compaction_test",
+  "src/tests/e2e_extended_mode",
   "src/tests/regress",
   "src/tests/simulation",
   "src/tests/sqlsmith",
diff --git a/Makefile.toml b/Makefile.toml
index 3fd35d45138f5..027b1062afa88 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -22,6 +22,8 @@ env_scripts = [
   '''
 #!@duckscript
 
+set_env ENABLE_TELEMETRY "false"
+
 is_sanitizer_enabled = get_env ENABLE_SANITIZER
 is_all_in_one_enabled = get_env ENABLE_ALL_IN_ONE
 is_hdfs_backend = get_env ENABLE_HDFS
@@ -164,7 +166,7 @@ script = '''
 #!/usr/bin/env bash
 set -e
 
-if [[ -z "$1" ]]; then 
+if [[ -z "$1" ]]; then
   echo "Please pass a parameter to this script, defining which logs you want to follow"
   echo "Available logs are..."
   ls ${PREFIX_LOG}
@@ -176,7 +178,7 @@ if [[ ! -f ${PREFIX_LOG}/$1 ]]; then
   echo "Available logs are..."
   ls ${PREFIX_LOG}
   exit 1
-fi 
+fi
 
 tail -f -n 5 ${PREFIX_LOG}/$1
 '''
@@ -369,7 +371,6 @@ cp "src/risedevtool/welcome.sh" "${PREFIX_BIN}/welcome.sh"
 category = "RiseDev - Components"
 description = "Download all available components at once"
 dependencies = [
-  "download-connector",
   "download-maven",
   "download-etcd",
   "download-grafana",
@@ -441,7 +442,7 @@ alias = "playground"
 [tasks.playground]
 category = "RiseDev - Start"
 description = "Start a lite RisingWave playground using risingwave all-in-one binary"
-dependencies = ["download-connector"]
+dependencies = ["build-connector-node"]
 script = '''
 #!/usr/bin/env bash
 
@@ -588,7 +589,7 @@ description = "Run unit tests"
 [tasks.build-connector-node]
 category = "RiseDev - Components"
 dependencies = ["prepare"]
-condition = { env_set = [ "ENABLE_RW_CONNECTOR", "ENABLE_BUILD_RW_CONNECTOR"] }
+condition = { env_set = ["ENABLE_BUILD_RW_CONNECTOR"] }
 description = "Build RisingWave Connector from source"
 script = '''
 #!/usr/bin/env bash
@@ -608,24 +609,24 @@ if [[ ! -f ${TARGET_PATH} ]] || [[ ! -z ${REBUILD_CONNECTOR_NODE} ]]; then
   cd "${JAVA_DIR}"
   "${MAVEN_PATH}" --batch-mode --update-snapshots clean package -Dmaven.test.skip
 else
-  echo "Connector node was built already. Skipped. Set REBUILD_CONNECTOR_NODE=1 to enable rebuild"
+  echo "$(tput setaf 4)$(tput bold)[Reminder]$(tput sgr0) Connector node was built already, skipped build. Set $(tput setaf 4)REBUILD_CONNECTOR_NODE=1$(tput sgr0) to enable rebuild"
 fi
 rm -rf ${PREFIX_BIN}/connector-node
 mkdir -p "${PREFIX_BIN}/connector-node"
 tar xf ${TARGET_PATH} -C "${PREFIX_BIN}/connector-node"
 '''
 
-
 [tasks.sbuild]
 category = "RiseDev - Build in simulation mode"
 description = "Build in simulation mode"
 dependencies = ["warn-on-missing-tools"]
-env = { RUSTFLAGS = "-Ctarget-cpu=native --cfg tokio_unstable --cfg madsim", RUSTDOCFLAGS = "--cfg madsim", CARGO_TARGET_DIR = "target/sim" }
+env = { CARGO_TARGET_DIR = "target/sim" }
 script = """
 #!/usr/bin/env bash
 set -e
 
 cargo build \
+  --config "target.'cfg(all())'.rustflags = ['--cfg=madsim']" \
   -p risingwave_batch \
   -p risingwave_common \
   -p risingwave_compute \
@@ -644,12 +645,13 @@ cargo build \
 category = "RiseDev - Deterministic Simulation Test"
 description = "Run unit tests in deterministic simulation mode"
 dependencies = ["warn-on-missing-tools"]
-env = { RUSTFLAGS = "-Ctarget-cpu=native --cfg tokio_unstable --cfg madsim", RUSTDOCFLAGS = "--cfg madsim", CARGO_TARGET_DIR = "target/sim" }
+env = { CARGO_TARGET_DIR = "target/sim" }
 script = """
 #!/usr/bin/env bash
 set -e
 
 cargo nextest run \
+  --config "target.'cfg(all())'.rustflags = ['--cfg=madsim']" \
   -p risingwave_batch \
   -p risingwave_common \
   -p risingwave_compute \
@@ -668,12 +670,13 @@ cargo nextest run \
 category = "RiseDev - Simulation scaling tests"
 description = "Run integration scaling tests in deterministic simulation mode"
 dependencies = ["warn-on-missing-tools"]
-env = { RUSTFLAGS = "-Ctarget-cpu=native --cfg tokio_unstable --cfg madsim", RUSTDOCFLAGS = "--cfg madsim", CARGO_TARGET_DIR = "target/sim" }
+env = { CARGO_TARGET_DIR = "target/sim" }
 script = """
 #!/usr/bin/env bash
 set -e
 
 cargo nextest run \
+  --config "target.'cfg(all())'.rustflags = ['--cfg=madsim']" \
   -p risingwave_simulation \
   "$@"
 """
@@ -682,12 +685,13 @@ cargo nextest run \
 category = "RiseDev - Simulation scaling tests"
 description = "Archive integration scaling tests in deterministic simulation mode"
 dependencies = ["warn-on-missing-tools"]
-env = { RUSTFLAGS = "-Ctarget-cpu=native --cfg tokio_unstable --cfg madsim", RUSTDOCFLAGS = "--cfg madsim", CARGO_TARGET_DIR = "target/sim" }
+env = { CARGO_TARGET_DIR = "target/sim" }
 script = """
 #!/usr/bin/env bash
 set -e
 
 cargo nextest archive \
+  --config "target.'cfg(all())'.rustflags = ['--cfg=madsim']" \
   -p risingwave_simulation \
   --archive-file scale-test.tar.zst \
   "$@"
@@ -697,48 +701,58 @@ cargo nextest archive \
 category = "RiseDev - Deterministic Simulation End-to-end Test"
 description = "Run cargo check in deterministic simulation mode"
 dependencies = ["warn-on-missing-tools"]
-env = { RUSTFLAGS = "-Ctarget-cpu=native --cfg tokio_unstable --cfg madsim", RUSTDOCFLAGS = "--cfg madsim", CARGO_TARGET_DIR = "target/sim" }
+env = { CARGO_TARGET_DIR = "target/sim" }
 script = """
 #!/usr/bin/env bash
 set -e
 
-cargo check -p risingwave_simulation --all-targets "$@"
+cargo check \
+  --config "target.'cfg(all())'.rustflags = ['--cfg=madsim']" \
+  -p risingwave_simulation --all-targets "$@"
 """
 
 [tasks.sslt]
 category = "RiseDev - Deterministic Simulation End-to-end Test"
 description = "Run e2e tests in deterministic simulation mode"
 dependencies = ["warn-on-missing-tools"]
-env = { RUSTFLAGS = "-Ctarget-cpu=native --cfg tokio_unstable --cfg madsim", RUSTDOCFLAGS = "--cfg madsim", CARGO_TARGET_DIR = "target/sim" }
+env = { CARGO_TARGET_DIR = "target/sim" }
 script = """
 #!/usr/bin/env bash
 set -e
 
-cargo run -p risingwave_simulation "$@"
+cargo run \
+  --config "target.'cfg(all())'.rustflags = ['--cfg=madsim']" \
+  -p risingwave_simulation "$@"
 """
 
 [tasks.sslt-build-all]
 category = "RiseDev - Deterministic Simulation End-to-end Test"
 description = "Build deterministic simulation runner and tests"
 dependencies = ["warn-on-missing-tools"]
-env = { RUSTFLAGS = "-Ctarget-cpu=native --cfg tokio_unstable --cfg madsim", RUSTDOCFLAGS = "--cfg madsim", CARGO_TARGET_DIR = "target/sim" }
+env = { CARGO_TARGET_DIR = "target/sim" }
 script = """
 #!/usr/bin/env bash
 set -e
 
-cargo build -p risingwave_simulation --tests "$@"
+cargo build \
+  --config "target.'cfg(all())'.rustflags = ['--cfg=madsim']" \
+  -p risingwave_simulation \
+  --tests "$@"
 """
 
 [tasks.sslt-cov]
 category = "RiseDev - Deterministic Simulation End-to-end Test"
 description = "Run e2e tests in deterministic simulation mode and report code coverage"
 dependencies = ["warn-on-missing-tools"]
-env = { RUSTFLAGS = "-Ctarget-cpu=native --cfg tokio_unstable --cfg madsim", RUSTDOCFLAGS = "--cfg madsim", CARGO_TARGET_DIR = "target/sim-cov" }
+env = { CARGO_TARGET_DIR = "target/sim-cov" }
 script = """
 #!/usr/bin/env bash
 set -e
 
-cargo llvm-cov run -p risingwave_simulation --html "$@"
+cargo llvm-cov run \
+  --config "target.'cfg(all())'.rustflags = ['--cfg=madsim']" \
+  -p risingwave_simulation \
+  --html "$@"
 """
 
 [tasks.check-java]
@@ -757,7 +771,7 @@ else
 fi
 
 cd "${JAVA_DIR}"
-"${MAVEN_PATH}" spotless:check
+"${MAVEN_PATH}" spotless:check -q
 """
 
 [tasks.check-java-fix]
@@ -1054,3 +1068,14 @@ set -e
 
 cp -a .risingwave/rw-docker/* docker
 '''
+
+[tasks.generate-example-config]
+category = "misc"
+description = "Generate default config and write to src/config/example.toml"
+script = '''
+cat << EOF > src/config/example.toml
+# This file is generated by ./risedev generate-example-config
+# Check detailed comments in src/common/src/config.rs
+EOF
+cargo run --bin example-config >> src/config/example.toml
+'''
diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
index d9c8a9fee0b9d..ca8e826cbf62b 100755
--- a/ci/scripts/build.sh
+++ b/ci/scripts/build.sh
@@ -43,10 +43,11 @@ cargo build \
     -p risingwave_compaction_test \
     -p risingwave_backup_cmd \
     -p risingwave_java_binding \
+    -p risingwave_e2e_extended_mode_test \
     --features "static-link static-log-level" --profile "$profile"
 
 # the file name suffix of artifact for risingwave_java_binding is so only for linux. It is dylib for MacOS
-artifacts=(risingwave sqlsmith compaction-test backup-restore risingwave_regress_test risedev-dev delete-range-test librisingwave_java_binding.so)
+artifacts=(risingwave sqlsmith compaction-test backup-restore risingwave_regress_test risingwave_e2e_extended_mode_test risedev-dev delete-range-test librisingwave_java_binding.so)
 
 echo "--- Show link info"
 ldd target/"$target"/risingwave
diff --git a/ci/scripts/common.env.sh b/ci/scripts/common.env.sh
index 31e95d47737c9..dbaded683b351 100644
--- a/ci/scripts/common.env.sh
+++ b/ci/scripts/common.env.sh
@@ -3,6 +3,8 @@ export PROTOC_NO_VENDOR=true
 export CARGO_HOME=/risingwave/.cargo
 export RISINGWAVE_CI=true
 export RUST_BACKTRACE=1
+export ENABLE_TELEMETRY=false
+
 if [ -n "${BUILDKITE_COMMIT:-}" ]; then
   export GIT_SHA=$BUILDKITE_COMMIT
 fi
diff --git a/ci/scripts/e2e-iceberg-sink-test.sh b/ci/scripts/e2e-iceberg-sink-test.sh
index abdbd877574cb..99b417c0c4f85 100755
--- a/ci/scripts/e2e-iceberg-sink-test.sh
+++ b/ci/scripts/e2e-iceberg-sink-test.sh
@@ -25,8 +25,13 @@ echo "--- Download artifacts"
 mkdir -p target/debug
 buildkite-agent artifact download risingwave-"$profile" target/debug/
 buildkite-agent artifact download risedev-dev-"$profile" target/debug/
+buildkite-agent artifact download librisingwave_java_binding.so-"$profile" target/debug
 mv target/debug/risingwave-"$profile" target/debug/risingwave
 mv target/debug/risedev-dev-"$profile" target/debug/risedev-dev
+mv target/debug/librisingwave_java_binding.so-"$profile" target/debug/librisingwave_java_binding.so
+
+export RW_JAVA_BINDING_LIB_PATH=${PWD}/target/debug
+export RW_CONNECTOR_RPC_SINK_PAYLOAD_FORMAT=stream_chunk
 
 echo "--- Download connector node package"
 buildkite-agent artifact download risingwave-connector.tar.gz ./
@@ -45,6 +50,7 @@ cargo make pre-start-dev
 cargo make link-all-in-one-binaries
 
 echo "--- starting risingwave cluster with connector node"
+mkdir -p .risingwave/log
 ./connector-node/start-service.sh -p 50051 > .risingwave/log/connector-sink.log 2>&1 &
 cargo make ci-start ci-iceberg-test
 sleep 1
@@ -80,7 +86,7 @@ spark-3.3.1-bin-hadoop3/bin/spark-sql --packages $DEPENDENCIES \
 
 # check sink destination using shell
 if cat ./spark-output/*.csv | sort | awk -F "," '{
-if ($1 == 1 && $2 == 2 && $3 == "1-2") c1++;
+if ($1 == 1 && $2 == 50 && $3 == "1-50") c1++;
  if ($1 == 13 && $2 == 2 && $3 == "13-2") c2++;
   if ($1 == 21 && $2 == 2 && $3 == "21-2") c3++;
    if ($1 == 2 && $2 == 2 && $3 == "2-2") c4++;
diff --git a/ci/scripts/e2e-sink-test.sh b/ci/scripts/e2e-sink-test.sh
index 3e5328aa49ff3..2b481feb38de0 100755
--- a/ci/scripts/e2e-sink-test.sh
+++ b/ci/scripts/e2e-sink-test.sh
@@ -25,8 +25,14 @@ echo "--- Download artifacts"
 mkdir -p target/debug
 buildkite-agent artifact download risingwave-"$profile" target/debug/
 buildkite-agent artifact download risedev-dev-"$profile" target/debug/
+buildkite-agent artifact download librisingwave_java_binding.so-"$profile" target/debug
 mv target/debug/risingwave-"$profile" target/debug/risingwave
 mv target/debug/risedev-dev-"$profile" target/debug/risedev-dev
+mv target/debug/librisingwave_java_binding.so-"$profile" target/debug/librisingwave_java_binding.so
+
+export RW_JAVA_BINDING_LIB_PATH=${PWD}/target/debug
+# TODO: Switch to stream_chunk encoding once it's completed, and then remove json encoding as well as this env var.
+export RW_CONNECTOR_RPC_SINK_PAYLOAD_FORMAT=json
 
 echo "--- Download connector node package"
 buildkite-agent artifact download risingwave-connector.tar.gz ./
@@ -50,7 +56,7 @@ mysql --host=mysql --port=3306 -u root -p123456 -e "CREATE DATABASE IF NOT EXIST
 # grant access to `test` for ci test user
 mysql --host=mysql --port=3306 -u root -p123456 -e "GRANT ALL PRIVILEGES ON test.* TO 'mysqluser'@'%';"
 # create a table named t_remote
-mysql --host=mysql --port=3306 -u root -p123456 -e "CREATE TABLE IF NOT EXISTS test.t_remote (id INT, name VARCHAR(255), PRIMARY KEY (id));"
+mysql --host=mysql --port=3306 -u root -p123456 test < ./e2e_test/sink/remote/mysql_create_table.sql
 
 echo "--- preparing postgresql"
 
@@ -60,11 +66,15 @@ export PGPASSWORD=postgres
 psql -h db -U postgres -c "CREATE ROLE test LOGIN SUPERUSER PASSWORD 'connector';"
 createdb -h db -U postgres test
 psql -h db -U postgres -d test -c "CREATE TABLE t4 (v1 int PRIMARY KEY, v2 int);"
-psql -h db -U postgres -d test -c "CREATE TABLE t_remote (id serial PRIMARY KEY, name VARCHAR (50) NOT NULL);"
+psql -h db -U postgres -d test < ./e2e_test/sink/remote/pg_create_table.sql
 
 node_port=50051
 node_timeout=10
-./connector-node/start-service.sh -p $node_port > .risingwave/log/connector-source.log 2>&1 &
+
+echo "--- starting risingwave cluster with connector node"
+cargo make ci-start ci-1cn-1fe
+./connector-node/start-service.sh -p $node_port > .risingwave/log/connector-node.log 2>&1 &
+
 echo "waiting for connector node to start"
 start_time=$(date +%s)
 while :
@@ -83,34 +93,28 @@ do
     sleep 0.1
 done
 
-echo "--- starting risingwave cluster with connector node"
-cargo make ci-start ci-1cn-1fe
 
 echo "--- testing sinks"
 sqllogictest -p 4566 -d dev './e2e_test/sink/append_only_sink.slt'
-# sqllogictest -p 4566 -d dev './e2e_test/sink/create_sink_as.slt'
+sqllogictest -p 4566 -d dev './e2e_test/sink/create_sink_as.slt'
 sqllogictest -p 4566 -d dev './e2e_test/sink/blackhole_sink.slt'
 sleep 1
 
 # check sink destination postgres
-# sqllogictest -p 4566 -d dev './e2e_test/sink/remote/jdbc.load.slt'
-# sleep 1
-# sqllogictest -h db -p 5432 -d test './e2e_test/sink/remote/jdbc.check.pg.slt'
-# sleep 1
+sqllogictest -p 4566 -d dev './e2e_test/sink/remote/jdbc.load.slt'
+sleep 1
+sqllogictest -h db -p 5432 -d test './e2e_test/sink/remote/jdbc.check.pg.slt'
+sleep 1
 
 # check sink destination mysql using shell
-# if mysql  --host=mysql --port=3306 -u root -p123456 -sN -e "SELECT * FROM test.t_remote ORDER BY id;" | awk '{
-# if ($1 == 1 && $2 == "Alex") c1++;
-#  if ($1 == 3 && $2 == "Carl") c2++;
-#   if ($1 == 4 && $2 == "Doris") c3++;
-#    if ($1 == 5 && $2 == "Eve") c4++;
-#     if ($1 == 6 && $2 == "Frank") c5++; }
-#      END { exit !(c1 == 1 && c2 == 1 && c3 == 1 && c4 == 1 && c5 == 1); }'; then
-#   echo "mysql sink check passed"
-# else
-#   echo "The output is not as expected."
-#   exit 1
-# fi
+diff -u ./e2e_test/sink/remote/mysql_expected_result.tsv \
+<(mysql --host=mysql --port=3306 -u root -p123456 -s -N -r test -e "SELECT * FROM test.t_remote ORDER BY id")
+if [ $? -eq 0 ]; then
+  echo "mysql sink check passed"
+else
+  echo "The output is not as expected."
+  exit 1
+fi
 
 echo "--- Kill cluster"
 pkill -f connector-node
diff --git a/ci/scripts/e2e-source-test.sh b/ci/scripts/e2e-source-test.sh
index 010ee0f4ce94a..f3040da60968a 100755
--- a/ci/scripts/e2e-source-test.sh
+++ b/ci/scripts/e2e-source-test.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 source ci/scripts/common.env.sh
 
 # prepare environment
-export CONNECTOR_RPC_ENDPOINT="localhost:60061"
+export CONNECTOR_RPC_ENDPOINT="localhost:50051"
 
 while getopts 'p:' opt; do
     case ${opt} in
@@ -28,8 +28,12 @@ echo "--- Download artifacts"
 mkdir -p target/debug
 buildkite-agent artifact download risingwave-"$profile" target/debug/
 buildkite-agent artifact download risedev-dev-"$profile" target/debug/
+buildkite-agent artifact download librisingwave_java_binding.so-"$profile" target/debug
 mv target/debug/risingwave-"$profile" target/debug/risingwave
 mv target/debug/risedev-dev-"$profile" target/debug/risedev-dev
+mv target/debug/librisingwave_java_binding.so-"$profile" target/debug/librisingwave_java_binding.so
+
+export RW_JAVA_BINDING_LIB_PATH=${PWD}/target/debug
 
 
 echo "--- Download connector node package"
@@ -65,7 +69,10 @@ psql -h db -U postgres -d cdc_test < ./e2e_test/source/cdc/postgres_cdc.sql
 
 node_port=50051
 node_timeout=10
-./connector-node/start-service.sh -p $node_port > .risingwave/log/connector-source.log 2>&1 &
+
+echo "--- starting risingwave cluster with connector node"
+cargo make ci-start ci-1cn-1fe-with-recovery
+./connector-node/start-service.sh -p $node_port > .risingwave/log/connector-node.log 2>&1 &
 
 echo "waiting for connector node to start"
 start_time=$(date +%s)
@@ -84,9 +91,6 @@ do
     fi
     sleep 0.1
 done
-
-# start risingwave cluster
-cargo make ci-start ci-1cn-1fe-with-recovery
 sleep 2
 
 echo "---- mysql & postgres cdc validate test"
diff --git a/ci/scripts/run-e2e-test.sh b/ci/scripts/run-e2e-test.sh
index cc29af13c2fdf..2140503ba1915 100755
--- a/ci/scripts/run-e2e-test.sh
+++ b/ci/scripts/run-e2e-test.sh
@@ -24,12 +24,15 @@ mkdir -p target/debug
 buildkite-agent artifact download risingwave-"$profile" target/debug/
 buildkite-agent artifact download risedev-dev-"$profile" target/debug/
 buildkite-agent artifact download "e2e_test/generated/*" ./
+buildkite-agent artifact download risingwave_e2e_extended_mode_test-"$profile" target/debug/
 mv target/debug/risingwave-"$profile" target/debug/risingwave
 mv target/debug/risedev-dev-"$profile" target/debug/risedev-dev
+mv target/debug/risingwave_e2e_extended_mode_test-"$profile" target/debug/risingwave_e2e_extended_mode_test
 
 echo "--- Adjust permission"
 chmod +x ./target/debug/risingwave
 chmod +x ./target/debug/risedev-dev
+chmod +x ./target/debug/risingwave_e2e_extended_mode_test
 
 echo "--- Generate RiseDev CI config"
 cp ci/risedev-components.ci.env risedev-components.user.env
@@ -75,7 +78,10 @@ cargo make ci-kill
 echo "--- e2e, ci-3cn-1fe, extended query"
 RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
 cargo make ci-start ci-3cn-1fe
-sqllogictest -p 4566 -d dev -e postgres-extended './e2e_test/extended_query/**/*.slt'
+sqllogictest -p 4566 -d dev -e postgres-extended './e2e_test/extended_mode/**/*.slt'
+RUST_BACKTRACE=1 target/debug/risingwave_e2e_extended_mode_test --host 127.0.0.1 \
+  -p 4566 \
+  -u root 
 
 echo "--- Kill cluster"
 cargo make ci-kill
diff --git a/ci/scripts/s3-source-test-for-opendal-fs-engine.sh b/ci/scripts/s3-source-test-for-opendal-fs-engine.sh
new file mode 100755
index 0000000000000..20fd77483a7a9
--- /dev/null
+++ b/ci/scripts/s3-source-test-for-opendal-fs-engine.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source ci/scripts/common.env.sh
+
+while getopts 'p:s:' opt; do
+    case ${opt} in
+        p )
+            profile=$OPTARG
+            ;;
+        s )
+            script=$OPTARG
+            ;;
+        \? )
+            echo "Invalid Option: -$OPTARG" 1>&2
+            exit 1
+            ;;
+        : )
+            echo "Invalid option: $OPTARG requires an argument" 1>&2
+            ;;
+    esac
+done
+shift $((OPTIND -1))
+
+
+
+echo "--- Download artifacts"
+mkdir -p target/debug
+buildkite-agent artifact download risingwave-"$profile" target/debug/
+buildkite-agent artifact download risedev-dev-"$profile" target/debug/
+
+mv target/debug/risingwave-"$profile" target/debug/risingwave
+mv target/debug/risedev-dev-"$profile" target/debug/risedev-dev
+
+echo "--- Adjust permission"
+chmod +x ./target/debug/risingwave
+chmod +x ./target/debug/risedev-dev
+
+echo "--- Generate RiseDev CI config"
+cp ci/risedev-components.ci.env risedev-components.user.env
+
+echo "--- Prepare RiseDev dev cluster"
+cargo make pre-start-dev
+cargo make link-all-in-one-binaries
+
+echo "--- starting risingwave cluster with connector node"
+cargo make ci-start ci-3cn-3fe-opendal-fs-backend
+
+echo "--- Run test"
+python3 -m pip install minio psycopg2-binary
+python3 e2e_test/s3/$script.py
+
+echo "--- Kill cluster"
+rm -rf /tmp/rw_ci
+cargo make ci-kill
diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml
index 5a139ee74d819..88854253efeda 100644
--- a/ci/workflows/main-cron.yml
+++ b/ci/workflows/main-cron.yml
@@ -215,6 +215,7 @@ steps:
             - S3_SOURCE_TEST_CONF
     timeout_in_minutes: 20
     retry: *auto-retry  
+
   - label: "S3 source check on AWS (csv parser)"
     command: "ci/scripts/s3-source-test.sh -p ci-release -s run_csv"
     depends_on: build
@@ -229,4 +230,20 @@ steps:
           environment:
             - S3_SOURCE_TEST_CONF
     timeout_in_minutes: 20
+    retry: *auto-retry  
+
+  - label: "S3 source on OpenDAL fs engine"
+    command: "ci/scripts/s3-source-test-for-opendal-fs-engine.sh -p ci-release -s run"
+    depends_on: build
+    plugins:
+      - seek-oss/aws-sm#v2.3.1:
+          env:
+            S3_SOURCE_TEST_CONF: ci_s3_source_test_aws
+      - docker-compose#v4.9.0:
+          run: rw-build-env
+          config: ci/docker-compose.yml
+          mount-buildkite-agent: true
+          environment:
+            - S3_SOURCE_TEST_CONF
+    timeout_in_minutes: 20
     retry: *auto-retry  
\ No newline at end of file
diff --git a/ci/workflows/pull-request.yml b/ci/workflows/pull-request.yml
index 71cf0190dc021..3a3d147aa78d8 100644
--- a/ci/workflows/pull-request.yml
+++ b/ci/workflows/pull-request.yml
@@ -297,7 +297,7 @@ steps:
     retry: *auto-retry
 
   - label: "recovery test (deterministic simulation)"
-    command: "TEST_NUM=8 KILL_RATE=0.5 timeout 14m ci/scripts/deterministic-recovery-test.sh"
+    command: "TEST_NUM=8 KILL_RATE=0.5 timeout 20m ci/scripts/deterministic-recovery-test.sh"
     depends_on: "build-simulation"
     plugins:
       - gencer/cache#v2.4.10: *cargo-cache
@@ -312,7 +312,7 @@ steps:
       #     files: "*-junit.xml"
       #     format: "junit"
       - ./ci/plugins/upload-failure-logs
-    timeout_in_minutes: 15
+    timeout_in_minutes: 18
     retry: *auto-retry
 
   - label: "misc check"
diff --git a/dashboard/.gitignore b/dashboard/.gitignore
index 922d92a5745e8..7d340654380ed 100644
--- a/dashboard/.gitignore
+++ b/dashboard/.gitignore
@@ -16,10 +16,13 @@
 /build
 
 # misc
-.DS_Store
+**/*.DS_Store
 .env*
 
 # debug
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+# generated proto
+proto/gen
diff --git a/dashboard/README.md b/dashboard/README.md
index 5a0b9facf75a7..28a9c29f4c6e8 100644
--- a/dashboard/README.md
+++ b/dashboard/README.md
@@ -1,11 +1,15 @@
+# Dashboard
+
 The framework: [Next.js](https://nextjs.org).
 
 Next.js supports SPA, SSG and SSR. With this feature, the dashboard ui can be deployed in
+
 1. Standalone machine serving only dashboard UI with a backend. (e.g. Dashboard for cloud product)
 2. Meta service node. (e.g. Static HTML files integrated in meta service without any other dependencies like node.js)
 
 ## Files
-```
+
+```plain
 dashboard/
 --.next/ (generated by nextjs)
 --node_modules/ (development dependencies)
@@ -19,47 +23,67 @@ dashboard/
 ```
 
 ## Testing
+
 TODO: Find a suitable testing framework
 
 ## Development
+
 Start the RisingWave database, remove drop tables from `tpch_snapshot.slt`
+
 ```bash
 ./risedev d
 sqllogictest -p 4566 -d dev './e2e_test/streaming/tpch_snapshot.slt'
 ```
+
 Install Dependencies.
+
 ```bash
 npm i
 ```
+
 The website will be served at port 3000.
+
 ```bash
 npm run dev
 ```
+
 You should also run:
-```
+
+```bash
 node mock-server.js
 ```
+
 To start a mock API server when developing. You can use `fetch.sh` to update the mock APIs.
 
 ## Test with RisingWave meta node
-To replace the built static files in RisingWave with your newest code, 
+
+To replace the built static files in RisingWave with your newest code,
 run the following scripts in the root directory.
-```
+
+```bash
 ./risedev export-dashboard-v2
 ```
 
-
 ## Deployment
-#### Static HTML files
+
+### Generate the protos
+
+Running `npm i` will generate the proto files under `proto/gen` automatically. In case there are modifications to the protos, you can regenerate them using the command npm run gen-proto.
+
+### Static HTML files
+
 Build static files for standalone deployment without node.js. The built files are generated at `./out`.
 Check more details at [Static HTML Export](https://nextjs.org/docs/advanced-features/static-html-export).
+
 ```bash
 npm run build-static
 ```
 
 #### Next.js app
+
 The built files are generated at `./.next`.
+
 ```bash
 npm run build
 npm run start
-```
\ No newline at end of file
+```
diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
index 2d741cd099d19..5c5842cdca159 100644
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
@@ -4,6 +4,7 @@
   "requires": true,
   "packages": {
     "": {
+      "hasInstallScript": true,
       "dependencies": {
         "@chakra-ui/react": "^2.3.1",
         "@emotion/react": "^11.10.4",
diff --git a/dashboard/package.json b/dashboard/package.json
index dd50d36471ce6..f809ce3117097 100644
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -8,7 +8,8 @@
     "gen-proto": "./scripts/generate_proto.sh",
     "lint": "prettier --check . && next lint",
     "format": "prettier --write . && next lint --fix",
-    "mock-server": "node ./mock-server.js"
+    "mock-server": "node ./mock-server.js",
+    "postinstall": "npm run gen-proto"
   },
   "dependencies": {
     "@chakra-ui/react": "^2.3.1",
diff --git a/dashboard/proto/gen/backup_service.ts b/dashboard/proto/gen/backup_service.ts
deleted file mode 100644
index a30c09c2ae231..0000000000000
--- a/dashboard/proto/gen/backup_service.ts
+++ /dev/null
@@ -1,390 +0,0 @@
-/* eslint-disable */
-
-export const protobufPackage = "backup_service";
-
-export const BackupJobStatus = {
-  UNSPECIFIED: "UNSPECIFIED",
-  RUNNING: "RUNNING",
-  SUCCEEDED: "SUCCEEDED",
-  /**
-   * NOT_FOUND - NOT_FOUND indicates one of these cases:
-   * - Invalid job id.
-   * - Job has failed.
-   * - Job has succeeded, but its resulted backup has been deleted later.
-   */
-  NOT_FOUND: "NOT_FOUND",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type BackupJobStatus = typeof BackupJobStatus[keyof typeof BackupJobStatus];
-
-export function backupJobStatusFromJSON(object: any): BackupJobStatus {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return BackupJobStatus.UNSPECIFIED;
-    case 1:
-    case "RUNNING":
-      return BackupJobStatus.RUNNING;
-    case 2:
-    case "SUCCEEDED":
-      return BackupJobStatus.SUCCEEDED;
-    case 3:
-    case "NOT_FOUND":
-      return BackupJobStatus.NOT_FOUND;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return BackupJobStatus.UNRECOGNIZED;
-  }
-}
-
-export function backupJobStatusToJSON(object: BackupJobStatus): string {
-  switch (object) {
-    case BackupJobStatus.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case BackupJobStatus.RUNNING:
-      return "RUNNING";
-    case BackupJobStatus.SUCCEEDED:
-      return "SUCCEEDED";
-    case BackupJobStatus.NOT_FOUND:
-      return "NOT_FOUND";
-    case BackupJobStatus.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface MetaBackupManifestId {
-  id: number;
-}
-
-export interface BackupMetaRequest {
-}
-
-export interface BackupMetaResponse {
-  jobId: number;
-}
-
-export interface GetBackupJobStatusRequest {
-  jobId: number;
-}
-
-export interface GetBackupJobStatusResponse {
-  jobId: number;
-  jobStatus: BackupJobStatus;
-}
-
-export interface DeleteMetaSnapshotRequest {
-  snapshotIds: number[];
-}
-
-export interface DeleteMetaSnapshotResponse {
-}
-
-export interface GetMetaSnapshotManifestRequest {
-}
-
-export interface GetMetaSnapshotManifestResponse {
-  manifest: MetaSnapshotManifest | undefined;
-}
-
-export interface MetaSnapshotManifest {
-  manifestId: number;
-  snapshotMetadata: MetaSnapshotMetadata[];
-}
-
-export interface MetaSnapshotMetadata {
-  id: number;
-  hummockVersionId: number;
-  maxCommittedEpoch: number;
-  safeEpoch: number;
-}
-
-function createBaseMetaBackupManifestId(): MetaBackupManifestId {
-  return { id: 0 };
-}
-
-export const MetaBackupManifestId = {
-  fromJSON(object: any): MetaBackupManifestId {
-    return { id: isSet(object.id) ? Number(object.id) : 0 };
-  },
-
-  toJSON(message: MetaBackupManifestId): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MetaBackupManifestId>, I>>(object: I): MetaBackupManifestId {
-    const message = createBaseMetaBackupManifestId();
-    message.id = object.id ?? 0;
-    return message;
-  },
-};
-
-function createBaseBackupMetaRequest(): BackupMetaRequest {
-  return {};
-}
-
-export const BackupMetaRequest = {
-  fromJSON(_: any): BackupMetaRequest {
-    return {};
-  },
-
-  toJSON(_: BackupMetaRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BackupMetaRequest>, I>>(_: I): BackupMetaRequest {
-    const message = createBaseBackupMetaRequest();
-    return message;
-  },
-};
-
-function createBaseBackupMetaResponse(): BackupMetaResponse {
-  return { jobId: 0 };
-}
-
-export const BackupMetaResponse = {
-  fromJSON(object: any): BackupMetaResponse {
-    return { jobId: isSet(object.jobId) ? Number(object.jobId) : 0 };
-  },
-
-  toJSON(message: BackupMetaResponse): unknown {
-    const obj: any = {};
-    message.jobId !== undefined && (obj.jobId = Math.round(message.jobId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BackupMetaResponse>, I>>(object: I): BackupMetaResponse {
-    const message = createBaseBackupMetaResponse();
-    message.jobId = object.jobId ?? 0;
-    return message;
-  },
-};
-
-function createBaseGetBackupJobStatusRequest(): GetBackupJobStatusRequest {
-  return { jobId: 0 };
-}
-
-export const GetBackupJobStatusRequest = {
-  fromJSON(object: any): GetBackupJobStatusRequest {
-    return { jobId: isSet(object.jobId) ? Number(object.jobId) : 0 };
-  },
-
-  toJSON(message: GetBackupJobStatusRequest): unknown {
-    const obj: any = {};
-    message.jobId !== undefined && (obj.jobId = Math.round(message.jobId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetBackupJobStatusRequest>, I>>(object: I): GetBackupJobStatusRequest {
-    const message = createBaseGetBackupJobStatusRequest();
-    message.jobId = object.jobId ?? 0;
-    return message;
-  },
-};
-
-function createBaseGetBackupJobStatusResponse(): GetBackupJobStatusResponse {
-  return { jobId: 0, jobStatus: BackupJobStatus.UNSPECIFIED };
-}
-
-export const GetBackupJobStatusResponse = {
-  fromJSON(object: any): GetBackupJobStatusResponse {
-    return {
-      jobId: isSet(object.jobId) ? Number(object.jobId) : 0,
-      jobStatus: isSet(object.jobStatus) ? backupJobStatusFromJSON(object.jobStatus) : BackupJobStatus.UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: GetBackupJobStatusResponse): unknown {
-    const obj: any = {};
-    message.jobId !== undefined && (obj.jobId = Math.round(message.jobId));
-    message.jobStatus !== undefined && (obj.jobStatus = backupJobStatusToJSON(message.jobStatus));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetBackupJobStatusResponse>, I>>(object: I): GetBackupJobStatusResponse {
-    const message = createBaseGetBackupJobStatusResponse();
-    message.jobId = object.jobId ?? 0;
-    message.jobStatus = object.jobStatus ?? BackupJobStatus.UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseDeleteMetaSnapshotRequest(): DeleteMetaSnapshotRequest {
-  return { snapshotIds: [] };
-}
-
-export const DeleteMetaSnapshotRequest = {
-  fromJSON(object: any): DeleteMetaSnapshotRequest {
-    return { snapshotIds: Array.isArray(object?.snapshotIds) ? object.snapshotIds.map((e: any) => Number(e)) : [] };
-  },
-
-  toJSON(message: DeleteMetaSnapshotRequest): unknown {
-    const obj: any = {};
-    if (message.snapshotIds) {
-      obj.snapshotIds = message.snapshotIds.map((e) => Math.round(e));
-    } else {
-      obj.snapshotIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeleteMetaSnapshotRequest>, I>>(object: I): DeleteMetaSnapshotRequest {
-    const message = createBaseDeleteMetaSnapshotRequest();
-    message.snapshotIds = object.snapshotIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseDeleteMetaSnapshotResponse(): DeleteMetaSnapshotResponse {
-  return {};
-}
-
-export const DeleteMetaSnapshotResponse = {
-  fromJSON(_: any): DeleteMetaSnapshotResponse {
-    return {};
-  },
-
-  toJSON(_: DeleteMetaSnapshotResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeleteMetaSnapshotResponse>, I>>(_: I): DeleteMetaSnapshotResponse {
-    const message = createBaseDeleteMetaSnapshotResponse();
-    return message;
-  },
-};
-
-function createBaseGetMetaSnapshotManifestRequest(): GetMetaSnapshotManifestRequest {
-  return {};
-}
-
-export const GetMetaSnapshotManifestRequest = {
-  fromJSON(_: any): GetMetaSnapshotManifestRequest {
-    return {};
-  },
-
-  toJSON(_: GetMetaSnapshotManifestRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetMetaSnapshotManifestRequest>, I>>(_: I): GetMetaSnapshotManifestRequest {
-    const message = createBaseGetMetaSnapshotManifestRequest();
-    return message;
-  },
-};
-
-function createBaseGetMetaSnapshotManifestResponse(): GetMetaSnapshotManifestResponse {
-  return { manifest: undefined };
-}
-
-export const GetMetaSnapshotManifestResponse = {
-  fromJSON(object: any): GetMetaSnapshotManifestResponse {
-    return { manifest: isSet(object.manifest) ? MetaSnapshotManifest.fromJSON(object.manifest) : undefined };
-  },
-
-  toJSON(message: GetMetaSnapshotManifestResponse): unknown {
-    const obj: any = {};
-    message.manifest !== undefined &&
-      (obj.manifest = message.manifest ? MetaSnapshotManifest.toJSON(message.manifest) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetMetaSnapshotManifestResponse>, I>>(
-    object: I,
-  ): GetMetaSnapshotManifestResponse {
-    const message = createBaseGetMetaSnapshotManifestResponse();
-    message.manifest = (object.manifest !== undefined && object.manifest !== null)
-      ? MetaSnapshotManifest.fromPartial(object.manifest)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseMetaSnapshotManifest(): MetaSnapshotManifest {
-  return { manifestId: 0, snapshotMetadata: [] };
-}
-
-export const MetaSnapshotManifest = {
-  fromJSON(object: any): MetaSnapshotManifest {
-    return {
-      manifestId: isSet(object.manifestId) ? Number(object.manifestId) : 0,
-      snapshotMetadata: Array.isArray(object?.snapshotMetadata)
-        ? object.snapshotMetadata.map((e: any) => MetaSnapshotMetadata.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: MetaSnapshotManifest): unknown {
-    const obj: any = {};
-    message.manifestId !== undefined && (obj.manifestId = Math.round(message.manifestId));
-    if (message.snapshotMetadata) {
-      obj.snapshotMetadata = message.snapshotMetadata.map((e) => e ? MetaSnapshotMetadata.toJSON(e) : undefined);
-    } else {
-      obj.snapshotMetadata = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MetaSnapshotManifest>, I>>(object: I): MetaSnapshotManifest {
-    const message = createBaseMetaSnapshotManifest();
-    message.manifestId = object.manifestId ?? 0;
-    message.snapshotMetadata = object.snapshotMetadata?.map((e) => MetaSnapshotMetadata.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseMetaSnapshotMetadata(): MetaSnapshotMetadata {
-  return { id: 0, hummockVersionId: 0, maxCommittedEpoch: 0, safeEpoch: 0 };
-}
-
-export const MetaSnapshotMetadata = {
-  fromJSON(object: any): MetaSnapshotMetadata {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      hummockVersionId: isSet(object.hummockVersionId) ? Number(object.hummockVersionId) : 0,
-      maxCommittedEpoch: isSet(object.maxCommittedEpoch) ? Number(object.maxCommittedEpoch) : 0,
-      safeEpoch: isSet(object.safeEpoch) ? Number(object.safeEpoch) : 0,
-    };
-  },
-
-  toJSON(message: MetaSnapshotMetadata): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.hummockVersionId !== undefined && (obj.hummockVersionId = Math.round(message.hummockVersionId));
-    message.maxCommittedEpoch !== undefined && (obj.maxCommittedEpoch = Math.round(message.maxCommittedEpoch));
-    message.safeEpoch !== undefined && (obj.safeEpoch = Math.round(message.safeEpoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MetaSnapshotMetadata>, I>>(object: I): MetaSnapshotMetadata {
-    const message = createBaseMetaSnapshotMetadata();
-    message.id = object.id ?? 0;
-    message.hummockVersionId = object.hummockVersionId ?? 0;
-    message.maxCommittedEpoch = object.maxCommittedEpoch ?? 0;
-    message.safeEpoch = object.safeEpoch ?? 0;
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/batch_plan.ts b/dashboard/proto/gen/batch_plan.ts
deleted file mode 100644
index 73420d1086fd6..0000000000000
--- a/dashboard/proto/gen/batch_plan.ts
+++ /dev/null
@@ -1,2472 +0,0 @@
-/* eslint-disable */
-import { StreamSourceInfo } from "./catalog";
-import {
-  BatchQueryEpoch,
-  Buffer,
-  ColumnOrder,
-  Direction,
-  directionFromJSON,
-  directionToJSON,
-  HostAddress,
-  WorkerNode,
-} from "./common";
-import { IntervalUnit } from "./data";
-import { AggCall, ExprNode, ProjectSetSelectItem, TableFunction } from "./expr";
-import {
-  ColumnCatalog,
-  ColumnDesc,
-  Field,
-  JoinType,
-  joinTypeFromJSON,
-  joinTypeToJSON,
-  StorageTableDesc,
-} from "./plan_common";
-
-export const protobufPackage = "batch_plan";
-
-export interface RowSeqScanNode {
-  tableDesc: StorageTableDesc | undefined;
-  columnIds: number[];
-  /**
-   * All the ranges need to be read. i.e., they are OR'ed.
-   *
-   * Empty `scan_ranges` means full table scan.
-   */
-  scanRanges: ScanRange[];
-  /**
-   * The partition to read for scan tasks.
-   *
-   * Will be filled by the scheduler.
-   */
-  vnodeBitmap:
-    | Buffer
-    | undefined;
-  /** Whether the order on output columns should be preserved. */
-  ordered: boolean;
-  /** If along with `batch_limit`, `chunk_size` will be set. */
-  chunkSize: RowSeqScanNode_ChunkSize | undefined;
-}
-
-export interface RowSeqScanNode_ChunkSize {
-  chunkSize: number;
-}
-
-export interface SysRowSeqScanNode {
-  tableId: number;
-  columnDescs: ColumnDesc[];
-}
-
-/**
- * The range to scan, which specifies a consecutive range of the PK
- * and can represent: (Suppose there are N columns in the PK)
- * - full table scan: Should not occur. Use an empty `Vec<ScanRange>` instead.
- * - index range scan: `eq_conds` includes i (between 0 and N-1, inclusive) values,
- *     and `lower_bound` & `upper_bound` is the range for the (i+1)th column
- * - index point get: `eq_conds` includes N values, and `lower_bound` & `upper_bound` are `None`
- */
-export interface ScanRange {
-  /** The i-th element represents the value of the i-th PK column. */
-  eqConds: Uint8Array[];
-  /** The lower bound of the next PK column subsequent to those in `eq_conds`. */
-  lowerBound:
-    | ScanRange_Bound
-    | undefined;
-  /** The upper bound of the next PK column subsequent to those in `eq_conds`. */
-  upperBound: ScanRange_Bound | undefined;
-}
-
-/** `None` represent unbounded. */
-export interface ScanRange_Bound {
-  value: Uint8Array;
-  inclusive: boolean;
-}
-
-export interface SourceNode {
-  sourceId: number;
-  columns: ColumnCatalog[];
-  properties: { [key: string]: string };
-  split: Uint8Array;
-  info: StreamSourceInfo | undefined;
-}
-
-export interface SourceNode_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-export interface ProjectNode {
-  selectList: ExprNode[];
-}
-
-export interface FilterNode {
-  searchCondition: ExprNode | undefined;
-}
-
-export interface InsertNode {
-  /** Id of the table to perform inserting. */
-  tableId: number;
-  /** Version of the table. */
-  tableVersionId: number;
-  columnIndices: number[];
-  /**
-   * An optional field and will be `None` for tables without user-defined pk.
-   * The `BatchInsertExecutor` should add a column with NULL value which will
-   * be filled in streaming.
-   */
-  rowIdIndex?: number | undefined;
-  returning: boolean;
-}
-
-export interface DeleteNode {
-  /** Id of the table to perform deleting. */
-  tableId: number;
-  /** Version of the table. */
-  tableVersionId: number;
-  returning: boolean;
-}
-
-export interface UpdateNode {
-  /** Id of the table to perform updating. */
-  tableId: number;
-  /** Version of the table. */
-  tableVersionId: number;
-  exprs: ExprNode[];
-  returning: boolean;
-}
-
-export interface ValuesNode {
-  tuples: ValuesNode_ExprTuple[];
-  fields: Field[];
-}
-
-export interface ValuesNode_ExprTuple {
-  cells: ExprNode[];
-}
-
-export interface SortNode {
-  columnOrders: ColumnOrder[];
-}
-
-export interface TopNNode {
-  columnOrders: ColumnOrder[];
-  limit: number;
-  offset: number;
-  withTies: boolean;
-}
-
-export interface GroupTopNNode {
-  columnOrders: ColumnOrder[];
-  limit: number;
-  offset: number;
-  groupKey: number[];
-  withTies: boolean;
-}
-
-export interface LimitNode {
-  limit: number;
-  offset: number;
-}
-
-export interface NestedLoopJoinNode {
-  joinType: JoinType;
-  joinCond: ExprNode | undefined;
-  outputIndices: number[];
-}
-
-export interface HashAggNode {
-  groupKey: number[];
-  aggCalls: AggCall[];
-}
-
-export interface ExpandNode {
-  columnSubsets: ExpandNode_Subset[];
-}
-
-export interface ExpandNode_Subset {
-  columnIndices: number[];
-}
-
-export interface ProjectSetNode {
-  selectList: ProjectSetSelectItem[];
-}
-
-export interface SortAggNode {
-  groupKey: ExprNode[];
-  aggCalls: AggCall[];
-}
-
-export interface HashJoinNode {
-  joinType: JoinType;
-  leftKey: number[];
-  rightKey: number[];
-  condition: ExprNode | undefined;
-  outputIndices: number[];
-  /**
-   * Null safe means it treats `null = null` as true.
-   * Each key pair can be null safe independently. (left_key, right_key, null_safe)
-   */
-  nullSafe: boolean[];
-}
-
-export interface SortMergeJoinNode {
-  joinType: JoinType;
-  leftKey: number[];
-  rightKey: number[];
-  direction: Direction;
-  outputIndices: number[];
-}
-
-export interface HopWindowNode {
-  timeCol: number;
-  windowSlide: IntervalUnit | undefined;
-  windowSize: IntervalUnit | undefined;
-  outputIndices: number[];
-  windowStartExprs: ExprNode[];
-  windowEndExprs: ExprNode[];
-}
-
-export interface TableFunctionNode {
-  tableFunction: TableFunction | undefined;
-}
-
-/** Task is a running instance of Stage. */
-export interface TaskId {
-  queryId: string;
-  stageId: number;
-  taskId: number;
-}
-
-/**
- * Every task will create N buffers (channels) for parent operators to fetch results from,
- * where N is the parallelism of parent stage.
- */
-export interface TaskOutputId {
-  taskId:
-    | TaskId
-    | undefined;
-  /** The id of output channel to fetch from */
-  outputId: number;
-}
-
-export interface LocalExecutePlan {
-  plan: PlanFragment | undefined;
-  epoch: BatchQueryEpoch | undefined;
-}
-
-/** ExchangeSource describes where to read results from children operators */
-export interface ExchangeSource {
-  taskOutputId: TaskOutputId | undefined;
-  host: HostAddress | undefined;
-  localExecutePlan?: { $case: "plan"; plan: LocalExecutePlan };
-}
-
-export interface ExchangeNode {
-  sources: ExchangeSource[];
-  inputSchema: Field[];
-}
-
-export interface MergeSortExchangeNode {
-  exchange: ExchangeNode | undefined;
-  columnOrders: ColumnOrder[];
-}
-
-export interface LocalLookupJoinNode {
-  joinType: JoinType;
-  condition: ExprNode | undefined;
-  outerSideKey: number[];
-  innerSideKey: number[];
-  lookupPrefixLen: number;
-  innerSideTableDesc: StorageTableDesc | undefined;
-  innerSideVnodeMapping: number[];
-  innerSideColumnIds: number[];
-  outputIndices: number[];
-  workerNodes: WorkerNode[];
-  /**
-   * Null safe means it treats `null = null` as true.
-   * Each key pair can be null safe independently. (left_key, right_key, null_safe)
-   */
-  nullSafe: boolean[];
-}
-
-/**
- * RFC: A new schedule way for distributed lookup join
- * https://github.com/risingwavelabs/rfcs/pull/6
- */
-export interface DistributedLookupJoinNode {
-  joinType: JoinType;
-  condition: ExprNode | undefined;
-  outerSideKey: number[];
-  innerSideKey: number[];
-  lookupPrefixLen: number;
-  innerSideTableDesc: StorageTableDesc | undefined;
-  innerSideColumnIds: number[];
-  outputIndices: number[];
-  /**
-   * Null safe means it treats `null = null` as true.
-   * Each key pair can be null safe independently. (left_key, right_key, null_safe)
-   */
-  nullSafe: boolean[];
-}
-
-export interface UnionNode {
-}
-
-export interface PlanNode {
-  children: PlanNode[];
-  nodeBody?:
-    | { $case: "insert"; insert: InsertNode }
-    | { $case: "delete"; delete: DeleteNode }
-    | { $case: "update"; update: UpdateNode }
-    | { $case: "project"; project: ProjectNode }
-    | { $case: "hashAgg"; hashAgg: HashAggNode }
-    | { $case: "filter"; filter: FilterNode }
-    | { $case: "exchange"; exchange: ExchangeNode }
-    | { $case: "sort"; sort: SortNode }
-    | { $case: "nestedLoopJoin"; nestedLoopJoin: NestedLoopJoinNode }
-    | { $case: "topN"; topN: TopNNode }
-    | { $case: "sortAgg"; sortAgg: SortAggNode }
-    | { $case: "rowSeqScan"; rowSeqScan: RowSeqScanNode }
-    | { $case: "limit"; limit: LimitNode }
-    | { $case: "values"; values: ValuesNode }
-    | { $case: "hashJoin"; hashJoin: HashJoinNode }
-    | { $case: "mergeSortExchange"; mergeSortExchange: MergeSortExchangeNode }
-    | { $case: "hopWindow"; hopWindow: HopWindowNode }
-    | { $case: "tableFunction"; tableFunction: TableFunctionNode }
-    | { $case: "sysRowSeqScan"; sysRowSeqScan: SysRowSeqScanNode }
-    | { $case: "expand"; expand: ExpandNode }
-    | { $case: "localLookupJoin"; localLookupJoin: LocalLookupJoinNode }
-    | { $case: "projectSet"; projectSet: ProjectSetNode }
-    | { $case: "union"; union: UnionNode }
-    | { $case: "groupTopN"; groupTopN: GroupTopNNode }
-    | { $case: "distributedLookupJoin"; distributedLookupJoin: DistributedLookupJoinNode }
-    | { $case: "source"; source: SourceNode };
-  identity: string;
-}
-
-/**
- * ExchangeInfo determines how to distribute results to tasks of next stage.
- *
- * Note that the fragment itself does not know the where are the receivers. Instead, it prepares results in
- * N buffers and wait for parent operators (`Exchange` nodes) to pull data from a specified buffer
- */
-export interface ExchangeInfo {
-  mode: ExchangeInfo_DistributionMode;
-  distribution?: { $case: "broadcastInfo"; broadcastInfo: ExchangeInfo_BroadcastInfo } | {
-    $case: "hashInfo";
-    hashInfo: ExchangeInfo_HashInfo;
-  } | { $case: "consistentHashInfo"; consistentHashInfo: ExchangeInfo_ConsistentHashInfo };
-}
-
-export const ExchangeInfo_DistributionMode = {
-  /** UNSPECIFIED - No partitioning at all, used for root segment which aggregates query results */
-  UNSPECIFIED: "UNSPECIFIED",
-  SINGLE: "SINGLE",
-  BROADCAST: "BROADCAST",
-  HASH: "HASH",
-  CONSISTENT_HASH: "CONSISTENT_HASH",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type ExchangeInfo_DistributionMode =
-  typeof ExchangeInfo_DistributionMode[keyof typeof ExchangeInfo_DistributionMode];
-
-export function exchangeInfo_DistributionModeFromJSON(object: any): ExchangeInfo_DistributionMode {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return ExchangeInfo_DistributionMode.UNSPECIFIED;
-    case 1:
-    case "SINGLE":
-      return ExchangeInfo_DistributionMode.SINGLE;
-    case 2:
-    case "BROADCAST":
-      return ExchangeInfo_DistributionMode.BROADCAST;
-    case 3:
-    case "HASH":
-      return ExchangeInfo_DistributionMode.HASH;
-    case 4:
-    case "CONSISTENT_HASH":
-      return ExchangeInfo_DistributionMode.CONSISTENT_HASH;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return ExchangeInfo_DistributionMode.UNRECOGNIZED;
-  }
-}
-
-export function exchangeInfo_DistributionModeToJSON(object: ExchangeInfo_DistributionMode): string {
-  switch (object) {
-    case ExchangeInfo_DistributionMode.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case ExchangeInfo_DistributionMode.SINGLE:
-      return "SINGLE";
-    case ExchangeInfo_DistributionMode.BROADCAST:
-      return "BROADCAST";
-    case ExchangeInfo_DistributionMode.HASH:
-      return "HASH";
-    case ExchangeInfo_DistributionMode.CONSISTENT_HASH:
-      return "CONSISTENT_HASH";
-    case ExchangeInfo_DistributionMode.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface ExchangeInfo_BroadcastInfo {
-  count: number;
-}
-
-export interface ExchangeInfo_HashInfo {
-  outputCount: number;
-  key: number[];
-}
-
-export interface ExchangeInfo_ConsistentHashInfo {
-  /** `vmap` maps virtual node to down stream task id */
-  vmap: number[];
-  key: number[];
-}
-
-export interface PlanFragment {
-  root: PlanNode | undefined;
-  exchangeInfo: ExchangeInfo | undefined;
-}
-
-function createBaseRowSeqScanNode(): RowSeqScanNode {
-  return {
-    tableDesc: undefined,
-    columnIds: [],
-    scanRanges: [],
-    vnodeBitmap: undefined,
-    ordered: false,
-    chunkSize: undefined,
-  };
-}
-
-export const RowSeqScanNode = {
-  fromJSON(object: any): RowSeqScanNode {
-    return {
-      tableDesc: isSet(object.tableDesc) ? StorageTableDesc.fromJSON(object.tableDesc) : undefined,
-      columnIds: Array.isArray(object?.columnIds) ? object.columnIds.map((e: any) => Number(e)) : [],
-      scanRanges: Array.isArray(object?.scanRanges) ? object.scanRanges.map((e: any) => ScanRange.fromJSON(e)) : [],
-      vnodeBitmap: isSet(object.vnodeBitmap) ? Buffer.fromJSON(object.vnodeBitmap) : undefined,
-      ordered: isSet(object.ordered) ? Boolean(object.ordered) : false,
-      chunkSize: isSet(object.chunkSize) ? RowSeqScanNode_ChunkSize.fromJSON(object.chunkSize) : undefined,
-    };
-  },
-
-  toJSON(message: RowSeqScanNode): unknown {
-    const obj: any = {};
-    message.tableDesc !== undefined &&
-      (obj.tableDesc = message.tableDesc ? StorageTableDesc.toJSON(message.tableDesc) : undefined);
-    if (message.columnIds) {
-      obj.columnIds = message.columnIds.map((e) => Math.round(e));
-    } else {
-      obj.columnIds = [];
-    }
-    if (message.scanRanges) {
-      obj.scanRanges = message.scanRanges.map((e) => e ? ScanRange.toJSON(e) : undefined);
-    } else {
-      obj.scanRanges = [];
-    }
-    message.vnodeBitmap !== undefined &&
-      (obj.vnodeBitmap = message.vnodeBitmap ? Buffer.toJSON(message.vnodeBitmap) : undefined);
-    message.ordered !== undefined && (obj.ordered = message.ordered);
-    message.chunkSize !== undefined &&
-      (obj.chunkSize = message.chunkSize ? RowSeqScanNode_ChunkSize.toJSON(message.chunkSize) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RowSeqScanNode>, I>>(object: I): RowSeqScanNode {
-    const message = createBaseRowSeqScanNode();
-    message.tableDesc = (object.tableDesc !== undefined && object.tableDesc !== null)
-      ? StorageTableDesc.fromPartial(object.tableDesc)
-      : undefined;
-    message.columnIds = object.columnIds?.map((e) => e) || [];
-    message.scanRanges = object.scanRanges?.map((e) => ScanRange.fromPartial(e)) || [];
-    message.vnodeBitmap = (object.vnodeBitmap !== undefined && object.vnodeBitmap !== null)
-      ? Buffer.fromPartial(object.vnodeBitmap)
-      : undefined;
-    message.ordered = object.ordered ?? false;
-    message.chunkSize = (object.chunkSize !== undefined && object.chunkSize !== null)
-      ? RowSeqScanNode_ChunkSize.fromPartial(object.chunkSize)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseRowSeqScanNode_ChunkSize(): RowSeqScanNode_ChunkSize {
-  return { chunkSize: 0 };
-}
-
-export const RowSeqScanNode_ChunkSize = {
-  fromJSON(object: any): RowSeqScanNode_ChunkSize {
-    return { chunkSize: isSet(object.chunkSize) ? Number(object.chunkSize) : 0 };
-  },
-
-  toJSON(message: RowSeqScanNode_ChunkSize): unknown {
-    const obj: any = {};
-    message.chunkSize !== undefined && (obj.chunkSize = Math.round(message.chunkSize));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RowSeqScanNode_ChunkSize>, I>>(object: I): RowSeqScanNode_ChunkSize {
-    const message = createBaseRowSeqScanNode_ChunkSize();
-    message.chunkSize = object.chunkSize ?? 0;
-    return message;
-  },
-};
-
-function createBaseSysRowSeqScanNode(): SysRowSeqScanNode {
-  return { tableId: 0, columnDescs: [] };
-}
-
-export const SysRowSeqScanNode = {
-  fromJSON(object: any): SysRowSeqScanNode {
-    return {
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      columnDescs: Array.isArray(object?.columnDescs) ? object.columnDescs.map((e: any) => ColumnDesc.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: SysRowSeqScanNode): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    if (message.columnDescs) {
-      obj.columnDescs = message.columnDescs.map((e) => e ? ColumnDesc.toJSON(e) : undefined);
-    } else {
-      obj.columnDescs = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SysRowSeqScanNode>, I>>(object: I): SysRowSeqScanNode {
-    const message = createBaseSysRowSeqScanNode();
-    message.tableId = object.tableId ?? 0;
-    message.columnDescs = object.columnDescs?.map((e) => ColumnDesc.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseScanRange(): ScanRange {
-  return { eqConds: [], lowerBound: undefined, upperBound: undefined };
-}
-
-export const ScanRange = {
-  fromJSON(object: any): ScanRange {
-    return {
-      eqConds: Array.isArray(object?.eqConds) ? object.eqConds.map((e: any) => bytesFromBase64(e)) : [],
-      lowerBound: isSet(object.lowerBound) ? ScanRange_Bound.fromJSON(object.lowerBound) : undefined,
-      upperBound: isSet(object.upperBound) ? ScanRange_Bound.fromJSON(object.upperBound) : undefined,
-    };
-  },
-
-  toJSON(message: ScanRange): unknown {
-    const obj: any = {};
-    if (message.eqConds) {
-      obj.eqConds = message.eqConds.map((e) => base64FromBytes(e !== undefined ? e : new Uint8Array()));
-    } else {
-      obj.eqConds = [];
-    }
-    message.lowerBound !== undefined &&
-      (obj.lowerBound = message.lowerBound ? ScanRange_Bound.toJSON(message.lowerBound) : undefined);
-    message.upperBound !== undefined &&
-      (obj.upperBound = message.upperBound ? ScanRange_Bound.toJSON(message.upperBound) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ScanRange>, I>>(object: I): ScanRange {
-    const message = createBaseScanRange();
-    message.eqConds = object.eqConds?.map((e) => e) || [];
-    message.lowerBound = (object.lowerBound !== undefined && object.lowerBound !== null)
-      ? ScanRange_Bound.fromPartial(object.lowerBound)
-      : undefined;
-    message.upperBound = (object.upperBound !== undefined && object.upperBound !== null)
-      ? ScanRange_Bound.fromPartial(object.upperBound)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseScanRange_Bound(): ScanRange_Bound {
-  return { value: new Uint8Array(), inclusive: false };
-}
-
-export const ScanRange_Bound = {
-  fromJSON(object: any): ScanRange_Bound {
-    return {
-      value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array(),
-      inclusive: isSet(object.inclusive) ? Boolean(object.inclusive) : false,
-    };
-  },
-
-  toJSON(message: ScanRange_Bound): unknown {
-    const obj: any = {};
-    message.value !== undefined &&
-      (obj.value = base64FromBytes(message.value !== undefined ? message.value : new Uint8Array()));
-    message.inclusive !== undefined && (obj.inclusive = message.inclusive);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ScanRange_Bound>, I>>(object: I): ScanRange_Bound {
-    const message = createBaseScanRange_Bound();
-    message.value = object.value ?? new Uint8Array();
-    message.inclusive = object.inclusive ?? false;
-    return message;
-  },
-};
-
-function createBaseSourceNode(): SourceNode {
-  return { sourceId: 0, columns: [], properties: {}, split: new Uint8Array(), info: undefined };
-}
-
-export const SourceNode = {
-  fromJSON(object: any): SourceNode {
-    return {
-      sourceId: isSet(object.sourceId) ? Number(object.sourceId) : 0,
-      columns: Array.isArray(object?.columns) ? object.columns.map((e: any) => ColumnCatalog.fromJSON(e)) : [],
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-      split: isSet(object.split) ? bytesFromBase64(object.split) : new Uint8Array(),
-      info: isSet(object.info) ? StreamSourceInfo.fromJSON(object.info) : undefined,
-    };
-  },
-
-  toJSON(message: SourceNode): unknown {
-    const obj: any = {};
-    message.sourceId !== undefined && (obj.sourceId = Math.round(message.sourceId));
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? ColumnCatalog.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    message.split !== undefined &&
-      (obj.split = base64FromBytes(message.split !== undefined ? message.split : new Uint8Array()));
-    message.info !== undefined && (obj.info = message.info ? StreamSourceInfo.toJSON(message.info) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SourceNode>, I>>(object: I): SourceNode {
-    const message = createBaseSourceNode();
-    message.sourceId = object.sourceId ?? 0;
-    message.columns = object.columns?.map((e) => ColumnCatalog.fromPartial(e)) || [];
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.split = object.split ?? new Uint8Array();
-    message.info = (object.info !== undefined && object.info !== null)
-      ? StreamSourceInfo.fromPartial(object.info)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSourceNode_PropertiesEntry(): SourceNode_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const SourceNode_PropertiesEntry = {
-  fromJSON(object: any): SourceNode_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: SourceNode_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SourceNode_PropertiesEntry>, I>>(object: I): SourceNode_PropertiesEntry {
-    const message = createBaseSourceNode_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseProjectNode(): ProjectNode {
-  return { selectList: [] };
-}
-
-export const ProjectNode = {
-  fromJSON(object: any): ProjectNode {
-    return {
-      selectList: Array.isArray(object?.selectList) ? object.selectList.map((e: any) => ExprNode.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: ProjectNode): unknown {
-    const obj: any = {};
-    if (message.selectList) {
-      obj.selectList = message.selectList.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.selectList = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ProjectNode>, I>>(object: I): ProjectNode {
-    const message = createBaseProjectNode();
-    message.selectList = object.selectList?.map((e) => ExprNode.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseFilterNode(): FilterNode {
-  return { searchCondition: undefined };
-}
-
-export const FilterNode = {
-  fromJSON(object: any): FilterNode {
-    return { searchCondition: isSet(object.searchCondition) ? ExprNode.fromJSON(object.searchCondition) : undefined };
-  },
-
-  toJSON(message: FilterNode): unknown {
-    const obj: any = {};
-    message.searchCondition !== undefined &&
-      (obj.searchCondition = message.searchCondition ? ExprNode.toJSON(message.searchCondition) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<FilterNode>, I>>(object: I): FilterNode {
-    const message = createBaseFilterNode();
-    message.searchCondition = (object.searchCondition !== undefined && object.searchCondition !== null)
-      ? ExprNode.fromPartial(object.searchCondition)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseInsertNode(): InsertNode {
-  return { tableId: 0, tableVersionId: 0, columnIndices: [], rowIdIndex: undefined, returning: false };
-}
-
-export const InsertNode = {
-  fromJSON(object: any): InsertNode {
-    return {
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      tableVersionId: isSet(object.tableVersionId) ? Number(object.tableVersionId) : 0,
-      columnIndices: Array.isArray(object?.columnIndices) ? object.columnIndices.map((e: any) => Number(e)) : [],
-      rowIdIndex: isSet(object.rowIdIndex) ? Number(object.rowIdIndex) : undefined,
-      returning: isSet(object.returning) ? Boolean(object.returning) : false,
-    };
-  },
-
-  toJSON(message: InsertNode): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    message.tableVersionId !== undefined && (obj.tableVersionId = Math.round(message.tableVersionId));
-    if (message.columnIndices) {
-      obj.columnIndices = message.columnIndices.map((e) => Math.round(e));
-    } else {
-      obj.columnIndices = [];
-    }
-    message.rowIdIndex !== undefined && (obj.rowIdIndex = Math.round(message.rowIdIndex));
-    message.returning !== undefined && (obj.returning = message.returning);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<InsertNode>, I>>(object: I): InsertNode {
-    const message = createBaseInsertNode();
-    message.tableId = object.tableId ?? 0;
-    message.tableVersionId = object.tableVersionId ?? 0;
-    message.columnIndices = object.columnIndices?.map((e) => e) || [];
-    message.rowIdIndex = object.rowIdIndex ?? undefined;
-    message.returning = object.returning ?? false;
-    return message;
-  },
-};
-
-function createBaseDeleteNode(): DeleteNode {
-  return { tableId: 0, tableVersionId: 0, returning: false };
-}
-
-export const DeleteNode = {
-  fromJSON(object: any): DeleteNode {
-    return {
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      tableVersionId: isSet(object.tableVersionId) ? Number(object.tableVersionId) : 0,
-      returning: isSet(object.returning) ? Boolean(object.returning) : false,
-    };
-  },
-
-  toJSON(message: DeleteNode): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    message.tableVersionId !== undefined && (obj.tableVersionId = Math.round(message.tableVersionId));
-    message.returning !== undefined && (obj.returning = message.returning);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeleteNode>, I>>(object: I): DeleteNode {
-    const message = createBaseDeleteNode();
-    message.tableId = object.tableId ?? 0;
-    message.tableVersionId = object.tableVersionId ?? 0;
-    message.returning = object.returning ?? false;
-    return message;
-  },
-};
-
-function createBaseUpdateNode(): UpdateNode {
-  return { tableId: 0, tableVersionId: 0, exprs: [], returning: false };
-}
-
-export const UpdateNode = {
-  fromJSON(object: any): UpdateNode {
-    return {
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      tableVersionId: isSet(object.tableVersionId) ? Number(object.tableVersionId) : 0,
-      exprs: Array.isArray(object?.exprs) ? object.exprs.map((e: any) => ExprNode.fromJSON(e)) : [],
-      returning: isSet(object.returning) ? Boolean(object.returning) : false,
-    };
-  },
-
-  toJSON(message: UpdateNode): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    message.tableVersionId !== undefined && (obj.tableVersionId = Math.round(message.tableVersionId));
-    if (message.exprs) {
-      obj.exprs = message.exprs.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.exprs = [];
-    }
-    message.returning !== undefined && (obj.returning = message.returning);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateNode>, I>>(object: I): UpdateNode {
-    const message = createBaseUpdateNode();
-    message.tableId = object.tableId ?? 0;
-    message.tableVersionId = object.tableVersionId ?? 0;
-    message.exprs = object.exprs?.map((e) => ExprNode.fromPartial(e)) || [];
-    message.returning = object.returning ?? false;
-    return message;
-  },
-};
-
-function createBaseValuesNode(): ValuesNode {
-  return { tuples: [], fields: [] };
-}
-
-export const ValuesNode = {
-  fromJSON(object: any): ValuesNode {
-    return {
-      tuples: Array.isArray(object?.tuples) ? object.tuples.map((e: any) => ValuesNode_ExprTuple.fromJSON(e)) : [],
-      fields: Array.isArray(object?.fields) ? object.fields.map((e: any) => Field.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: ValuesNode): unknown {
-    const obj: any = {};
-    if (message.tuples) {
-      obj.tuples = message.tuples.map((e) => e ? ValuesNode_ExprTuple.toJSON(e) : undefined);
-    } else {
-      obj.tuples = [];
-    }
-    if (message.fields) {
-      obj.fields = message.fields.map((e) => e ? Field.toJSON(e) : undefined);
-    } else {
-      obj.fields = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ValuesNode>, I>>(object: I): ValuesNode {
-    const message = createBaseValuesNode();
-    message.tuples = object.tuples?.map((e) => ValuesNode_ExprTuple.fromPartial(e)) || [];
-    message.fields = object.fields?.map((e) => Field.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseValuesNode_ExprTuple(): ValuesNode_ExprTuple {
-  return { cells: [] };
-}
-
-export const ValuesNode_ExprTuple = {
-  fromJSON(object: any): ValuesNode_ExprTuple {
-    return { cells: Array.isArray(object?.cells) ? object.cells.map((e: any) => ExprNode.fromJSON(e)) : [] };
-  },
-
-  toJSON(message: ValuesNode_ExprTuple): unknown {
-    const obj: any = {};
-    if (message.cells) {
-      obj.cells = message.cells.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.cells = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ValuesNode_ExprTuple>, I>>(object: I): ValuesNode_ExprTuple {
-    const message = createBaseValuesNode_ExprTuple();
-    message.cells = object.cells?.map((e) => ExprNode.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseSortNode(): SortNode {
-  return { columnOrders: [] };
-}
-
-export const SortNode = {
-  fromJSON(object: any): SortNode {
-    return {
-      columnOrders: Array.isArray(object?.columnOrders)
-        ? object.columnOrders.map((e: any) => ColumnOrder.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: SortNode): unknown {
-    const obj: any = {};
-    if (message.columnOrders) {
-      obj.columnOrders = message.columnOrders.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.columnOrders = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SortNode>, I>>(object: I): SortNode {
-    const message = createBaseSortNode();
-    message.columnOrders = object.columnOrders?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseTopNNode(): TopNNode {
-  return { columnOrders: [], limit: 0, offset: 0, withTies: false };
-}
-
-export const TopNNode = {
-  fromJSON(object: any): TopNNode {
-    return {
-      columnOrders: Array.isArray(object?.columnOrders)
-        ? object.columnOrders.map((e: any) => ColumnOrder.fromJSON(e))
-        : [],
-      limit: isSet(object.limit) ? Number(object.limit) : 0,
-      offset: isSet(object.offset) ? Number(object.offset) : 0,
-      withTies: isSet(object.withTies) ? Boolean(object.withTies) : false,
-    };
-  },
-
-  toJSON(message: TopNNode): unknown {
-    const obj: any = {};
-    if (message.columnOrders) {
-      obj.columnOrders = message.columnOrders.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.columnOrders = [];
-    }
-    message.limit !== undefined && (obj.limit = Math.round(message.limit));
-    message.offset !== undefined && (obj.offset = Math.round(message.offset));
-    message.withTies !== undefined && (obj.withTies = message.withTies);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TopNNode>, I>>(object: I): TopNNode {
-    const message = createBaseTopNNode();
-    message.columnOrders = object.columnOrders?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.limit = object.limit ?? 0;
-    message.offset = object.offset ?? 0;
-    message.withTies = object.withTies ?? false;
-    return message;
-  },
-};
-
-function createBaseGroupTopNNode(): GroupTopNNode {
-  return { columnOrders: [], limit: 0, offset: 0, groupKey: [], withTies: false };
-}
-
-export const GroupTopNNode = {
-  fromJSON(object: any): GroupTopNNode {
-    return {
-      columnOrders: Array.isArray(object?.columnOrders)
-        ? object.columnOrders.map((e: any) => ColumnOrder.fromJSON(e))
-        : [],
-      limit: isSet(object.limit) ? Number(object.limit) : 0,
-      offset: isSet(object.offset) ? Number(object.offset) : 0,
-      groupKey: Array.isArray(object?.groupKey)
-        ? object.groupKey.map((e: any) => Number(e))
-        : [],
-      withTies: isSet(object.withTies) ? Boolean(object.withTies) : false,
-    };
-  },
-
-  toJSON(message: GroupTopNNode): unknown {
-    const obj: any = {};
-    if (message.columnOrders) {
-      obj.columnOrders = message.columnOrders.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.columnOrders = [];
-    }
-    message.limit !== undefined && (obj.limit = Math.round(message.limit));
-    message.offset !== undefined && (obj.offset = Math.round(message.offset));
-    if (message.groupKey) {
-      obj.groupKey = message.groupKey.map((e) => Math.round(e));
-    } else {
-      obj.groupKey = [];
-    }
-    message.withTies !== undefined && (obj.withTies = message.withTies);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GroupTopNNode>, I>>(object: I): GroupTopNNode {
-    const message = createBaseGroupTopNNode();
-    message.columnOrders = object.columnOrders?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.limit = object.limit ?? 0;
-    message.offset = object.offset ?? 0;
-    message.groupKey = object.groupKey?.map((e) => e) || [];
-    message.withTies = object.withTies ?? false;
-    return message;
-  },
-};
-
-function createBaseLimitNode(): LimitNode {
-  return { limit: 0, offset: 0 };
-}
-
-export const LimitNode = {
-  fromJSON(object: any): LimitNode {
-    return {
-      limit: isSet(object.limit) ? Number(object.limit) : 0,
-      offset: isSet(object.offset) ? Number(object.offset) : 0,
-    };
-  },
-
-  toJSON(message: LimitNode): unknown {
-    const obj: any = {};
-    message.limit !== undefined && (obj.limit = Math.round(message.limit));
-    message.offset !== undefined && (obj.offset = Math.round(message.offset));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<LimitNode>, I>>(object: I): LimitNode {
-    const message = createBaseLimitNode();
-    message.limit = object.limit ?? 0;
-    message.offset = object.offset ?? 0;
-    return message;
-  },
-};
-
-function createBaseNestedLoopJoinNode(): NestedLoopJoinNode {
-  return { joinType: JoinType.UNSPECIFIED, joinCond: undefined, outputIndices: [] };
-}
-
-export const NestedLoopJoinNode = {
-  fromJSON(object: any): NestedLoopJoinNode {
-    return {
-      joinType: isSet(object.joinType) ? joinTypeFromJSON(object.joinType) : JoinType.UNSPECIFIED,
-      joinCond: isSet(object.joinCond) ? ExprNode.fromJSON(object.joinCond) : undefined,
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: NestedLoopJoinNode): unknown {
-    const obj: any = {};
-    message.joinType !== undefined && (obj.joinType = joinTypeToJSON(message.joinType));
-    message.joinCond !== undefined && (obj.joinCond = message.joinCond ? ExprNode.toJSON(message.joinCond) : undefined);
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<NestedLoopJoinNode>, I>>(object: I): NestedLoopJoinNode {
-    const message = createBaseNestedLoopJoinNode();
-    message.joinType = object.joinType ?? JoinType.UNSPECIFIED;
-    message.joinCond = (object.joinCond !== undefined && object.joinCond !== null)
-      ? ExprNode.fromPartial(object.joinCond)
-      : undefined;
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseHashAggNode(): HashAggNode {
-  return { groupKey: [], aggCalls: [] };
-}
-
-export const HashAggNode = {
-  fromJSON(object: any): HashAggNode {
-    return {
-      groupKey: Array.isArray(object?.groupKey) ? object.groupKey.map((e: any) => Number(e)) : [],
-      aggCalls: Array.isArray(object?.aggCalls) ? object.aggCalls.map((e: any) => AggCall.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: HashAggNode): unknown {
-    const obj: any = {};
-    if (message.groupKey) {
-      obj.groupKey = message.groupKey.map((e) => Math.round(e));
-    } else {
-      obj.groupKey = [];
-    }
-    if (message.aggCalls) {
-      obj.aggCalls = message.aggCalls.map((e) => e ? AggCall.toJSON(e) : undefined);
-    } else {
-      obj.aggCalls = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HashAggNode>, I>>(object: I): HashAggNode {
-    const message = createBaseHashAggNode();
-    message.groupKey = object.groupKey?.map((e) => e) || [];
-    message.aggCalls = object.aggCalls?.map((e) => AggCall.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseExpandNode(): ExpandNode {
-  return { columnSubsets: [] };
-}
-
-export const ExpandNode = {
-  fromJSON(object: any): ExpandNode {
-    return {
-      columnSubsets: Array.isArray(object?.columnSubsets)
-        ? object.columnSubsets.map((e: any) => ExpandNode_Subset.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: ExpandNode): unknown {
-    const obj: any = {};
-    if (message.columnSubsets) {
-      obj.columnSubsets = message.columnSubsets.map((e) => e ? ExpandNode_Subset.toJSON(e) : undefined);
-    } else {
-      obj.columnSubsets = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExpandNode>, I>>(object: I): ExpandNode {
-    const message = createBaseExpandNode();
-    message.columnSubsets = object.columnSubsets?.map((e) => ExpandNode_Subset.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseExpandNode_Subset(): ExpandNode_Subset {
-  return { columnIndices: [] };
-}
-
-export const ExpandNode_Subset = {
-  fromJSON(object: any): ExpandNode_Subset {
-    return {
-      columnIndices: Array.isArray(object?.columnIndices) ? object.columnIndices.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: ExpandNode_Subset): unknown {
-    const obj: any = {};
-    if (message.columnIndices) {
-      obj.columnIndices = message.columnIndices.map((e) => Math.round(e));
-    } else {
-      obj.columnIndices = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExpandNode_Subset>, I>>(object: I): ExpandNode_Subset {
-    const message = createBaseExpandNode_Subset();
-    message.columnIndices = object.columnIndices?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseProjectSetNode(): ProjectSetNode {
-  return { selectList: [] };
-}
-
-export const ProjectSetNode = {
-  fromJSON(object: any): ProjectSetNode {
-    return {
-      selectList: Array.isArray(object?.selectList)
-        ? object.selectList.map((e: any) => ProjectSetSelectItem.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: ProjectSetNode): unknown {
-    const obj: any = {};
-    if (message.selectList) {
-      obj.selectList = message.selectList.map((e) => e ? ProjectSetSelectItem.toJSON(e) : undefined);
-    } else {
-      obj.selectList = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ProjectSetNode>, I>>(object: I): ProjectSetNode {
-    const message = createBaseProjectSetNode();
-    message.selectList = object.selectList?.map((e) => ProjectSetSelectItem.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseSortAggNode(): SortAggNode {
-  return { groupKey: [], aggCalls: [] };
-}
-
-export const SortAggNode = {
-  fromJSON(object: any): SortAggNode {
-    return {
-      groupKey: Array.isArray(object?.groupKey) ? object.groupKey.map((e: any) => ExprNode.fromJSON(e)) : [],
-      aggCalls: Array.isArray(object?.aggCalls) ? object.aggCalls.map((e: any) => AggCall.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: SortAggNode): unknown {
-    const obj: any = {};
-    if (message.groupKey) {
-      obj.groupKey = message.groupKey.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.groupKey = [];
-    }
-    if (message.aggCalls) {
-      obj.aggCalls = message.aggCalls.map((e) => e ? AggCall.toJSON(e) : undefined);
-    } else {
-      obj.aggCalls = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SortAggNode>, I>>(object: I): SortAggNode {
-    const message = createBaseSortAggNode();
-    message.groupKey = object.groupKey?.map((e) => ExprNode.fromPartial(e)) || [];
-    message.aggCalls = object.aggCalls?.map((e) => AggCall.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseHashJoinNode(): HashJoinNode {
-  return {
-    joinType: JoinType.UNSPECIFIED,
-    leftKey: [],
-    rightKey: [],
-    condition: undefined,
-    outputIndices: [],
-    nullSafe: [],
-  };
-}
-
-export const HashJoinNode = {
-  fromJSON(object: any): HashJoinNode {
-    return {
-      joinType: isSet(object.joinType) ? joinTypeFromJSON(object.joinType) : JoinType.UNSPECIFIED,
-      leftKey: Array.isArray(object?.leftKey) ? object.leftKey.map((e: any) => Number(e)) : [],
-      rightKey: Array.isArray(object?.rightKey) ? object.rightKey.map((e: any) => Number(e)) : [],
-      condition: isSet(object.condition) ? ExprNode.fromJSON(object.condition) : undefined,
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-      nullSafe: Array.isArray(object?.nullSafe) ? object.nullSafe.map((e: any) => Boolean(e)) : [],
-    };
-  },
-
-  toJSON(message: HashJoinNode): unknown {
-    const obj: any = {};
-    message.joinType !== undefined && (obj.joinType = joinTypeToJSON(message.joinType));
-    if (message.leftKey) {
-      obj.leftKey = message.leftKey.map((e) => Math.round(e));
-    } else {
-      obj.leftKey = [];
-    }
-    if (message.rightKey) {
-      obj.rightKey = message.rightKey.map((e) => Math.round(e));
-    } else {
-      obj.rightKey = [];
-    }
-    message.condition !== undefined &&
-      (obj.condition = message.condition ? ExprNode.toJSON(message.condition) : undefined);
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    if (message.nullSafe) {
-      obj.nullSafe = message.nullSafe.map((e) => e);
-    } else {
-      obj.nullSafe = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HashJoinNode>, I>>(object: I): HashJoinNode {
-    const message = createBaseHashJoinNode();
-    message.joinType = object.joinType ?? JoinType.UNSPECIFIED;
-    message.leftKey = object.leftKey?.map((e) => e) || [];
-    message.rightKey = object.rightKey?.map((e) => e) || [];
-    message.condition = (object.condition !== undefined && object.condition !== null)
-      ? ExprNode.fromPartial(object.condition)
-      : undefined;
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    message.nullSafe = object.nullSafe?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseSortMergeJoinNode(): SortMergeJoinNode {
-  return {
-    joinType: JoinType.UNSPECIFIED,
-    leftKey: [],
-    rightKey: [],
-    direction: Direction.DIRECTION_UNSPECIFIED,
-    outputIndices: [],
-  };
-}
-
-export const SortMergeJoinNode = {
-  fromJSON(object: any): SortMergeJoinNode {
-    return {
-      joinType: isSet(object.joinType) ? joinTypeFromJSON(object.joinType) : JoinType.UNSPECIFIED,
-      leftKey: Array.isArray(object?.leftKey) ? object.leftKey.map((e: any) => Number(e)) : [],
-      rightKey: Array.isArray(object?.rightKey) ? object.rightKey.map((e: any) => Number(e)) : [],
-      direction: isSet(object.direction) ? directionFromJSON(object.direction) : Direction.DIRECTION_UNSPECIFIED,
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: SortMergeJoinNode): unknown {
-    const obj: any = {};
-    message.joinType !== undefined && (obj.joinType = joinTypeToJSON(message.joinType));
-    if (message.leftKey) {
-      obj.leftKey = message.leftKey.map((e) => Math.round(e));
-    } else {
-      obj.leftKey = [];
-    }
-    if (message.rightKey) {
-      obj.rightKey = message.rightKey.map((e) => Math.round(e));
-    } else {
-      obj.rightKey = [];
-    }
-    message.direction !== undefined && (obj.direction = directionToJSON(message.direction));
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SortMergeJoinNode>, I>>(object: I): SortMergeJoinNode {
-    const message = createBaseSortMergeJoinNode();
-    message.joinType = object.joinType ?? JoinType.UNSPECIFIED;
-    message.leftKey = object.leftKey?.map((e) => e) || [];
-    message.rightKey = object.rightKey?.map((e) => e) || [];
-    message.direction = object.direction ?? Direction.DIRECTION_UNSPECIFIED;
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseHopWindowNode(): HopWindowNode {
-  return {
-    timeCol: 0,
-    windowSlide: undefined,
-    windowSize: undefined,
-    outputIndices: [],
-    windowStartExprs: [],
-    windowEndExprs: [],
-  };
-}
-
-export const HopWindowNode = {
-  fromJSON(object: any): HopWindowNode {
-    return {
-      timeCol: isSet(object.timeCol) ? Number(object.timeCol) : 0,
-      windowSlide: isSet(object.windowSlide) ? IntervalUnit.fromJSON(object.windowSlide) : undefined,
-      windowSize: isSet(object.windowSize) ? IntervalUnit.fromJSON(object.windowSize) : undefined,
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-      windowStartExprs: Array.isArray(object?.windowStartExprs)
-        ? object.windowStartExprs.map((e: any) => ExprNode.fromJSON(e))
-        : [],
-      windowEndExprs: Array.isArray(object?.windowEndExprs)
-        ? object.windowEndExprs.map((e: any) => ExprNode.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: HopWindowNode): unknown {
-    const obj: any = {};
-    message.timeCol !== undefined && (obj.timeCol = Math.round(message.timeCol));
-    message.windowSlide !== undefined &&
-      (obj.windowSlide = message.windowSlide ? IntervalUnit.toJSON(message.windowSlide) : undefined);
-    message.windowSize !== undefined &&
-      (obj.windowSize = message.windowSize ? IntervalUnit.toJSON(message.windowSize) : undefined);
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    if (message.windowStartExprs) {
-      obj.windowStartExprs = message.windowStartExprs.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.windowStartExprs = [];
-    }
-    if (message.windowEndExprs) {
-      obj.windowEndExprs = message.windowEndExprs.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.windowEndExprs = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HopWindowNode>, I>>(object: I): HopWindowNode {
-    const message = createBaseHopWindowNode();
-    message.timeCol = object.timeCol ?? 0;
-    message.windowSlide = (object.windowSlide !== undefined && object.windowSlide !== null)
-      ? IntervalUnit.fromPartial(object.windowSlide)
-      : undefined;
-    message.windowSize = (object.windowSize !== undefined && object.windowSize !== null)
-      ? IntervalUnit.fromPartial(object.windowSize)
-      : undefined;
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    message.windowStartExprs = object.windowStartExprs?.map((e) => ExprNode.fromPartial(e)) || [];
-    message.windowEndExprs = object.windowEndExprs?.map((e) => ExprNode.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseTableFunctionNode(): TableFunctionNode {
-  return { tableFunction: undefined };
-}
-
-export const TableFunctionNode = {
-  fromJSON(object: any): TableFunctionNode {
-    return { tableFunction: isSet(object.tableFunction) ? TableFunction.fromJSON(object.tableFunction) : undefined };
-  },
-
-  toJSON(message: TableFunctionNode): unknown {
-    const obj: any = {};
-    message.tableFunction !== undefined &&
-      (obj.tableFunction = message.tableFunction ? TableFunction.toJSON(message.tableFunction) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableFunctionNode>, I>>(object: I): TableFunctionNode {
-    const message = createBaseTableFunctionNode();
-    message.tableFunction = (object.tableFunction !== undefined && object.tableFunction !== null)
-      ? TableFunction.fromPartial(object.tableFunction)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseTaskId(): TaskId {
-  return { queryId: "", stageId: 0, taskId: 0 };
-}
-
-export const TaskId = {
-  fromJSON(object: any): TaskId {
-    return {
-      queryId: isSet(object.queryId) ? String(object.queryId) : "",
-      stageId: isSet(object.stageId) ? Number(object.stageId) : 0,
-      taskId: isSet(object.taskId) ? Number(object.taskId) : 0,
-    };
-  },
-
-  toJSON(message: TaskId): unknown {
-    const obj: any = {};
-    message.queryId !== undefined && (obj.queryId = message.queryId);
-    message.stageId !== undefined && (obj.stageId = Math.round(message.stageId));
-    message.taskId !== undefined && (obj.taskId = Math.round(message.taskId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TaskId>, I>>(object: I): TaskId {
-    const message = createBaseTaskId();
-    message.queryId = object.queryId ?? "";
-    message.stageId = object.stageId ?? 0;
-    message.taskId = object.taskId ?? 0;
-    return message;
-  },
-};
-
-function createBaseTaskOutputId(): TaskOutputId {
-  return { taskId: undefined, outputId: 0 };
-}
-
-export const TaskOutputId = {
-  fromJSON(object: any): TaskOutputId {
-    return {
-      taskId: isSet(object.taskId) ? TaskId.fromJSON(object.taskId) : undefined,
-      outputId: isSet(object.outputId) ? Number(object.outputId) : 0,
-    };
-  },
-
-  toJSON(message: TaskOutputId): unknown {
-    const obj: any = {};
-    message.taskId !== undefined && (obj.taskId = message.taskId ? TaskId.toJSON(message.taskId) : undefined);
-    message.outputId !== undefined && (obj.outputId = Math.round(message.outputId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TaskOutputId>, I>>(object: I): TaskOutputId {
-    const message = createBaseTaskOutputId();
-    message.taskId = (object.taskId !== undefined && object.taskId !== null)
-      ? TaskId.fromPartial(object.taskId)
-      : undefined;
-    message.outputId = object.outputId ?? 0;
-    return message;
-  },
-};
-
-function createBaseLocalExecutePlan(): LocalExecutePlan {
-  return { plan: undefined, epoch: undefined };
-}
-
-export const LocalExecutePlan = {
-  fromJSON(object: any): LocalExecutePlan {
-    return {
-      plan: isSet(object.plan) ? PlanFragment.fromJSON(object.plan) : undefined,
-      epoch: isSet(object.epoch) ? BatchQueryEpoch.fromJSON(object.epoch) : undefined,
-    };
-  },
-
-  toJSON(message: LocalExecutePlan): unknown {
-    const obj: any = {};
-    message.plan !== undefined && (obj.plan = message.plan ? PlanFragment.toJSON(message.plan) : undefined);
-    message.epoch !== undefined && (obj.epoch = message.epoch ? BatchQueryEpoch.toJSON(message.epoch) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<LocalExecutePlan>, I>>(object: I): LocalExecutePlan {
-    const message = createBaseLocalExecutePlan();
-    message.plan = (object.plan !== undefined && object.plan !== null)
-      ? PlanFragment.fromPartial(object.plan)
-      : undefined;
-    message.epoch = (object.epoch !== undefined && object.epoch !== null)
-      ? BatchQueryEpoch.fromPartial(object.epoch)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseExchangeSource(): ExchangeSource {
-  return { taskOutputId: undefined, host: undefined, localExecutePlan: undefined };
-}
-
-export const ExchangeSource = {
-  fromJSON(object: any): ExchangeSource {
-    return {
-      taskOutputId: isSet(object.taskOutputId) ? TaskOutputId.fromJSON(object.taskOutputId) : undefined,
-      host: isSet(object.host) ? HostAddress.fromJSON(object.host) : undefined,
-      localExecutePlan: isSet(object.plan)
-        ? { $case: "plan", plan: LocalExecutePlan.fromJSON(object.plan) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: ExchangeSource): unknown {
-    const obj: any = {};
-    message.taskOutputId !== undefined &&
-      (obj.taskOutputId = message.taskOutputId ? TaskOutputId.toJSON(message.taskOutputId) : undefined);
-    message.host !== undefined && (obj.host = message.host ? HostAddress.toJSON(message.host) : undefined);
-    message.localExecutePlan?.$case === "plan" &&
-      (obj.plan = message.localExecutePlan?.plan ? LocalExecutePlan.toJSON(message.localExecutePlan?.plan) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExchangeSource>, I>>(object: I): ExchangeSource {
-    const message = createBaseExchangeSource();
-    message.taskOutputId = (object.taskOutputId !== undefined && object.taskOutputId !== null)
-      ? TaskOutputId.fromPartial(object.taskOutputId)
-      : undefined;
-    message.host = (object.host !== undefined && object.host !== null)
-      ? HostAddress.fromPartial(object.host)
-      : undefined;
-    if (
-      object.localExecutePlan?.$case === "plan" &&
-      object.localExecutePlan?.plan !== undefined &&
-      object.localExecutePlan?.plan !== null
-    ) {
-      message.localExecutePlan = { $case: "plan", plan: LocalExecutePlan.fromPartial(object.localExecutePlan.plan) };
-    }
-    return message;
-  },
-};
-
-function createBaseExchangeNode(): ExchangeNode {
-  return { sources: [], inputSchema: [] };
-}
-
-export const ExchangeNode = {
-  fromJSON(object: any): ExchangeNode {
-    return {
-      sources: Array.isArray(object?.sources) ? object.sources.map((e: any) => ExchangeSource.fromJSON(e)) : [],
-      inputSchema: Array.isArray(object?.inputSchema) ? object.inputSchema.map((e: any) => Field.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: ExchangeNode): unknown {
-    const obj: any = {};
-    if (message.sources) {
-      obj.sources = message.sources.map((e) => e ? ExchangeSource.toJSON(e) : undefined);
-    } else {
-      obj.sources = [];
-    }
-    if (message.inputSchema) {
-      obj.inputSchema = message.inputSchema.map((e) => e ? Field.toJSON(e) : undefined);
-    } else {
-      obj.inputSchema = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExchangeNode>, I>>(object: I): ExchangeNode {
-    const message = createBaseExchangeNode();
-    message.sources = object.sources?.map((e) => ExchangeSource.fromPartial(e)) || [];
-    message.inputSchema = object.inputSchema?.map((e) => Field.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseMergeSortExchangeNode(): MergeSortExchangeNode {
-  return { exchange: undefined, columnOrders: [] };
-}
-
-export const MergeSortExchangeNode = {
-  fromJSON(object: any): MergeSortExchangeNode {
-    return {
-      exchange: isSet(object.exchange) ? ExchangeNode.fromJSON(object.exchange) : undefined,
-      columnOrders: Array.isArray(object?.columnOrders)
-        ? object.columnOrders.map((e: any) => ColumnOrder.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: MergeSortExchangeNode): unknown {
-    const obj: any = {};
-    message.exchange !== undefined &&
-      (obj.exchange = message.exchange ? ExchangeNode.toJSON(message.exchange) : undefined);
-    if (message.columnOrders) {
-      obj.columnOrders = message.columnOrders.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.columnOrders = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MergeSortExchangeNode>, I>>(object: I): MergeSortExchangeNode {
-    const message = createBaseMergeSortExchangeNode();
-    message.exchange = (object.exchange !== undefined && object.exchange !== null)
-      ? ExchangeNode.fromPartial(object.exchange)
-      : undefined;
-    message.columnOrders = object.columnOrders?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseLocalLookupJoinNode(): LocalLookupJoinNode {
-  return {
-    joinType: JoinType.UNSPECIFIED,
-    condition: undefined,
-    outerSideKey: [],
-    innerSideKey: [],
-    lookupPrefixLen: 0,
-    innerSideTableDesc: undefined,
-    innerSideVnodeMapping: [],
-    innerSideColumnIds: [],
-    outputIndices: [],
-    workerNodes: [],
-    nullSafe: [],
-  };
-}
-
-export const LocalLookupJoinNode = {
-  fromJSON(object: any): LocalLookupJoinNode {
-    return {
-      joinType: isSet(object.joinType) ? joinTypeFromJSON(object.joinType) : JoinType.UNSPECIFIED,
-      condition: isSet(object.condition) ? ExprNode.fromJSON(object.condition) : undefined,
-      outerSideKey: Array.isArray(object?.outerSideKey) ? object.outerSideKey.map((e: any) => Number(e)) : [],
-      innerSideKey: Array.isArray(object?.innerSideKey) ? object.innerSideKey.map((e: any) => Number(e)) : [],
-      lookupPrefixLen: isSet(object.lookupPrefixLen) ? Number(object.lookupPrefixLen) : 0,
-      innerSideTableDesc: isSet(object.innerSideTableDesc)
-        ? StorageTableDesc.fromJSON(object.innerSideTableDesc)
-        : undefined,
-      innerSideVnodeMapping: Array.isArray(object?.innerSideVnodeMapping)
-        ? object.innerSideVnodeMapping.map((e: any) => Number(e))
-        : [],
-      innerSideColumnIds: Array.isArray(object?.innerSideColumnIds)
-        ? object.innerSideColumnIds.map((e: any) => Number(e))
-        : [],
-      outputIndices: Array.isArray(object?.outputIndices)
-        ? object.outputIndices.map((e: any) => Number(e))
-        : [],
-      workerNodes: Array.isArray(object?.workerNodes) ? object.workerNodes.map((e: any) => WorkerNode.fromJSON(e)) : [],
-      nullSafe: Array.isArray(object?.nullSafe) ? object.nullSafe.map((e: any) => Boolean(e)) : [],
-    };
-  },
-
-  toJSON(message: LocalLookupJoinNode): unknown {
-    const obj: any = {};
-    message.joinType !== undefined && (obj.joinType = joinTypeToJSON(message.joinType));
-    message.condition !== undefined &&
-      (obj.condition = message.condition ? ExprNode.toJSON(message.condition) : undefined);
-    if (message.outerSideKey) {
-      obj.outerSideKey = message.outerSideKey.map((e) => Math.round(e));
-    } else {
-      obj.outerSideKey = [];
-    }
-    if (message.innerSideKey) {
-      obj.innerSideKey = message.innerSideKey.map((e) => Math.round(e));
-    } else {
-      obj.innerSideKey = [];
-    }
-    message.lookupPrefixLen !== undefined && (obj.lookupPrefixLen = Math.round(message.lookupPrefixLen));
-    message.innerSideTableDesc !== undefined && (obj.innerSideTableDesc = message.innerSideTableDesc
-      ? StorageTableDesc.toJSON(message.innerSideTableDesc)
-      : undefined);
-    if (message.innerSideVnodeMapping) {
-      obj.innerSideVnodeMapping = message.innerSideVnodeMapping.map((e) => Math.round(e));
-    } else {
-      obj.innerSideVnodeMapping = [];
-    }
-    if (message.innerSideColumnIds) {
-      obj.innerSideColumnIds = message.innerSideColumnIds.map((e) => Math.round(e));
-    } else {
-      obj.innerSideColumnIds = [];
-    }
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    if (message.workerNodes) {
-      obj.workerNodes = message.workerNodes.map((e) => e ? WorkerNode.toJSON(e) : undefined);
-    } else {
-      obj.workerNodes = [];
-    }
-    if (message.nullSafe) {
-      obj.nullSafe = message.nullSafe.map((e) => e);
-    } else {
-      obj.nullSafe = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<LocalLookupJoinNode>, I>>(object: I): LocalLookupJoinNode {
-    const message = createBaseLocalLookupJoinNode();
-    message.joinType = object.joinType ?? JoinType.UNSPECIFIED;
-    message.condition = (object.condition !== undefined && object.condition !== null)
-      ? ExprNode.fromPartial(object.condition)
-      : undefined;
-    message.outerSideKey = object.outerSideKey?.map((e) => e) || [];
-    message.innerSideKey = object.innerSideKey?.map((e) => e) || [];
-    message.lookupPrefixLen = object.lookupPrefixLen ?? 0;
-    message.innerSideTableDesc = (object.innerSideTableDesc !== undefined && object.innerSideTableDesc !== null)
-      ? StorageTableDesc.fromPartial(object.innerSideTableDesc)
-      : undefined;
-    message.innerSideVnodeMapping = object.innerSideVnodeMapping?.map((e) => e) || [];
-    message.innerSideColumnIds = object.innerSideColumnIds?.map((e) => e) || [];
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    message.workerNodes = object.workerNodes?.map((e) => WorkerNode.fromPartial(e)) || [];
-    message.nullSafe = object.nullSafe?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseDistributedLookupJoinNode(): DistributedLookupJoinNode {
-  return {
-    joinType: JoinType.UNSPECIFIED,
-    condition: undefined,
-    outerSideKey: [],
-    innerSideKey: [],
-    lookupPrefixLen: 0,
-    innerSideTableDesc: undefined,
-    innerSideColumnIds: [],
-    outputIndices: [],
-    nullSafe: [],
-  };
-}
-
-export const DistributedLookupJoinNode = {
-  fromJSON(object: any): DistributedLookupJoinNode {
-    return {
-      joinType: isSet(object.joinType) ? joinTypeFromJSON(object.joinType) : JoinType.UNSPECIFIED,
-      condition: isSet(object.condition) ? ExprNode.fromJSON(object.condition) : undefined,
-      outerSideKey: Array.isArray(object?.outerSideKey) ? object.outerSideKey.map((e: any) => Number(e)) : [],
-      innerSideKey: Array.isArray(object?.innerSideKey) ? object.innerSideKey.map((e: any) => Number(e)) : [],
-      lookupPrefixLen: isSet(object.lookupPrefixLen) ? Number(object.lookupPrefixLen) : 0,
-      innerSideTableDesc: isSet(object.innerSideTableDesc)
-        ? StorageTableDesc.fromJSON(object.innerSideTableDesc)
-        : undefined,
-      innerSideColumnIds: Array.isArray(object?.innerSideColumnIds)
-        ? object.innerSideColumnIds.map((e: any) => Number(e))
-        : [],
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-      nullSafe: Array.isArray(object?.nullSafe) ? object.nullSafe.map((e: any) => Boolean(e)) : [],
-    };
-  },
-
-  toJSON(message: DistributedLookupJoinNode): unknown {
-    const obj: any = {};
-    message.joinType !== undefined && (obj.joinType = joinTypeToJSON(message.joinType));
-    message.condition !== undefined &&
-      (obj.condition = message.condition ? ExprNode.toJSON(message.condition) : undefined);
-    if (message.outerSideKey) {
-      obj.outerSideKey = message.outerSideKey.map((e) => Math.round(e));
-    } else {
-      obj.outerSideKey = [];
-    }
-    if (message.innerSideKey) {
-      obj.innerSideKey = message.innerSideKey.map((e) => Math.round(e));
-    } else {
-      obj.innerSideKey = [];
-    }
-    message.lookupPrefixLen !== undefined && (obj.lookupPrefixLen = Math.round(message.lookupPrefixLen));
-    message.innerSideTableDesc !== undefined && (obj.innerSideTableDesc = message.innerSideTableDesc
-      ? StorageTableDesc.toJSON(message.innerSideTableDesc)
-      : undefined);
-    if (message.innerSideColumnIds) {
-      obj.innerSideColumnIds = message.innerSideColumnIds.map((e) => Math.round(e));
-    } else {
-      obj.innerSideColumnIds = [];
-    }
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    if (message.nullSafe) {
-      obj.nullSafe = message.nullSafe.map((e) => e);
-    } else {
-      obj.nullSafe = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DistributedLookupJoinNode>, I>>(object: I): DistributedLookupJoinNode {
-    const message = createBaseDistributedLookupJoinNode();
-    message.joinType = object.joinType ?? JoinType.UNSPECIFIED;
-    message.condition = (object.condition !== undefined && object.condition !== null)
-      ? ExprNode.fromPartial(object.condition)
-      : undefined;
-    message.outerSideKey = object.outerSideKey?.map((e) => e) || [];
-    message.innerSideKey = object.innerSideKey?.map((e) => e) || [];
-    message.lookupPrefixLen = object.lookupPrefixLen ?? 0;
-    message.innerSideTableDesc = (object.innerSideTableDesc !== undefined && object.innerSideTableDesc !== null)
-      ? StorageTableDesc.fromPartial(object.innerSideTableDesc)
-      : undefined;
-    message.innerSideColumnIds = object.innerSideColumnIds?.map((e) => e) || [];
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    message.nullSafe = object.nullSafe?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseUnionNode(): UnionNode {
-  return {};
-}
-
-export const UnionNode = {
-  fromJSON(_: any): UnionNode {
-    return {};
-  },
-
-  toJSON(_: UnionNode): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnionNode>, I>>(_: I): UnionNode {
-    const message = createBaseUnionNode();
-    return message;
-  },
-};
-
-function createBasePlanNode(): PlanNode {
-  return { children: [], nodeBody: undefined, identity: "" };
-}
-
-export const PlanNode = {
-  fromJSON(object: any): PlanNode {
-    return {
-      children: Array.isArray(object?.children) ? object.children.map((e: any) => PlanNode.fromJSON(e)) : [],
-      nodeBody: isSet(object.insert)
-        ? { $case: "insert", insert: InsertNode.fromJSON(object.insert) }
-        : isSet(object.delete)
-        ? { $case: "delete", delete: DeleteNode.fromJSON(object.delete) }
-        : isSet(object.update)
-        ? { $case: "update", update: UpdateNode.fromJSON(object.update) }
-        : isSet(object.project)
-        ? { $case: "project", project: ProjectNode.fromJSON(object.project) }
-        : isSet(object.hashAgg)
-        ? { $case: "hashAgg", hashAgg: HashAggNode.fromJSON(object.hashAgg) }
-        : isSet(object.filter)
-        ? { $case: "filter", filter: FilterNode.fromJSON(object.filter) }
-        : isSet(object.exchange)
-        ? { $case: "exchange", exchange: ExchangeNode.fromJSON(object.exchange) }
-        : isSet(object.sort)
-        ? { $case: "sort", sort: SortNode.fromJSON(object.sort) }
-        : isSet(object.nestedLoopJoin)
-        ? { $case: "nestedLoopJoin", nestedLoopJoin: NestedLoopJoinNode.fromJSON(object.nestedLoopJoin) }
-        : isSet(object.topN)
-        ? { $case: "topN", topN: TopNNode.fromJSON(object.topN) }
-        : isSet(object.sortAgg)
-        ? { $case: "sortAgg", sortAgg: SortAggNode.fromJSON(object.sortAgg) }
-        : isSet(object.rowSeqScan)
-        ? { $case: "rowSeqScan", rowSeqScan: RowSeqScanNode.fromJSON(object.rowSeqScan) }
-        : isSet(object.limit)
-        ? { $case: "limit", limit: LimitNode.fromJSON(object.limit) }
-        : isSet(object.values)
-        ? { $case: "values", values: ValuesNode.fromJSON(object.values) }
-        : isSet(object.hashJoin)
-        ? { $case: "hashJoin", hashJoin: HashJoinNode.fromJSON(object.hashJoin) }
-        : isSet(object.mergeSortExchange)
-        ? { $case: "mergeSortExchange", mergeSortExchange: MergeSortExchangeNode.fromJSON(object.mergeSortExchange) }
-        : isSet(object.hopWindow)
-        ? { $case: "hopWindow", hopWindow: HopWindowNode.fromJSON(object.hopWindow) }
-        : isSet(object.tableFunction)
-        ? { $case: "tableFunction", tableFunction: TableFunctionNode.fromJSON(object.tableFunction) }
-        : isSet(object.sysRowSeqScan)
-        ? { $case: "sysRowSeqScan", sysRowSeqScan: SysRowSeqScanNode.fromJSON(object.sysRowSeqScan) }
-        : isSet(object.expand)
-        ? { $case: "expand", expand: ExpandNode.fromJSON(object.expand) }
-        : isSet(object.localLookupJoin)
-        ? { $case: "localLookupJoin", localLookupJoin: LocalLookupJoinNode.fromJSON(object.localLookupJoin) }
-        : isSet(object.projectSet)
-        ? { $case: "projectSet", projectSet: ProjectSetNode.fromJSON(object.projectSet) }
-        : isSet(object.union)
-        ? { $case: "union", union: UnionNode.fromJSON(object.union) }
-        : isSet(object.groupTopN)
-        ? { $case: "groupTopN", groupTopN: GroupTopNNode.fromJSON(object.groupTopN) }
-        : isSet(object.distributedLookupJoin)
-        ? {
-          $case: "distributedLookupJoin",
-          distributedLookupJoin: DistributedLookupJoinNode.fromJSON(object.distributedLookupJoin),
-        }
-        : isSet(object.source)
-        ? { $case: "source", source: SourceNode.fromJSON(object.source) }
-        : undefined,
-      identity: isSet(object.identity) ? String(object.identity) : "",
-    };
-  },
-
-  toJSON(message: PlanNode): unknown {
-    const obj: any = {};
-    if (message.children) {
-      obj.children = message.children.map((e) => e ? PlanNode.toJSON(e) : undefined);
-    } else {
-      obj.children = [];
-    }
-    message.nodeBody?.$case === "insert" &&
-      (obj.insert = message.nodeBody?.insert ? InsertNode.toJSON(message.nodeBody?.insert) : undefined);
-    message.nodeBody?.$case === "delete" &&
-      (obj.delete = message.nodeBody?.delete ? DeleteNode.toJSON(message.nodeBody?.delete) : undefined);
-    message.nodeBody?.$case === "update" &&
-      (obj.update = message.nodeBody?.update ? UpdateNode.toJSON(message.nodeBody?.update) : undefined);
-    message.nodeBody?.$case === "project" &&
-      (obj.project = message.nodeBody?.project ? ProjectNode.toJSON(message.nodeBody?.project) : undefined);
-    message.nodeBody?.$case === "hashAgg" &&
-      (obj.hashAgg = message.nodeBody?.hashAgg ? HashAggNode.toJSON(message.nodeBody?.hashAgg) : undefined);
-    message.nodeBody?.$case === "filter" &&
-      (obj.filter = message.nodeBody?.filter ? FilterNode.toJSON(message.nodeBody?.filter) : undefined);
-    message.nodeBody?.$case === "exchange" &&
-      (obj.exchange = message.nodeBody?.exchange ? ExchangeNode.toJSON(message.nodeBody?.exchange) : undefined);
-    message.nodeBody?.$case === "sort" &&
-      (obj.sort = message.nodeBody?.sort ? SortNode.toJSON(message.nodeBody?.sort) : undefined);
-    message.nodeBody?.$case === "nestedLoopJoin" && (obj.nestedLoopJoin = message.nodeBody?.nestedLoopJoin
-      ? NestedLoopJoinNode.toJSON(message.nodeBody?.nestedLoopJoin)
-      : undefined);
-    message.nodeBody?.$case === "topN" &&
-      (obj.topN = message.nodeBody?.topN ? TopNNode.toJSON(message.nodeBody?.topN) : undefined);
-    message.nodeBody?.$case === "sortAgg" &&
-      (obj.sortAgg = message.nodeBody?.sortAgg ? SortAggNode.toJSON(message.nodeBody?.sortAgg) : undefined);
-    message.nodeBody?.$case === "rowSeqScan" &&
-      (obj.rowSeqScan = message.nodeBody?.rowSeqScan ? RowSeqScanNode.toJSON(message.nodeBody?.rowSeqScan) : undefined);
-    message.nodeBody?.$case === "limit" &&
-      (obj.limit = message.nodeBody?.limit ? LimitNode.toJSON(message.nodeBody?.limit) : undefined);
-    message.nodeBody?.$case === "values" &&
-      (obj.values = message.nodeBody?.values ? ValuesNode.toJSON(message.nodeBody?.values) : undefined);
-    message.nodeBody?.$case === "hashJoin" &&
-      (obj.hashJoin = message.nodeBody?.hashJoin ? HashJoinNode.toJSON(message.nodeBody?.hashJoin) : undefined);
-    message.nodeBody?.$case === "mergeSortExchange" && (obj.mergeSortExchange = message.nodeBody?.mergeSortExchange
-      ? MergeSortExchangeNode.toJSON(message.nodeBody?.mergeSortExchange)
-      : undefined);
-    message.nodeBody?.$case === "hopWindow" &&
-      (obj.hopWindow = message.nodeBody?.hopWindow ? HopWindowNode.toJSON(message.nodeBody?.hopWindow) : undefined);
-    message.nodeBody?.$case === "tableFunction" && (obj.tableFunction = message.nodeBody?.tableFunction
-      ? TableFunctionNode.toJSON(message.nodeBody?.tableFunction)
-      : undefined);
-    message.nodeBody?.$case === "sysRowSeqScan" && (obj.sysRowSeqScan = message.nodeBody?.sysRowSeqScan
-      ? SysRowSeqScanNode.toJSON(message.nodeBody?.sysRowSeqScan)
-      : undefined);
-    message.nodeBody?.$case === "expand" &&
-      (obj.expand = message.nodeBody?.expand ? ExpandNode.toJSON(message.nodeBody?.expand) : undefined);
-    message.nodeBody?.$case === "localLookupJoin" && (obj.localLookupJoin = message.nodeBody?.localLookupJoin
-      ? LocalLookupJoinNode.toJSON(message.nodeBody?.localLookupJoin)
-      : undefined);
-    message.nodeBody?.$case === "projectSet" &&
-      (obj.projectSet = message.nodeBody?.projectSet ? ProjectSetNode.toJSON(message.nodeBody?.projectSet) : undefined);
-    message.nodeBody?.$case === "union" &&
-      (obj.union = message.nodeBody?.union ? UnionNode.toJSON(message.nodeBody?.union) : undefined);
-    message.nodeBody?.$case === "groupTopN" &&
-      (obj.groupTopN = message.nodeBody?.groupTopN ? GroupTopNNode.toJSON(message.nodeBody?.groupTopN) : undefined);
-    message.nodeBody?.$case === "distributedLookupJoin" &&
-      (obj.distributedLookupJoin = message.nodeBody?.distributedLookupJoin
-        ? DistributedLookupJoinNode.toJSON(message.nodeBody?.distributedLookupJoin)
-        : undefined);
-    message.nodeBody?.$case === "source" &&
-      (obj.source = message.nodeBody?.source ? SourceNode.toJSON(message.nodeBody?.source) : undefined);
-    message.identity !== undefined && (obj.identity = message.identity);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PlanNode>, I>>(object: I): PlanNode {
-    const message = createBasePlanNode();
-    message.children = object.children?.map((e) => PlanNode.fromPartial(e)) || [];
-    if (
-      object.nodeBody?.$case === "insert" && object.nodeBody?.insert !== undefined && object.nodeBody?.insert !== null
-    ) {
-      message.nodeBody = { $case: "insert", insert: InsertNode.fromPartial(object.nodeBody.insert) };
-    }
-    if (
-      object.nodeBody?.$case === "delete" && object.nodeBody?.delete !== undefined && object.nodeBody?.delete !== null
-    ) {
-      message.nodeBody = { $case: "delete", delete: DeleteNode.fromPartial(object.nodeBody.delete) };
-    }
-    if (
-      object.nodeBody?.$case === "update" && object.nodeBody?.update !== undefined && object.nodeBody?.update !== null
-    ) {
-      message.nodeBody = { $case: "update", update: UpdateNode.fromPartial(object.nodeBody.update) };
-    }
-    if (
-      object.nodeBody?.$case === "project" &&
-      object.nodeBody?.project !== undefined &&
-      object.nodeBody?.project !== null
-    ) {
-      message.nodeBody = { $case: "project", project: ProjectNode.fromPartial(object.nodeBody.project) };
-    }
-    if (
-      object.nodeBody?.$case === "hashAgg" &&
-      object.nodeBody?.hashAgg !== undefined &&
-      object.nodeBody?.hashAgg !== null
-    ) {
-      message.nodeBody = { $case: "hashAgg", hashAgg: HashAggNode.fromPartial(object.nodeBody.hashAgg) };
-    }
-    if (
-      object.nodeBody?.$case === "filter" && object.nodeBody?.filter !== undefined && object.nodeBody?.filter !== null
-    ) {
-      message.nodeBody = { $case: "filter", filter: FilterNode.fromPartial(object.nodeBody.filter) };
-    }
-    if (
-      object.nodeBody?.$case === "exchange" &&
-      object.nodeBody?.exchange !== undefined &&
-      object.nodeBody?.exchange !== null
-    ) {
-      message.nodeBody = { $case: "exchange", exchange: ExchangeNode.fromPartial(object.nodeBody.exchange) };
-    }
-    if (object.nodeBody?.$case === "sort" && object.nodeBody?.sort !== undefined && object.nodeBody?.sort !== null) {
-      message.nodeBody = { $case: "sort", sort: SortNode.fromPartial(object.nodeBody.sort) };
-    }
-    if (
-      object.nodeBody?.$case === "nestedLoopJoin" &&
-      object.nodeBody?.nestedLoopJoin !== undefined &&
-      object.nodeBody?.nestedLoopJoin !== null
-    ) {
-      message.nodeBody = {
-        $case: "nestedLoopJoin",
-        nestedLoopJoin: NestedLoopJoinNode.fromPartial(object.nodeBody.nestedLoopJoin),
-      };
-    }
-    if (object.nodeBody?.$case === "topN" && object.nodeBody?.topN !== undefined && object.nodeBody?.topN !== null) {
-      message.nodeBody = { $case: "topN", topN: TopNNode.fromPartial(object.nodeBody.topN) };
-    }
-    if (
-      object.nodeBody?.$case === "sortAgg" &&
-      object.nodeBody?.sortAgg !== undefined &&
-      object.nodeBody?.sortAgg !== null
-    ) {
-      message.nodeBody = { $case: "sortAgg", sortAgg: SortAggNode.fromPartial(object.nodeBody.sortAgg) };
-    }
-    if (
-      object.nodeBody?.$case === "rowSeqScan" &&
-      object.nodeBody?.rowSeqScan !== undefined &&
-      object.nodeBody?.rowSeqScan !== null
-    ) {
-      message.nodeBody = { $case: "rowSeqScan", rowSeqScan: RowSeqScanNode.fromPartial(object.nodeBody.rowSeqScan) };
-    }
-    if (object.nodeBody?.$case === "limit" && object.nodeBody?.limit !== undefined && object.nodeBody?.limit !== null) {
-      message.nodeBody = { $case: "limit", limit: LimitNode.fromPartial(object.nodeBody.limit) };
-    }
-    if (
-      object.nodeBody?.$case === "values" && object.nodeBody?.values !== undefined && object.nodeBody?.values !== null
-    ) {
-      message.nodeBody = { $case: "values", values: ValuesNode.fromPartial(object.nodeBody.values) };
-    }
-    if (
-      object.nodeBody?.$case === "hashJoin" &&
-      object.nodeBody?.hashJoin !== undefined &&
-      object.nodeBody?.hashJoin !== null
-    ) {
-      message.nodeBody = { $case: "hashJoin", hashJoin: HashJoinNode.fromPartial(object.nodeBody.hashJoin) };
-    }
-    if (
-      object.nodeBody?.$case === "mergeSortExchange" &&
-      object.nodeBody?.mergeSortExchange !== undefined &&
-      object.nodeBody?.mergeSortExchange !== null
-    ) {
-      message.nodeBody = {
-        $case: "mergeSortExchange",
-        mergeSortExchange: MergeSortExchangeNode.fromPartial(object.nodeBody.mergeSortExchange),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "hopWindow" &&
-      object.nodeBody?.hopWindow !== undefined &&
-      object.nodeBody?.hopWindow !== null
-    ) {
-      message.nodeBody = { $case: "hopWindow", hopWindow: HopWindowNode.fromPartial(object.nodeBody.hopWindow) };
-    }
-    if (
-      object.nodeBody?.$case === "tableFunction" &&
-      object.nodeBody?.tableFunction !== undefined &&
-      object.nodeBody?.tableFunction !== null
-    ) {
-      message.nodeBody = {
-        $case: "tableFunction",
-        tableFunction: TableFunctionNode.fromPartial(object.nodeBody.tableFunction),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "sysRowSeqScan" &&
-      object.nodeBody?.sysRowSeqScan !== undefined &&
-      object.nodeBody?.sysRowSeqScan !== null
-    ) {
-      message.nodeBody = {
-        $case: "sysRowSeqScan",
-        sysRowSeqScan: SysRowSeqScanNode.fromPartial(object.nodeBody.sysRowSeqScan),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "expand" && object.nodeBody?.expand !== undefined && object.nodeBody?.expand !== null
-    ) {
-      message.nodeBody = { $case: "expand", expand: ExpandNode.fromPartial(object.nodeBody.expand) };
-    }
-    if (
-      object.nodeBody?.$case === "localLookupJoin" &&
-      object.nodeBody?.localLookupJoin !== undefined &&
-      object.nodeBody?.localLookupJoin !== null
-    ) {
-      message.nodeBody = {
-        $case: "localLookupJoin",
-        localLookupJoin: LocalLookupJoinNode.fromPartial(object.nodeBody.localLookupJoin),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "projectSet" &&
-      object.nodeBody?.projectSet !== undefined &&
-      object.nodeBody?.projectSet !== null
-    ) {
-      message.nodeBody = { $case: "projectSet", projectSet: ProjectSetNode.fromPartial(object.nodeBody.projectSet) };
-    }
-    if (object.nodeBody?.$case === "union" && object.nodeBody?.union !== undefined && object.nodeBody?.union !== null) {
-      message.nodeBody = { $case: "union", union: UnionNode.fromPartial(object.nodeBody.union) };
-    }
-    if (
-      object.nodeBody?.$case === "groupTopN" &&
-      object.nodeBody?.groupTopN !== undefined &&
-      object.nodeBody?.groupTopN !== null
-    ) {
-      message.nodeBody = { $case: "groupTopN", groupTopN: GroupTopNNode.fromPartial(object.nodeBody.groupTopN) };
-    }
-    if (
-      object.nodeBody?.$case === "distributedLookupJoin" &&
-      object.nodeBody?.distributedLookupJoin !== undefined &&
-      object.nodeBody?.distributedLookupJoin !== null
-    ) {
-      message.nodeBody = {
-        $case: "distributedLookupJoin",
-        distributedLookupJoin: DistributedLookupJoinNode.fromPartial(object.nodeBody.distributedLookupJoin),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "source" && object.nodeBody?.source !== undefined && object.nodeBody?.source !== null
-    ) {
-      message.nodeBody = { $case: "source", source: SourceNode.fromPartial(object.nodeBody.source) };
-    }
-    message.identity = object.identity ?? "";
-    return message;
-  },
-};
-
-function createBaseExchangeInfo(): ExchangeInfo {
-  return { mode: ExchangeInfo_DistributionMode.UNSPECIFIED, distribution: undefined };
-}
-
-export const ExchangeInfo = {
-  fromJSON(object: any): ExchangeInfo {
-    return {
-      mode: isSet(object.mode)
-        ? exchangeInfo_DistributionModeFromJSON(object.mode)
-        : ExchangeInfo_DistributionMode.UNSPECIFIED,
-      distribution: isSet(object.broadcastInfo)
-        ? { $case: "broadcastInfo", broadcastInfo: ExchangeInfo_BroadcastInfo.fromJSON(object.broadcastInfo) }
-        : isSet(object.hashInfo)
-        ? { $case: "hashInfo", hashInfo: ExchangeInfo_HashInfo.fromJSON(object.hashInfo) }
-        : isSet(object.consistentHashInfo)
-        ? {
-          $case: "consistentHashInfo",
-          consistentHashInfo: ExchangeInfo_ConsistentHashInfo.fromJSON(object.consistentHashInfo),
-        }
-        : undefined,
-    };
-  },
-
-  toJSON(message: ExchangeInfo): unknown {
-    const obj: any = {};
-    message.mode !== undefined && (obj.mode = exchangeInfo_DistributionModeToJSON(message.mode));
-    message.distribution?.$case === "broadcastInfo" && (obj.broadcastInfo = message.distribution?.broadcastInfo
-      ? ExchangeInfo_BroadcastInfo.toJSON(message.distribution?.broadcastInfo)
-      : undefined);
-    message.distribution?.$case === "hashInfo" && (obj.hashInfo = message.distribution?.hashInfo
-      ? ExchangeInfo_HashInfo.toJSON(message.distribution?.hashInfo)
-      : undefined);
-    message.distribution?.$case === "consistentHashInfo" &&
-      (obj.consistentHashInfo = message.distribution?.consistentHashInfo
-        ? ExchangeInfo_ConsistentHashInfo.toJSON(message.distribution?.consistentHashInfo)
-        : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExchangeInfo>, I>>(object: I): ExchangeInfo {
-    const message = createBaseExchangeInfo();
-    message.mode = object.mode ?? ExchangeInfo_DistributionMode.UNSPECIFIED;
-    if (
-      object.distribution?.$case === "broadcastInfo" &&
-      object.distribution?.broadcastInfo !== undefined &&
-      object.distribution?.broadcastInfo !== null
-    ) {
-      message.distribution = {
-        $case: "broadcastInfo",
-        broadcastInfo: ExchangeInfo_BroadcastInfo.fromPartial(object.distribution.broadcastInfo),
-      };
-    }
-    if (
-      object.distribution?.$case === "hashInfo" &&
-      object.distribution?.hashInfo !== undefined &&
-      object.distribution?.hashInfo !== null
-    ) {
-      message.distribution = {
-        $case: "hashInfo",
-        hashInfo: ExchangeInfo_HashInfo.fromPartial(object.distribution.hashInfo),
-      };
-    }
-    if (
-      object.distribution?.$case === "consistentHashInfo" &&
-      object.distribution?.consistentHashInfo !== undefined &&
-      object.distribution?.consistentHashInfo !== null
-    ) {
-      message.distribution = {
-        $case: "consistentHashInfo",
-        consistentHashInfo: ExchangeInfo_ConsistentHashInfo.fromPartial(object.distribution.consistentHashInfo),
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseExchangeInfo_BroadcastInfo(): ExchangeInfo_BroadcastInfo {
-  return { count: 0 };
-}
-
-export const ExchangeInfo_BroadcastInfo = {
-  fromJSON(object: any): ExchangeInfo_BroadcastInfo {
-    return { count: isSet(object.count) ? Number(object.count) : 0 };
-  },
-
-  toJSON(message: ExchangeInfo_BroadcastInfo): unknown {
-    const obj: any = {};
-    message.count !== undefined && (obj.count = Math.round(message.count));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExchangeInfo_BroadcastInfo>, I>>(object: I): ExchangeInfo_BroadcastInfo {
-    const message = createBaseExchangeInfo_BroadcastInfo();
-    message.count = object.count ?? 0;
-    return message;
-  },
-};
-
-function createBaseExchangeInfo_HashInfo(): ExchangeInfo_HashInfo {
-  return { outputCount: 0, key: [] };
-}
-
-export const ExchangeInfo_HashInfo = {
-  fromJSON(object: any): ExchangeInfo_HashInfo {
-    return {
-      outputCount: isSet(object.outputCount) ? Number(object.outputCount) : 0,
-      key: Array.isArray(object?.key) ? object.key.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: ExchangeInfo_HashInfo): unknown {
-    const obj: any = {};
-    message.outputCount !== undefined && (obj.outputCount = Math.round(message.outputCount));
-    if (message.key) {
-      obj.key = message.key.map((e) => Math.round(e));
-    } else {
-      obj.key = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExchangeInfo_HashInfo>, I>>(object: I): ExchangeInfo_HashInfo {
-    const message = createBaseExchangeInfo_HashInfo();
-    message.outputCount = object.outputCount ?? 0;
-    message.key = object.key?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseExchangeInfo_ConsistentHashInfo(): ExchangeInfo_ConsistentHashInfo {
-  return { vmap: [], key: [] };
-}
-
-export const ExchangeInfo_ConsistentHashInfo = {
-  fromJSON(object: any): ExchangeInfo_ConsistentHashInfo {
-    return {
-      vmap: Array.isArray(object?.vmap) ? object.vmap.map((e: any) => Number(e)) : [],
-      key: Array.isArray(object?.key) ? object.key.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: ExchangeInfo_ConsistentHashInfo): unknown {
-    const obj: any = {};
-    if (message.vmap) {
-      obj.vmap = message.vmap.map((e) => Math.round(e));
-    } else {
-      obj.vmap = [];
-    }
-    if (message.key) {
-      obj.key = message.key.map((e) => Math.round(e));
-    } else {
-      obj.key = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExchangeInfo_ConsistentHashInfo>, I>>(
-    object: I,
-  ): ExchangeInfo_ConsistentHashInfo {
-    const message = createBaseExchangeInfo_ConsistentHashInfo();
-    message.vmap = object.vmap?.map((e) => e) || [];
-    message.key = object.key?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBasePlanFragment(): PlanFragment {
-  return { root: undefined, exchangeInfo: undefined };
-}
-
-export const PlanFragment = {
-  fromJSON(object: any): PlanFragment {
-    return {
-      root: isSet(object.root) ? PlanNode.fromJSON(object.root) : undefined,
-      exchangeInfo: isSet(object.exchangeInfo) ? ExchangeInfo.fromJSON(object.exchangeInfo) : undefined,
-    };
-  },
-
-  toJSON(message: PlanFragment): unknown {
-    const obj: any = {};
-    message.root !== undefined && (obj.root = message.root ? PlanNode.toJSON(message.root) : undefined);
-    message.exchangeInfo !== undefined &&
-      (obj.exchangeInfo = message.exchangeInfo ? ExchangeInfo.toJSON(message.exchangeInfo) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PlanFragment>, I>>(object: I): PlanFragment {
-    const message = createBasePlanFragment();
-    message.root = (object.root !== undefined && object.root !== null) ? PlanNode.fromPartial(object.root) : undefined;
-    message.exchangeInfo = (object.exchangeInfo !== undefined && object.exchangeInfo !== null)
-      ? ExchangeInfo.fromPartial(object.exchangeInfo)
-      : undefined;
-    return message;
-  },
-};
-
-declare var self: any | undefined;
-declare var window: any | undefined;
-declare var global: any | undefined;
-var globalThis: any = (() => {
-  if (typeof globalThis !== "undefined") {
-    return globalThis;
-  }
-  if (typeof self !== "undefined") {
-    return self;
-  }
-  if (typeof window !== "undefined") {
-    return window;
-  }
-  if (typeof global !== "undefined") {
-    return global;
-  }
-  throw "Unable to locate global object";
-})();
-
-function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-
-function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin: string[] = [];
-    arr.forEach((byte) => {
-      bin.push(String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null;
-}
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/catalog.ts b/dashboard/proto/gen/catalog.ts
deleted file mode 100644
index 7ac3e72f20818..0000000000000
--- a/dashboard/proto/gen/catalog.ts
+++ /dev/null
@@ -1,1555 +0,0 @@
-/* eslint-disable */
-import { ColumnOrder } from "./common";
-import { DataType } from "./data";
-import { ExprNode } from "./expr";
-import { ColumnCatalog, Field, RowFormatType, rowFormatTypeFromJSON, rowFormatTypeToJSON } from "./plan_common";
-
-export const protobufPackage = "catalog";
-
-export const SinkType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  APPEND_ONLY: "APPEND_ONLY",
-  FORCE_APPEND_ONLY: "FORCE_APPEND_ONLY",
-  UPSERT: "UPSERT",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type SinkType = typeof SinkType[keyof typeof SinkType];
-
-export function sinkTypeFromJSON(object: any): SinkType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return SinkType.UNSPECIFIED;
-    case 1:
-    case "APPEND_ONLY":
-      return SinkType.APPEND_ONLY;
-    case 2:
-    case "FORCE_APPEND_ONLY":
-      return SinkType.FORCE_APPEND_ONLY;
-    case 3:
-    case "UPSERT":
-      return SinkType.UPSERT;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return SinkType.UNRECOGNIZED;
-  }
-}
-
-export function sinkTypeToJSON(object: SinkType): string {
-  switch (object) {
-    case SinkType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case SinkType.APPEND_ONLY:
-      return "APPEND_ONLY";
-    case SinkType.FORCE_APPEND_ONLY:
-      return "FORCE_APPEND_ONLY";
-    case SinkType.UPSERT:
-      return "UPSERT";
-    case SinkType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const HandleConflictBehavior = {
-  NO_CHECK_UNSPECIFIED: "NO_CHECK_UNSPECIFIED",
-  OVERWRITE: "OVERWRITE",
-  IGNORE: "IGNORE",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type HandleConflictBehavior = typeof HandleConflictBehavior[keyof typeof HandleConflictBehavior];
-
-export function handleConflictBehaviorFromJSON(object: any): HandleConflictBehavior {
-  switch (object) {
-    case 0:
-    case "NO_CHECK_UNSPECIFIED":
-      return HandleConflictBehavior.NO_CHECK_UNSPECIFIED;
-    case 1:
-    case "OVERWRITE":
-      return HandleConflictBehavior.OVERWRITE;
-    case 2:
-    case "IGNORE":
-      return HandleConflictBehavior.IGNORE;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return HandleConflictBehavior.UNRECOGNIZED;
-  }
-}
-
-export function handleConflictBehaviorToJSON(object: HandleConflictBehavior): string {
-  switch (object) {
-    case HandleConflictBehavior.NO_CHECK_UNSPECIFIED:
-      return "NO_CHECK_UNSPECIFIED";
-    case HandleConflictBehavior.OVERWRITE:
-      return "OVERWRITE";
-    case HandleConflictBehavior.IGNORE:
-      return "IGNORE";
-    case HandleConflictBehavior.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-/** A mapping of column indices. */
-export interface ColIndexMapping {
-  /** The size of the target space. */
-  targetSize: number;
-  /**
-   * Each subscript is mapped to the corresponding element.
-   * For those not mapped, the value will be negative.
-   */
-  map: number[];
-}
-
-export interface WatermarkDesc {
-  /** The column idx the watermark is on */
-  watermarkIdx: number;
-  /** The expression to calculate the watermark value. */
-  expr: ExprNode | undefined;
-}
-
-export interface StreamSourceInfo {
-  rowFormat: RowFormatType;
-  rowSchemaLocation: string;
-  useSchemaRegistry: boolean;
-  protoMessageName: string;
-  csvDelimiter: number;
-  csvHasHeader: boolean;
-  upsertAvroPrimaryKey: string;
-}
-
-export interface Source {
-  id: number;
-  schemaId: number;
-  databaseId: number;
-  name: string;
-  /**
-   * The column index of row ID. If the primary key is specified by the user,
-   * this will be `None`.
-   */
-  rowIdIndex?:
-    | number
-    | undefined;
-  /** Columns of the source. */
-  columns: ColumnCatalog[];
-  /**
-   * Column id of the primary key specified by the user. If the user does not
-   * specify a primary key, the vector will be empty.
-   */
-  pkColumnIds: number[];
-  /** Properties specified by the user in WITH clause. */
-  properties: { [key: string]: string };
-  owner: number;
-  info:
-    | StreamSourceInfo
-    | undefined;
-  /**
-   * Define watermarks on the source. The `repeated` is just for forward
-   * compatibility, currently, only one watermark on the source
-   */
-  watermarkDescs: WatermarkDesc[];
-}
-
-export interface Source_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-export interface Sink {
-  id: number;
-  schemaId: number;
-  databaseId: number;
-  name: string;
-  columns: ColumnCatalog[];
-  pk: ColumnOrder[];
-  dependentRelations: number[];
-  distributionKey: number[];
-  /** pk_indices of the corresponding materialize operator's output. */
-  streamKey: number[];
-  sinkType: SinkType;
-  owner: number;
-  properties: { [key: string]: string };
-  definition: string;
-}
-
-export interface Sink_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-export interface Connection {
-  id: number;
-  name: string;
-  info?: { $case: "privateLinkService"; privateLinkService: Connection_PrivateLinkService };
-}
-
-export interface Connection_PrivateLinkService {
-  provider: string;
-  endpointId: string;
-  dnsEntries: { [key: string]: string };
-}
-
-export interface Connection_PrivateLinkService_DnsEntriesEntry {
-  key: string;
-  value: string;
-}
-
-export interface Index {
-  id: number;
-  schemaId: number;
-  databaseId: number;
-  name: string;
-  owner: number;
-  indexTableId: number;
-  primaryTableId: number;
-  /**
-   * Only `InputRef` type index is supported Now.
-   * The index of `InputRef` is the column index of the primary table.
-   */
-  indexItem: ExprNode[];
-  originalColumns: number[];
-}
-
-export interface Function {
-  id: number;
-  schemaId: number;
-  databaseId: number;
-  name: string;
-  owner: number;
-  argTypes: DataType[];
-  returnType: DataType | undefined;
-  language: string;
-  link: string;
-  identifier: string;
-  kind?: { $case: "scalar"; scalar: Function_ScalarFunction } | { $case: "table"; table: Function_TableFunction } | {
-    $case: "aggregate";
-    aggregate: Function_AggregateFunction;
-  };
-}
-
-export interface Function_ScalarFunction {
-}
-
-export interface Function_TableFunction {
-}
-
-export interface Function_AggregateFunction {
-}
-
-/** See `TableCatalog` struct in frontend crate for more information. */
-export interface Table {
-  id: number;
-  schemaId: number;
-  databaseId: number;
-  name: string;
-  columns: ColumnCatalog[];
-  pk: ColumnOrder[];
-  dependentRelations: number[];
-  optionalAssociatedSourceId?: { $case: "associatedSourceId"; associatedSourceId: number };
-  tableType: Table_TableType;
-  distributionKey: number[];
-  /** pk_indices of the corresponding materialize operator's output. */
-  streamKey: number[];
-  appendOnly: boolean;
-  owner: number;
-  properties: { [key: string]: string };
-  fragmentId: number;
-  /**
-   * an optional column index which is the vnode of each row computed by the
-   * table's consistent hash distribution
-   */
-  vnodeColIndex?:
-    | number
-    | undefined;
-  /**
-   * An optional column index of row id. If the primary key is specified by users,
-   * this will be `None`.
-   */
-  rowIdIndex?:
-    | number
-    | undefined;
-  /**
-   * The column indices which are stored in the state store's value with
-   * row-encoding. Currently is not supported yet and expected to be
-   * `[0..columns.len()]`.
-   */
-  valueIndices: number[];
-  definition: string;
-  handlePkConflictBehavior: HandleConflictBehavior;
-  /**
-   * Anticipated read prefix pattern (number of fields) for the table, which can be utilized
-   * for implementing the table's bloom filter or other storage optimization techniques.
-   */
-  readPrefixLenHint: number;
-  watermarkIndices: number[];
-  distKeyInPk: number[];
-  /**
-   * Per-table catalog version, used by schema change. `None` for internal tables and tests.
-   * Not to be confused with the global catalog version for notification service.
-   */
-  version: Table_TableVersion | undefined;
-}
-
-export const Table_TableType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  TABLE: "TABLE",
-  MATERIALIZED_VIEW: "MATERIALIZED_VIEW",
-  INDEX: "INDEX",
-  INTERNAL: "INTERNAL",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type Table_TableType = typeof Table_TableType[keyof typeof Table_TableType];
-
-export function table_TableTypeFromJSON(object: any): Table_TableType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return Table_TableType.UNSPECIFIED;
-    case 1:
-    case "TABLE":
-      return Table_TableType.TABLE;
-    case 2:
-    case "MATERIALIZED_VIEW":
-      return Table_TableType.MATERIALIZED_VIEW;
-    case 3:
-    case "INDEX":
-      return Table_TableType.INDEX;
-    case 4:
-    case "INTERNAL":
-      return Table_TableType.INTERNAL;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return Table_TableType.UNRECOGNIZED;
-  }
-}
-
-export function table_TableTypeToJSON(object: Table_TableType): string {
-  switch (object) {
-    case Table_TableType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case Table_TableType.TABLE:
-      return "TABLE";
-    case Table_TableType.MATERIALIZED_VIEW:
-      return "MATERIALIZED_VIEW";
-    case Table_TableType.INDEX:
-      return "INDEX";
-    case Table_TableType.INTERNAL:
-      return "INTERNAL";
-    case Table_TableType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface Table_TableVersion {
-  /**
-   * The version number, which will be 0 by default and be increased by 1 for
-   * each schema change in the frontend.
-   */
-  version: number;
-  /**
-   * The ID of the next column to be added, which is used to make all columns
-   * in the table have unique IDs, even if some columns have been dropped.
-   */
-  nextColumnId: number;
-}
-
-export interface Table_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-export interface View {
-  id: number;
-  schemaId: number;
-  databaseId: number;
-  name: string;
-  owner: number;
-  properties: { [key: string]: string };
-  sql: string;
-  dependentRelations: number[];
-  /** User-specified column names. */
-  columns: Field[];
-}
-
-export interface View_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-export interface Schema {
-  id: number;
-  databaseId: number;
-  name: string;
-  owner: number;
-}
-
-export interface Database {
-  id: number;
-  name: string;
-  owner: number;
-}
-
-function createBaseColIndexMapping(): ColIndexMapping {
-  return { targetSize: 0, map: [] };
-}
-
-export const ColIndexMapping = {
-  fromJSON(object: any): ColIndexMapping {
-    return {
-      targetSize: isSet(object.targetSize) ? Number(object.targetSize) : 0,
-      map: Array.isArray(object?.map) ? object.map.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: ColIndexMapping): unknown {
-    const obj: any = {};
-    message.targetSize !== undefined && (obj.targetSize = Math.round(message.targetSize));
-    if (message.map) {
-      obj.map = message.map.map((e) => Math.round(e));
-    } else {
-      obj.map = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ColIndexMapping>, I>>(object: I): ColIndexMapping {
-    const message = createBaseColIndexMapping();
-    message.targetSize = object.targetSize ?? 0;
-    message.map = object.map?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseWatermarkDesc(): WatermarkDesc {
-  return { watermarkIdx: 0, expr: undefined };
-}
-
-export const WatermarkDesc = {
-  fromJSON(object: any): WatermarkDesc {
-    return {
-      watermarkIdx: isSet(object.watermarkIdx) ? Number(object.watermarkIdx) : 0,
-      expr: isSet(object.expr) ? ExprNode.fromJSON(object.expr) : undefined,
-    };
-  },
-
-  toJSON(message: WatermarkDesc): unknown {
-    const obj: any = {};
-    message.watermarkIdx !== undefined && (obj.watermarkIdx = Math.round(message.watermarkIdx));
-    message.expr !== undefined && (obj.expr = message.expr ? ExprNode.toJSON(message.expr) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<WatermarkDesc>, I>>(object: I): WatermarkDesc {
-    const message = createBaseWatermarkDesc();
-    message.watermarkIdx = object.watermarkIdx ?? 0;
-    message.expr = (object.expr !== undefined && object.expr !== null) ? ExprNode.fromPartial(object.expr) : undefined;
-    return message;
-  },
-};
-
-function createBaseStreamSourceInfo(): StreamSourceInfo {
-  return {
-    rowFormat: RowFormatType.ROW_UNSPECIFIED,
-    rowSchemaLocation: "",
-    useSchemaRegistry: false,
-    protoMessageName: "",
-    csvDelimiter: 0,
-    csvHasHeader: false,
-    upsertAvroPrimaryKey: "",
-  };
-}
-
-export const StreamSourceInfo = {
-  fromJSON(object: any): StreamSourceInfo {
-    return {
-      rowFormat: isSet(object.rowFormat) ? rowFormatTypeFromJSON(object.rowFormat) : RowFormatType.ROW_UNSPECIFIED,
-      rowSchemaLocation: isSet(object.rowSchemaLocation) ? String(object.rowSchemaLocation) : "",
-      useSchemaRegistry: isSet(object.useSchemaRegistry) ? Boolean(object.useSchemaRegistry) : false,
-      protoMessageName: isSet(object.protoMessageName) ? String(object.protoMessageName) : "",
-      csvDelimiter: isSet(object.csvDelimiter) ? Number(object.csvDelimiter) : 0,
-      csvHasHeader: isSet(object.csvHasHeader) ? Boolean(object.csvHasHeader) : false,
-      upsertAvroPrimaryKey: isSet(object.upsertAvroPrimaryKey) ? String(object.upsertAvroPrimaryKey) : "",
-    };
-  },
-
-  toJSON(message: StreamSourceInfo): unknown {
-    const obj: any = {};
-    message.rowFormat !== undefined && (obj.rowFormat = rowFormatTypeToJSON(message.rowFormat));
-    message.rowSchemaLocation !== undefined && (obj.rowSchemaLocation = message.rowSchemaLocation);
-    message.useSchemaRegistry !== undefined && (obj.useSchemaRegistry = message.useSchemaRegistry);
-    message.protoMessageName !== undefined && (obj.protoMessageName = message.protoMessageName);
-    message.csvDelimiter !== undefined && (obj.csvDelimiter = Math.round(message.csvDelimiter));
-    message.csvHasHeader !== undefined && (obj.csvHasHeader = message.csvHasHeader);
-    message.upsertAvroPrimaryKey !== undefined && (obj.upsertAvroPrimaryKey = message.upsertAvroPrimaryKey);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamSourceInfo>, I>>(object: I): StreamSourceInfo {
-    const message = createBaseStreamSourceInfo();
-    message.rowFormat = object.rowFormat ?? RowFormatType.ROW_UNSPECIFIED;
-    message.rowSchemaLocation = object.rowSchemaLocation ?? "";
-    message.useSchemaRegistry = object.useSchemaRegistry ?? false;
-    message.protoMessageName = object.protoMessageName ?? "";
-    message.csvDelimiter = object.csvDelimiter ?? 0;
-    message.csvHasHeader = object.csvHasHeader ?? false;
-    message.upsertAvroPrimaryKey = object.upsertAvroPrimaryKey ?? "";
-    return message;
-  },
-};
-
-function createBaseSource(): Source {
-  return {
-    id: 0,
-    schemaId: 0,
-    databaseId: 0,
-    name: "",
-    rowIdIndex: undefined,
-    columns: [],
-    pkColumnIds: [],
-    properties: {},
-    owner: 0,
-    info: undefined,
-    watermarkDescs: [],
-  };
-}
-
-export const Source = {
-  fromJSON(object: any): Source {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      schemaId: isSet(object.schemaId) ? Number(object.schemaId) : 0,
-      databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      rowIdIndex: isSet(object.rowIdIndex) ? Number(object.rowIdIndex) : undefined,
-      columns: Array.isArray(object?.columns) ? object.columns.map((e: any) => ColumnCatalog.fromJSON(e)) : [],
-      pkColumnIds: Array.isArray(object?.pkColumnIds) ? object.pkColumnIds.map((e: any) => Number(e)) : [],
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-      owner: isSet(object.owner) ? Number(object.owner) : 0,
-      info: isSet(object.info) ? StreamSourceInfo.fromJSON(object.info) : undefined,
-      watermarkDescs: Array.isArray(object?.watermarkDescs)
-        ? object.watermarkDescs.map((e: any) => WatermarkDesc.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: Source): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.schemaId !== undefined && (obj.schemaId = Math.round(message.schemaId));
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    message.name !== undefined && (obj.name = message.name);
-    message.rowIdIndex !== undefined && (obj.rowIdIndex = Math.round(message.rowIdIndex));
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? ColumnCatalog.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    if (message.pkColumnIds) {
-      obj.pkColumnIds = message.pkColumnIds.map((e) => Math.round(e));
-    } else {
-      obj.pkColumnIds = [];
-    }
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    message.owner !== undefined && (obj.owner = Math.round(message.owner));
-    message.info !== undefined && (obj.info = message.info ? StreamSourceInfo.toJSON(message.info) : undefined);
-    if (message.watermarkDescs) {
-      obj.watermarkDescs = message.watermarkDescs.map((e) => e ? WatermarkDesc.toJSON(e) : undefined);
-    } else {
-      obj.watermarkDescs = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Source>, I>>(object: I): Source {
-    const message = createBaseSource();
-    message.id = object.id ?? 0;
-    message.schemaId = object.schemaId ?? 0;
-    message.databaseId = object.databaseId ?? 0;
-    message.name = object.name ?? "";
-    message.rowIdIndex = object.rowIdIndex ?? undefined;
-    message.columns = object.columns?.map((e) => ColumnCatalog.fromPartial(e)) || [];
-    message.pkColumnIds = object.pkColumnIds?.map((e) => e) || [];
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.owner = object.owner ?? 0;
-    message.info = (object.info !== undefined && object.info !== null)
-      ? StreamSourceInfo.fromPartial(object.info)
-      : undefined;
-    message.watermarkDescs = object.watermarkDescs?.map((e) => WatermarkDesc.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseSource_PropertiesEntry(): Source_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const Source_PropertiesEntry = {
-  fromJSON(object: any): Source_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: Source_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Source_PropertiesEntry>, I>>(object: I): Source_PropertiesEntry {
-    const message = createBaseSource_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseSink(): Sink {
-  return {
-    id: 0,
-    schemaId: 0,
-    databaseId: 0,
-    name: "",
-    columns: [],
-    pk: [],
-    dependentRelations: [],
-    distributionKey: [],
-    streamKey: [],
-    sinkType: SinkType.UNSPECIFIED,
-    owner: 0,
-    properties: {},
-    definition: "",
-  };
-}
-
-export const Sink = {
-  fromJSON(object: any): Sink {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      schemaId: isSet(object.schemaId) ? Number(object.schemaId) : 0,
-      databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      columns: Array.isArray(object?.columns) ? object.columns.map((e: any) => ColumnCatalog.fromJSON(e)) : [],
-      pk: Array.isArray(object?.pk) ? object.pk.map((e: any) => ColumnOrder.fromJSON(e)) : [],
-      dependentRelations: Array.isArray(object?.dependentRelations)
-        ? object.dependentRelations.map((e: any) => Number(e))
-        : [],
-      distributionKey: Array.isArray(object?.distributionKey)
-        ? object.distributionKey.map((e: any) => Number(e))
-        : [],
-      streamKey: Array.isArray(object?.streamKey) ? object.streamKey.map((e: any) => Number(e)) : [],
-      sinkType: isSet(object.sinkType) ? sinkTypeFromJSON(object.sinkType) : SinkType.UNSPECIFIED,
-      owner: isSet(object.owner) ? Number(object.owner) : 0,
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-      definition: isSet(object.definition) ? String(object.definition) : "",
-    };
-  },
-
-  toJSON(message: Sink): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.schemaId !== undefined && (obj.schemaId = Math.round(message.schemaId));
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    message.name !== undefined && (obj.name = message.name);
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? ColumnCatalog.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    if (message.pk) {
-      obj.pk = message.pk.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.pk = [];
-    }
-    if (message.dependentRelations) {
-      obj.dependentRelations = message.dependentRelations.map((e) => Math.round(e));
-    } else {
-      obj.dependentRelations = [];
-    }
-    if (message.distributionKey) {
-      obj.distributionKey = message.distributionKey.map((e) => Math.round(e));
-    } else {
-      obj.distributionKey = [];
-    }
-    if (message.streamKey) {
-      obj.streamKey = message.streamKey.map((e) => Math.round(e));
-    } else {
-      obj.streamKey = [];
-    }
-    message.sinkType !== undefined && (obj.sinkType = sinkTypeToJSON(message.sinkType));
-    message.owner !== undefined && (obj.owner = Math.round(message.owner));
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    message.definition !== undefined && (obj.definition = message.definition);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Sink>, I>>(object: I): Sink {
-    const message = createBaseSink();
-    message.id = object.id ?? 0;
-    message.schemaId = object.schemaId ?? 0;
-    message.databaseId = object.databaseId ?? 0;
-    message.name = object.name ?? "";
-    message.columns = object.columns?.map((e) => ColumnCatalog.fromPartial(e)) || [];
-    message.pk = object.pk?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.dependentRelations = object.dependentRelations?.map((e) => e) || [];
-    message.distributionKey = object.distributionKey?.map((e) => e) || [];
-    message.streamKey = object.streamKey?.map((e) => e) || [];
-    message.sinkType = object.sinkType ?? SinkType.UNSPECIFIED;
-    message.owner = object.owner ?? 0;
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.definition = object.definition ?? "";
-    return message;
-  },
-};
-
-function createBaseSink_PropertiesEntry(): Sink_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const Sink_PropertiesEntry = {
-  fromJSON(object: any): Sink_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: Sink_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Sink_PropertiesEntry>, I>>(object: I): Sink_PropertiesEntry {
-    const message = createBaseSink_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseConnection(): Connection {
-  return { id: 0, name: "", info: undefined };
-}
-
-export const Connection = {
-  fromJSON(object: any): Connection {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      info: isSet(object.privateLinkService)
-        ? {
-          $case: "privateLinkService",
-          privateLinkService: Connection_PrivateLinkService.fromJSON(object.privateLinkService),
-        }
-        : undefined,
-    };
-  },
-
-  toJSON(message: Connection): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.name !== undefined && (obj.name = message.name);
-    message.info?.$case === "privateLinkService" && (obj.privateLinkService = message.info?.privateLinkService
-      ? Connection_PrivateLinkService.toJSON(message.info?.privateLinkService)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Connection>, I>>(object: I): Connection {
-    const message = createBaseConnection();
-    message.id = object.id ?? 0;
-    message.name = object.name ?? "";
-    if (
-      object.info?.$case === "privateLinkService" &&
-      object.info?.privateLinkService !== undefined &&
-      object.info?.privateLinkService !== null
-    ) {
-      message.info = {
-        $case: "privateLinkService",
-        privateLinkService: Connection_PrivateLinkService.fromPartial(object.info.privateLinkService),
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseConnection_PrivateLinkService(): Connection_PrivateLinkService {
-  return { provider: "", endpointId: "", dnsEntries: {} };
-}
-
-export const Connection_PrivateLinkService = {
-  fromJSON(object: any): Connection_PrivateLinkService {
-    return {
-      provider: isSet(object.provider) ? String(object.provider) : "",
-      endpointId: isSet(object.endpointId) ? String(object.endpointId) : "",
-      dnsEntries: isObject(object.dnsEntries)
-        ? Object.entries(object.dnsEntries).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: Connection_PrivateLinkService): unknown {
-    const obj: any = {};
-    message.provider !== undefined && (obj.provider = message.provider);
-    message.endpointId !== undefined && (obj.endpointId = message.endpointId);
-    obj.dnsEntries = {};
-    if (message.dnsEntries) {
-      Object.entries(message.dnsEntries).forEach(([k, v]) => {
-        obj.dnsEntries[k] = v;
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Connection_PrivateLinkService>, I>>(
-    object: I,
-  ): Connection_PrivateLinkService {
-    const message = createBaseConnection_PrivateLinkService();
-    message.provider = object.provider ?? "";
-    message.endpointId = object.endpointId ?? "";
-    message.dnsEntries = Object.entries(object.dnsEntries ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseConnection_PrivateLinkService_DnsEntriesEntry(): Connection_PrivateLinkService_DnsEntriesEntry {
-  return { key: "", value: "" };
-}
-
-export const Connection_PrivateLinkService_DnsEntriesEntry = {
-  fromJSON(object: any): Connection_PrivateLinkService_DnsEntriesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: Connection_PrivateLinkService_DnsEntriesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Connection_PrivateLinkService_DnsEntriesEntry>, I>>(
-    object: I,
-  ): Connection_PrivateLinkService_DnsEntriesEntry {
-    const message = createBaseConnection_PrivateLinkService_DnsEntriesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseIndex(): Index {
-  return {
-    id: 0,
-    schemaId: 0,
-    databaseId: 0,
-    name: "",
-    owner: 0,
-    indexTableId: 0,
-    primaryTableId: 0,
-    indexItem: [],
-    originalColumns: [],
-  };
-}
-
-export const Index = {
-  fromJSON(object: any): Index {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      schemaId: isSet(object.schemaId) ? Number(object.schemaId) : 0,
-      databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      owner: isSet(object.owner) ? Number(object.owner) : 0,
-      indexTableId: isSet(object.indexTableId) ? Number(object.indexTableId) : 0,
-      primaryTableId: isSet(object.primaryTableId) ? Number(object.primaryTableId) : 0,
-      indexItem: Array.isArray(object?.indexItem)
-        ? object.indexItem.map((e: any) => ExprNode.fromJSON(e))
-        : [],
-      originalColumns: Array.isArray(object?.originalColumns) ? object.originalColumns.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: Index): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.schemaId !== undefined && (obj.schemaId = Math.round(message.schemaId));
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    message.name !== undefined && (obj.name = message.name);
-    message.owner !== undefined && (obj.owner = Math.round(message.owner));
-    message.indexTableId !== undefined && (obj.indexTableId = Math.round(message.indexTableId));
-    message.primaryTableId !== undefined && (obj.primaryTableId = Math.round(message.primaryTableId));
-    if (message.indexItem) {
-      obj.indexItem = message.indexItem.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.indexItem = [];
-    }
-    if (message.originalColumns) {
-      obj.originalColumns = message.originalColumns.map((e) => Math.round(e));
-    } else {
-      obj.originalColumns = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Index>, I>>(object: I): Index {
-    const message = createBaseIndex();
-    message.id = object.id ?? 0;
-    message.schemaId = object.schemaId ?? 0;
-    message.databaseId = object.databaseId ?? 0;
-    message.name = object.name ?? "";
-    message.owner = object.owner ?? 0;
-    message.indexTableId = object.indexTableId ?? 0;
-    message.primaryTableId = object.primaryTableId ?? 0;
-    message.indexItem = object.indexItem?.map((e) => ExprNode.fromPartial(e)) || [];
-    message.originalColumns = object.originalColumns?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseFunction(): Function {
-  return {
-    id: 0,
-    schemaId: 0,
-    databaseId: 0,
-    name: "",
-    owner: 0,
-    argTypes: [],
-    returnType: undefined,
-    language: "",
-    link: "",
-    identifier: "",
-    kind: undefined,
-  };
-}
-
-export const Function = {
-  fromJSON(object: any): Function {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      schemaId: isSet(object.schemaId) ? Number(object.schemaId) : 0,
-      databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      owner: isSet(object.owner) ? Number(object.owner) : 0,
-      argTypes: Array.isArray(object?.argTypes)
-        ? object.argTypes.map((e: any) => DataType.fromJSON(e))
-        : [],
-      returnType: isSet(object.returnType) ? DataType.fromJSON(object.returnType) : undefined,
-      language: isSet(object.language) ? String(object.language) : "",
-      link: isSet(object.link) ? String(object.link) : "",
-      identifier: isSet(object.identifier) ? String(object.identifier) : "",
-      kind: isSet(object.scalar)
-        ? { $case: "scalar", scalar: Function_ScalarFunction.fromJSON(object.scalar) }
-        : isSet(object.table)
-        ? { $case: "table", table: Function_TableFunction.fromJSON(object.table) }
-        : isSet(object.aggregate)
-        ? { $case: "aggregate", aggregate: Function_AggregateFunction.fromJSON(object.aggregate) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: Function): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.schemaId !== undefined && (obj.schemaId = Math.round(message.schemaId));
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    message.name !== undefined && (obj.name = message.name);
-    message.owner !== undefined && (obj.owner = Math.round(message.owner));
-    if (message.argTypes) {
-      obj.argTypes = message.argTypes.map((e) => e ? DataType.toJSON(e) : undefined);
-    } else {
-      obj.argTypes = [];
-    }
-    message.returnType !== undefined &&
-      (obj.returnType = message.returnType ? DataType.toJSON(message.returnType) : undefined);
-    message.language !== undefined && (obj.language = message.language);
-    message.link !== undefined && (obj.link = message.link);
-    message.identifier !== undefined && (obj.identifier = message.identifier);
-    message.kind?.$case === "scalar" &&
-      (obj.scalar = message.kind?.scalar ? Function_ScalarFunction.toJSON(message.kind?.scalar) : undefined);
-    message.kind?.$case === "table" &&
-      (obj.table = message.kind?.table ? Function_TableFunction.toJSON(message.kind?.table) : undefined);
-    message.kind?.$case === "aggregate" &&
-      (obj.aggregate = message.kind?.aggregate
-        ? Function_AggregateFunction.toJSON(message.kind?.aggregate)
-        : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Function>, I>>(object: I): Function {
-    const message = createBaseFunction();
-    message.id = object.id ?? 0;
-    message.schemaId = object.schemaId ?? 0;
-    message.databaseId = object.databaseId ?? 0;
-    message.name = object.name ?? "";
-    message.owner = object.owner ?? 0;
-    message.argTypes = object.argTypes?.map((e) => DataType.fromPartial(e)) || [];
-    message.returnType = (object.returnType !== undefined && object.returnType !== null)
-      ? DataType.fromPartial(object.returnType)
-      : undefined;
-    message.language = object.language ?? "";
-    message.link = object.link ?? "";
-    message.identifier = object.identifier ?? "";
-    if (object.kind?.$case === "scalar" && object.kind?.scalar !== undefined && object.kind?.scalar !== null) {
-      message.kind = { $case: "scalar", scalar: Function_ScalarFunction.fromPartial(object.kind.scalar) };
-    }
-    if (object.kind?.$case === "table" && object.kind?.table !== undefined && object.kind?.table !== null) {
-      message.kind = { $case: "table", table: Function_TableFunction.fromPartial(object.kind.table) };
-    }
-    if (object.kind?.$case === "aggregate" && object.kind?.aggregate !== undefined && object.kind?.aggregate !== null) {
-      message.kind = { $case: "aggregate", aggregate: Function_AggregateFunction.fromPartial(object.kind.aggregate) };
-    }
-    return message;
-  },
-};
-
-function createBaseFunction_ScalarFunction(): Function_ScalarFunction {
-  return {};
-}
-
-export const Function_ScalarFunction = {
-  fromJSON(_: any): Function_ScalarFunction {
-    return {};
-  },
-
-  toJSON(_: Function_ScalarFunction): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Function_ScalarFunction>, I>>(_: I): Function_ScalarFunction {
-    const message = createBaseFunction_ScalarFunction();
-    return message;
-  },
-};
-
-function createBaseFunction_TableFunction(): Function_TableFunction {
-  return {};
-}
-
-export const Function_TableFunction = {
-  fromJSON(_: any): Function_TableFunction {
-    return {};
-  },
-
-  toJSON(_: Function_TableFunction): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Function_TableFunction>, I>>(_: I): Function_TableFunction {
-    const message = createBaseFunction_TableFunction();
-    return message;
-  },
-};
-
-function createBaseFunction_AggregateFunction(): Function_AggregateFunction {
-  return {};
-}
-
-export const Function_AggregateFunction = {
-  fromJSON(_: any): Function_AggregateFunction {
-    return {};
-  },
-
-  toJSON(_: Function_AggregateFunction): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Function_AggregateFunction>, I>>(_: I): Function_AggregateFunction {
-    const message = createBaseFunction_AggregateFunction();
-    return message;
-  },
-};
-
-function createBaseTable(): Table {
-  return {
-    id: 0,
-    schemaId: 0,
-    databaseId: 0,
-    name: "",
-    columns: [],
-    pk: [],
-    dependentRelations: [],
-    optionalAssociatedSourceId: undefined,
-    tableType: Table_TableType.UNSPECIFIED,
-    distributionKey: [],
-    streamKey: [],
-    appendOnly: false,
-    owner: 0,
-    properties: {},
-    fragmentId: 0,
-    vnodeColIndex: undefined,
-    rowIdIndex: undefined,
-    valueIndices: [],
-    definition: "",
-    handlePkConflictBehavior: HandleConflictBehavior.NO_CHECK_UNSPECIFIED,
-    readPrefixLenHint: 0,
-    watermarkIndices: [],
-    distKeyInPk: [],
-    version: undefined,
-  };
-}
-
-export const Table = {
-  fromJSON(object: any): Table {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      schemaId: isSet(object.schemaId) ? Number(object.schemaId) : 0,
-      databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      columns: Array.isArray(object?.columns) ? object.columns.map((e: any) => ColumnCatalog.fromJSON(e)) : [],
-      pk: Array.isArray(object?.pk) ? object.pk.map((e: any) => ColumnOrder.fromJSON(e)) : [],
-      dependentRelations: Array.isArray(object?.dependentRelations)
-        ? object.dependentRelations.map((e: any) => Number(e))
-        : [],
-      optionalAssociatedSourceId: isSet(object.associatedSourceId)
-        ? { $case: "associatedSourceId", associatedSourceId: Number(object.associatedSourceId) }
-        : undefined,
-      tableType: isSet(object.tableType) ? table_TableTypeFromJSON(object.tableType) : Table_TableType.UNSPECIFIED,
-      distributionKey: Array.isArray(object?.distributionKey)
-        ? object.distributionKey.map((e: any) => Number(e))
-        : [],
-      streamKey: Array.isArray(object?.streamKey) ? object.streamKey.map((e: any) => Number(e)) : [],
-      appendOnly: isSet(object.appendOnly) ? Boolean(object.appendOnly) : false,
-      owner: isSet(object.owner) ? Number(object.owner) : 0,
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-      fragmentId: isSet(object.fragmentId) ? Number(object.fragmentId) : 0,
-      vnodeColIndex: isSet(object.vnodeColIndex) ? Number(object.vnodeColIndex) : undefined,
-      rowIdIndex: isSet(object.rowIdIndex) ? Number(object.rowIdIndex) : undefined,
-      valueIndices: Array.isArray(object?.valueIndices)
-        ? object.valueIndices.map((e: any) => Number(e))
-        : [],
-      definition: isSet(object.definition) ? String(object.definition) : "",
-      handlePkConflictBehavior: isSet(object.handlePkConflictBehavior)
-        ? handleConflictBehaviorFromJSON(object.handlePkConflictBehavior)
-        : HandleConflictBehavior.NO_CHECK_UNSPECIFIED,
-      readPrefixLenHint: isSet(object.readPrefixLenHint) ? Number(object.readPrefixLenHint) : 0,
-      watermarkIndices: Array.isArray(object?.watermarkIndices)
-        ? object.watermarkIndices.map((e: any) => Number(e))
-        : [],
-      distKeyInPk: Array.isArray(object?.distKeyInPk) ? object.distKeyInPk.map((e: any) => Number(e)) : [],
-      version: isSet(object.version) ? Table_TableVersion.fromJSON(object.version) : undefined,
-    };
-  },
-
-  toJSON(message: Table): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.schemaId !== undefined && (obj.schemaId = Math.round(message.schemaId));
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    message.name !== undefined && (obj.name = message.name);
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? ColumnCatalog.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    if (message.pk) {
-      obj.pk = message.pk.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.pk = [];
-    }
-    if (message.dependentRelations) {
-      obj.dependentRelations = message.dependentRelations.map((e) => Math.round(e));
-    } else {
-      obj.dependentRelations = [];
-    }
-    message.optionalAssociatedSourceId?.$case === "associatedSourceId" &&
-      (obj.associatedSourceId = Math.round(message.optionalAssociatedSourceId?.associatedSourceId));
-    message.tableType !== undefined && (obj.tableType = table_TableTypeToJSON(message.tableType));
-    if (message.distributionKey) {
-      obj.distributionKey = message.distributionKey.map((e) => Math.round(e));
-    } else {
-      obj.distributionKey = [];
-    }
-    if (message.streamKey) {
-      obj.streamKey = message.streamKey.map((e) => Math.round(e));
-    } else {
-      obj.streamKey = [];
-    }
-    message.appendOnly !== undefined && (obj.appendOnly = message.appendOnly);
-    message.owner !== undefined && (obj.owner = Math.round(message.owner));
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    message.fragmentId !== undefined && (obj.fragmentId = Math.round(message.fragmentId));
-    message.vnodeColIndex !== undefined && (obj.vnodeColIndex = Math.round(message.vnodeColIndex));
-    message.rowIdIndex !== undefined && (obj.rowIdIndex = Math.round(message.rowIdIndex));
-    if (message.valueIndices) {
-      obj.valueIndices = message.valueIndices.map((e) => Math.round(e));
-    } else {
-      obj.valueIndices = [];
-    }
-    message.definition !== undefined && (obj.definition = message.definition);
-    message.handlePkConflictBehavior !== undefined &&
-      (obj.handlePkConflictBehavior = handleConflictBehaviorToJSON(message.handlePkConflictBehavior));
-    message.readPrefixLenHint !== undefined && (obj.readPrefixLenHint = Math.round(message.readPrefixLenHint));
-    if (message.watermarkIndices) {
-      obj.watermarkIndices = message.watermarkIndices.map((e) => Math.round(e));
-    } else {
-      obj.watermarkIndices = [];
-    }
-    if (message.distKeyInPk) {
-      obj.distKeyInPk = message.distKeyInPk.map((e) => Math.round(e));
-    } else {
-      obj.distKeyInPk = [];
-    }
-    message.version !== undefined &&
-      (obj.version = message.version ? Table_TableVersion.toJSON(message.version) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Table>, I>>(object: I): Table {
-    const message = createBaseTable();
-    message.id = object.id ?? 0;
-    message.schemaId = object.schemaId ?? 0;
-    message.databaseId = object.databaseId ?? 0;
-    message.name = object.name ?? "";
-    message.columns = object.columns?.map((e) => ColumnCatalog.fromPartial(e)) || [];
-    message.pk = object.pk?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.dependentRelations = object.dependentRelations?.map((e) => e) || [];
-    if (
-      object.optionalAssociatedSourceId?.$case === "associatedSourceId" &&
-      object.optionalAssociatedSourceId?.associatedSourceId !== undefined &&
-      object.optionalAssociatedSourceId?.associatedSourceId !== null
-    ) {
-      message.optionalAssociatedSourceId = {
-        $case: "associatedSourceId",
-        associatedSourceId: object.optionalAssociatedSourceId.associatedSourceId,
-      };
-    }
-    message.tableType = object.tableType ?? Table_TableType.UNSPECIFIED;
-    message.distributionKey = object.distributionKey?.map((e) => e) || [];
-    message.streamKey = object.streamKey?.map((e) => e) || [];
-    message.appendOnly = object.appendOnly ?? false;
-    message.owner = object.owner ?? 0;
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.fragmentId = object.fragmentId ?? 0;
-    message.vnodeColIndex = object.vnodeColIndex ?? undefined;
-    message.rowIdIndex = object.rowIdIndex ?? undefined;
-    message.valueIndices = object.valueIndices?.map((e) => e) || [];
-    message.definition = object.definition ?? "";
-    message.handlePkConflictBehavior = object.handlePkConflictBehavior ?? HandleConflictBehavior.NO_CHECK_UNSPECIFIED;
-    message.readPrefixLenHint = object.readPrefixLenHint ?? 0;
-    message.watermarkIndices = object.watermarkIndices?.map((e) => e) || [];
-    message.distKeyInPk = object.distKeyInPk?.map((e) => e) || [];
-    message.version = (object.version !== undefined && object.version !== null)
-      ? Table_TableVersion.fromPartial(object.version)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseTable_TableVersion(): Table_TableVersion {
-  return { version: 0, nextColumnId: 0 };
-}
-
-export const Table_TableVersion = {
-  fromJSON(object: any): Table_TableVersion {
-    return {
-      version: isSet(object.version) ? Number(object.version) : 0,
-      nextColumnId: isSet(object.nextColumnId) ? Number(object.nextColumnId) : 0,
-    };
-  },
-
-  toJSON(message: Table_TableVersion): unknown {
-    const obj: any = {};
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    message.nextColumnId !== undefined && (obj.nextColumnId = Math.round(message.nextColumnId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Table_TableVersion>, I>>(object: I): Table_TableVersion {
-    const message = createBaseTable_TableVersion();
-    message.version = object.version ?? 0;
-    message.nextColumnId = object.nextColumnId ?? 0;
-    return message;
-  },
-};
-
-function createBaseTable_PropertiesEntry(): Table_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const Table_PropertiesEntry = {
-  fromJSON(object: any): Table_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: Table_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Table_PropertiesEntry>, I>>(object: I): Table_PropertiesEntry {
-    const message = createBaseTable_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseView(): View {
-  return {
-    id: 0,
-    schemaId: 0,
-    databaseId: 0,
-    name: "",
-    owner: 0,
-    properties: {},
-    sql: "",
-    dependentRelations: [],
-    columns: [],
-  };
-}
-
-export const View = {
-  fromJSON(object: any): View {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      schemaId: isSet(object.schemaId) ? Number(object.schemaId) : 0,
-      databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      owner: isSet(object.owner) ? Number(object.owner) : 0,
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-      sql: isSet(object.sql) ? String(object.sql) : "",
-      dependentRelations: Array.isArray(object?.dependentRelations)
-        ? object.dependentRelations.map((e: any) => Number(e))
-        : [],
-      columns: Array.isArray(object?.columns)
-        ? object.columns.map((e: any) => Field.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: View): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.schemaId !== undefined && (obj.schemaId = Math.round(message.schemaId));
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    message.name !== undefined && (obj.name = message.name);
-    message.owner !== undefined && (obj.owner = Math.round(message.owner));
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    message.sql !== undefined && (obj.sql = message.sql);
-    if (message.dependentRelations) {
-      obj.dependentRelations = message.dependentRelations.map((e) => Math.round(e));
-    } else {
-      obj.dependentRelations = [];
-    }
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? Field.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<View>, I>>(object: I): View {
-    const message = createBaseView();
-    message.id = object.id ?? 0;
-    message.schemaId = object.schemaId ?? 0;
-    message.databaseId = object.databaseId ?? 0;
-    message.name = object.name ?? "";
-    message.owner = object.owner ?? 0;
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.sql = object.sql ?? "";
-    message.dependentRelations = object.dependentRelations?.map((e) => e) || [];
-    message.columns = object.columns?.map((e) => Field.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseView_PropertiesEntry(): View_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const View_PropertiesEntry = {
-  fromJSON(object: any): View_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: View_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<View_PropertiesEntry>, I>>(object: I): View_PropertiesEntry {
-    const message = createBaseView_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseSchema(): Schema {
-  return { id: 0, databaseId: 0, name: "", owner: 0 };
-}
-
-export const Schema = {
-  fromJSON(object: any): Schema {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      owner: isSet(object.owner) ? Number(object.owner) : 0,
-    };
-  },
-
-  toJSON(message: Schema): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    message.name !== undefined && (obj.name = message.name);
-    message.owner !== undefined && (obj.owner = Math.round(message.owner));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Schema>, I>>(object: I): Schema {
-    const message = createBaseSchema();
-    message.id = object.id ?? 0;
-    message.databaseId = object.databaseId ?? 0;
-    message.name = object.name ?? "";
-    message.owner = object.owner ?? 0;
-    return message;
-  },
-};
-
-function createBaseDatabase(): Database {
-  return { id: 0, name: "", owner: 0 };
-}
-
-export const Database = {
-  fromJSON(object: any): Database {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      owner: isSet(object.owner) ? Number(object.owner) : 0,
-    };
-  },
-
-  toJSON(message: Database): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.name !== undefined && (obj.name = message.name);
-    message.owner !== undefined && (obj.owner = Math.round(message.owner));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Database>, I>>(object: I): Database {
-    const message = createBaseDatabase();
-    message.id = object.id ?? 0;
-    message.name = object.name ?? "";
-    message.owner = object.owner ?? 0;
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null;
-}
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/common.ts b/dashboard/proto/gen/common.ts
deleted file mode 100644
index f3cefe80d6710..0000000000000
--- a/dashboard/proto/gen/common.ts
+++ /dev/null
@@ -1,659 +0,0 @@
-/* eslint-disable */
-
-export const protobufPackage = "common";
-
-export const WorkerType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  FRONTEND: "FRONTEND",
-  COMPUTE_NODE: "COMPUTE_NODE",
-  RISE_CTL: "RISE_CTL",
-  COMPACTOR: "COMPACTOR",
-  META: "META",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type WorkerType = typeof WorkerType[keyof typeof WorkerType];
-
-export function workerTypeFromJSON(object: any): WorkerType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return WorkerType.UNSPECIFIED;
-    case 1:
-    case "FRONTEND":
-      return WorkerType.FRONTEND;
-    case 2:
-    case "COMPUTE_NODE":
-      return WorkerType.COMPUTE_NODE;
-    case 3:
-    case "RISE_CTL":
-      return WorkerType.RISE_CTL;
-    case 4:
-    case "COMPACTOR":
-      return WorkerType.COMPACTOR;
-    case 5:
-    case "META":
-      return WorkerType.META;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return WorkerType.UNRECOGNIZED;
-  }
-}
-
-export function workerTypeToJSON(object: WorkerType): string {
-  switch (object) {
-    case WorkerType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case WorkerType.FRONTEND:
-      return "FRONTEND";
-    case WorkerType.COMPUTE_NODE:
-      return "COMPUTE_NODE";
-    case WorkerType.RISE_CTL:
-      return "RISE_CTL";
-    case WorkerType.COMPACTOR:
-      return "COMPACTOR";
-    case WorkerType.META:
-      return "META";
-    case WorkerType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const Direction = {
-  DIRECTION_UNSPECIFIED: "DIRECTION_UNSPECIFIED",
-  DIRECTION_ASCENDING: "DIRECTION_ASCENDING",
-  DIRECTION_DESCENDING: "DIRECTION_DESCENDING",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type Direction = typeof Direction[keyof typeof Direction];
-
-export function directionFromJSON(object: any): Direction {
-  switch (object) {
-    case 0:
-    case "DIRECTION_UNSPECIFIED":
-      return Direction.DIRECTION_UNSPECIFIED;
-    case 1:
-    case "DIRECTION_ASCENDING":
-      return Direction.DIRECTION_ASCENDING;
-    case 2:
-    case "DIRECTION_DESCENDING":
-      return Direction.DIRECTION_DESCENDING;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return Direction.UNRECOGNIZED;
-  }
-}
-
-export function directionToJSON(object: Direction): string {
-  switch (object) {
-    case Direction.DIRECTION_UNSPECIFIED:
-      return "DIRECTION_UNSPECIFIED";
-    case Direction.DIRECTION_ASCENDING:
-      return "DIRECTION_ASCENDING";
-    case Direction.DIRECTION_DESCENDING:
-      return "DIRECTION_DESCENDING";
-    case Direction.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface Status {
-  code: Status_Code;
-  message: string;
-}
-
-export const Status_Code = {
-  UNSPECIFIED: "UNSPECIFIED",
-  OK: "OK",
-  UNKNOWN_WORKER: "UNKNOWN_WORKER",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type Status_Code = typeof Status_Code[keyof typeof Status_Code];
-
-export function status_CodeFromJSON(object: any): Status_Code {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return Status_Code.UNSPECIFIED;
-    case 1:
-    case "OK":
-      return Status_Code.OK;
-    case 2:
-    case "UNKNOWN_WORKER":
-      return Status_Code.UNKNOWN_WORKER;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return Status_Code.UNRECOGNIZED;
-  }
-}
-
-export function status_CodeToJSON(object: Status_Code): string {
-  switch (object) {
-    case Status_Code.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case Status_Code.OK:
-      return "OK";
-    case Status_Code.UNKNOWN_WORKER:
-      return "UNKNOWN_WORKER";
-    case Status_Code.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface HostAddress {
-  host: string;
-  port: number;
-}
-
-/** Encode which host machine an actor resides. */
-export interface ActorInfo {
-  actorId: number;
-  host: HostAddress | undefined;
-}
-
-export interface ParallelUnit {
-  id: number;
-  workerNodeId: number;
-}
-
-export interface WorkerNode {
-  id: number;
-  type: WorkerType;
-  host: HostAddress | undefined;
-  state: WorkerNode_State;
-  parallelUnits: ParallelUnit[];
-}
-
-export const WorkerNode_State = {
-  UNSPECIFIED: "UNSPECIFIED",
-  STARTING: "STARTING",
-  RUNNING: "RUNNING",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type WorkerNode_State = typeof WorkerNode_State[keyof typeof WorkerNode_State];
-
-export function workerNode_StateFromJSON(object: any): WorkerNode_State {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return WorkerNode_State.UNSPECIFIED;
-    case 1:
-    case "STARTING":
-      return WorkerNode_State.STARTING;
-    case 2:
-    case "RUNNING":
-      return WorkerNode_State.RUNNING;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return WorkerNode_State.UNRECOGNIZED;
-  }
-}
-
-export function workerNode_StateToJSON(object: WorkerNode_State): string {
-  switch (object) {
-    case WorkerNode_State.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case WorkerNode_State.STARTING:
-      return "STARTING";
-    case WorkerNode_State.RUNNING:
-      return "RUNNING";
-    case WorkerNode_State.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface Buffer {
-  compression: Buffer_CompressionType;
-  body: Uint8Array;
-}
-
-export const Buffer_CompressionType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  NONE: "NONE",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type Buffer_CompressionType = typeof Buffer_CompressionType[keyof typeof Buffer_CompressionType];
-
-export function buffer_CompressionTypeFromJSON(object: any): Buffer_CompressionType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return Buffer_CompressionType.UNSPECIFIED;
-    case 1:
-    case "NONE":
-      return Buffer_CompressionType.NONE;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return Buffer_CompressionType.UNRECOGNIZED;
-  }
-}
-
-export function buffer_CompressionTypeToJSON(object: Buffer_CompressionType): string {
-  switch (object) {
-    case Buffer_CompressionType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case Buffer_CompressionType.NONE:
-      return "NONE";
-    case Buffer_CompressionType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-/** Vnode mapping for stream fragments. Stores mapping from virtual node to parallel unit id. */
-export interface ParallelUnitMapping {
-  originalIndices: number[];
-  data: number[];
-}
-
-export interface BatchQueryEpoch {
-  epoch?: { $case: "committed"; committed: number } | { $case: "current"; current: number } | {
-    $case: "backup";
-    backup: number;
-  };
-}
-
-export interface OrderType {
-  /**
-   * TODO(rc): enable `NULLS FIRST | LAST`
-   * NullsAre nulls_are = 2;
-   */
-  direction: Direction;
-}
-
-/** Column index with an order type (ASC or DESC). Used to represent a sort key (`repeated ColumnOrder`). */
-export interface ColumnOrder {
-  columnIndex: number;
-  orderType: OrderType | undefined;
-}
-
-function createBaseStatus(): Status {
-  return { code: Status_Code.UNSPECIFIED, message: "" };
-}
-
-export const Status = {
-  fromJSON(object: any): Status {
-    return {
-      code: isSet(object.code) ? status_CodeFromJSON(object.code) : Status_Code.UNSPECIFIED,
-      message: isSet(object.message) ? String(object.message) : "",
-    };
-  },
-
-  toJSON(message: Status): unknown {
-    const obj: any = {};
-    message.code !== undefined && (obj.code = status_CodeToJSON(message.code));
-    message.message !== undefined && (obj.message = message.message);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Status>, I>>(object: I): Status {
-    const message = createBaseStatus();
-    message.code = object.code ?? Status_Code.UNSPECIFIED;
-    message.message = object.message ?? "";
-    return message;
-  },
-};
-
-function createBaseHostAddress(): HostAddress {
-  return { host: "", port: 0 };
-}
-
-export const HostAddress = {
-  fromJSON(object: any): HostAddress {
-    return { host: isSet(object.host) ? String(object.host) : "", port: isSet(object.port) ? Number(object.port) : 0 };
-  },
-
-  toJSON(message: HostAddress): unknown {
-    const obj: any = {};
-    message.host !== undefined && (obj.host = message.host);
-    message.port !== undefined && (obj.port = Math.round(message.port));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HostAddress>, I>>(object: I): HostAddress {
-    const message = createBaseHostAddress();
-    message.host = object.host ?? "";
-    message.port = object.port ?? 0;
-    return message;
-  },
-};
-
-function createBaseActorInfo(): ActorInfo {
-  return { actorId: 0, host: undefined };
-}
-
-export const ActorInfo = {
-  fromJSON(object: any): ActorInfo {
-    return {
-      actorId: isSet(object.actorId) ? Number(object.actorId) : 0,
-      host: isSet(object.host) ? HostAddress.fromJSON(object.host) : undefined,
-    };
-  },
-
-  toJSON(message: ActorInfo): unknown {
-    const obj: any = {};
-    message.actorId !== undefined && (obj.actorId = Math.round(message.actorId));
-    message.host !== undefined && (obj.host = message.host ? HostAddress.toJSON(message.host) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ActorInfo>, I>>(object: I): ActorInfo {
-    const message = createBaseActorInfo();
-    message.actorId = object.actorId ?? 0;
-    message.host = (object.host !== undefined && object.host !== null)
-      ? HostAddress.fromPartial(object.host)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseParallelUnit(): ParallelUnit {
-  return { id: 0, workerNodeId: 0 };
-}
-
-export const ParallelUnit = {
-  fromJSON(object: any): ParallelUnit {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      workerNodeId: isSet(object.workerNodeId) ? Number(object.workerNodeId) : 0,
-    };
-  },
-
-  toJSON(message: ParallelUnit): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.workerNodeId !== undefined && (obj.workerNodeId = Math.round(message.workerNodeId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ParallelUnit>, I>>(object: I): ParallelUnit {
-    const message = createBaseParallelUnit();
-    message.id = object.id ?? 0;
-    message.workerNodeId = object.workerNodeId ?? 0;
-    return message;
-  },
-};
-
-function createBaseWorkerNode(): WorkerNode {
-  return {
-    id: 0,
-    type: WorkerType.UNSPECIFIED,
-    host: undefined,
-    state: WorkerNode_State.UNSPECIFIED,
-    parallelUnits: [],
-  };
-}
-
-export const WorkerNode = {
-  fromJSON(object: any): WorkerNode {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      type: isSet(object.type) ? workerTypeFromJSON(object.type) : WorkerType.UNSPECIFIED,
-      host: isSet(object.host) ? HostAddress.fromJSON(object.host) : undefined,
-      state: isSet(object.state) ? workerNode_StateFromJSON(object.state) : WorkerNode_State.UNSPECIFIED,
-      parallelUnits: Array.isArray(object?.parallelUnits)
-        ? object.parallelUnits.map((e: any) => ParallelUnit.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: WorkerNode): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.type !== undefined && (obj.type = workerTypeToJSON(message.type));
-    message.host !== undefined && (obj.host = message.host ? HostAddress.toJSON(message.host) : undefined);
-    message.state !== undefined && (obj.state = workerNode_StateToJSON(message.state));
-    if (message.parallelUnits) {
-      obj.parallelUnits = message.parallelUnits.map((e) => e ? ParallelUnit.toJSON(e) : undefined);
-    } else {
-      obj.parallelUnits = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<WorkerNode>, I>>(object: I): WorkerNode {
-    const message = createBaseWorkerNode();
-    message.id = object.id ?? 0;
-    message.type = object.type ?? WorkerType.UNSPECIFIED;
-    message.host = (object.host !== undefined && object.host !== null)
-      ? HostAddress.fromPartial(object.host)
-      : undefined;
-    message.state = object.state ?? WorkerNode_State.UNSPECIFIED;
-    message.parallelUnits = object.parallelUnits?.map((e) => ParallelUnit.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseBuffer(): Buffer {
-  return { compression: Buffer_CompressionType.UNSPECIFIED, body: new Uint8Array() };
-}
-
-export const Buffer = {
-  fromJSON(object: any): Buffer {
-    return {
-      compression: isSet(object.compression)
-        ? buffer_CompressionTypeFromJSON(object.compression)
-        : Buffer_CompressionType.UNSPECIFIED,
-      body: isSet(object.body) ? bytesFromBase64(object.body) : new Uint8Array(),
-    };
-  },
-
-  toJSON(message: Buffer): unknown {
-    const obj: any = {};
-    message.compression !== undefined && (obj.compression = buffer_CompressionTypeToJSON(message.compression));
-    message.body !== undefined &&
-      (obj.body = base64FromBytes(message.body !== undefined ? message.body : new Uint8Array()));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Buffer>, I>>(object: I): Buffer {
-    const message = createBaseBuffer();
-    message.compression = object.compression ?? Buffer_CompressionType.UNSPECIFIED;
-    message.body = object.body ?? new Uint8Array();
-    return message;
-  },
-};
-
-function createBaseParallelUnitMapping(): ParallelUnitMapping {
-  return { originalIndices: [], data: [] };
-}
-
-export const ParallelUnitMapping = {
-  fromJSON(object: any): ParallelUnitMapping {
-    return {
-      originalIndices: Array.isArray(object?.originalIndices) ? object.originalIndices.map((e: any) => Number(e)) : [],
-      data: Array.isArray(object?.data) ? object.data.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: ParallelUnitMapping): unknown {
-    const obj: any = {};
-    if (message.originalIndices) {
-      obj.originalIndices = message.originalIndices.map((e) => Math.round(e));
-    } else {
-      obj.originalIndices = [];
-    }
-    if (message.data) {
-      obj.data = message.data.map((e) => Math.round(e));
-    } else {
-      obj.data = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ParallelUnitMapping>, I>>(object: I): ParallelUnitMapping {
-    const message = createBaseParallelUnitMapping();
-    message.originalIndices = object.originalIndices?.map((e) => e) || [];
-    message.data = object.data?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseBatchQueryEpoch(): BatchQueryEpoch {
-  return { epoch: undefined };
-}
-
-export const BatchQueryEpoch = {
-  fromJSON(object: any): BatchQueryEpoch {
-    return {
-      epoch: isSet(object.committed)
-        ? { $case: "committed", committed: Number(object.committed) }
-        : isSet(object.current)
-        ? { $case: "current", current: Number(object.current) }
-        : isSet(object.backup)
-        ? { $case: "backup", backup: Number(object.backup) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: BatchQueryEpoch): unknown {
-    const obj: any = {};
-    message.epoch?.$case === "committed" && (obj.committed = Math.round(message.epoch?.committed));
-    message.epoch?.$case === "current" && (obj.current = Math.round(message.epoch?.current));
-    message.epoch?.$case === "backup" && (obj.backup = Math.round(message.epoch?.backup));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BatchQueryEpoch>, I>>(object: I): BatchQueryEpoch {
-    const message = createBaseBatchQueryEpoch();
-    if (
-      object.epoch?.$case === "committed" && object.epoch?.committed !== undefined && object.epoch?.committed !== null
-    ) {
-      message.epoch = { $case: "committed", committed: object.epoch.committed };
-    }
-    if (object.epoch?.$case === "current" && object.epoch?.current !== undefined && object.epoch?.current !== null) {
-      message.epoch = { $case: "current", current: object.epoch.current };
-    }
-    if (object.epoch?.$case === "backup" && object.epoch?.backup !== undefined && object.epoch?.backup !== null) {
-      message.epoch = { $case: "backup", backup: object.epoch.backup };
-    }
-    return message;
-  },
-};
-
-function createBaseOrderType(): OrderType {
-  return { direction: Direction.DIRECTION_UNSPECIFIED };
-}
-
-export const OrderType = {
-  fromJSON(object: any): OrderType {
-    return {
-      direction: isSet(object.direction) ? directionFromJSON(object.direction) : Direction.DIRECTION_UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: OrderType): unknown {
-    const obj: any = {};
-    message.direction !== undefined && (obj.direction = directionToJSON(message.direction));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<OrderType>, I>>(object: I): OrderType {
-    const message = createBaseOrderType();
-    message.direction = object.direction ?? Direction.DIRECTION_UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseColumnOrder(): ColumnOrder {
-  return { columnIndex: 0, orderType: undefined };
-}
-
-export const ColumnOrder = {
-  fromJSON(object: any): ColumnOrder {
-    return {
-      columnIndex: isSet(object.columnIndex) ? Number(object.columnIndex) : 0,
-      orderType: isSet(object.orderType) ? OrderType.fromJSON(object.orderType) : undefined,
-    };
-  },
-
-  toJSON(message: ColumnOrder): unknown {
-    const obj: any = {};
-    message.columnIndex !== undefined && (obj.columnIndex = Math.round(message.columnIndex));
-    message.orderType !== undefined &&
-      (obj.orderType = message.orderType ? OrderType.toJSON(message.orderType) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ColumnOrder>, I>>(object: I): ColumnOrder {
-    const message = createBaseColumnOrder();
-    message.columnIndex = object.columnIndex ?? 0;
-    message.orderType = (object.orderType !== undefined && object.orderType !== null)
-      ? OrderType.fromPartial(object.orderType)
-      : undefined;
-    return message;
-  },
-};
-
-declare var self: any | undefined;
-declare var window: any | undefined;
-declare var global: any | undefined;
-var globalThis: any = (() => {
-  if (typeof globalThis !== "undefined") {
-    return globalThis;
-  }
-  if (typeof self !== "undefined") {
-    return self;
-  }
-  if (typeof window !== "undefined") {
-    return window;
-  }
-  if (typeof global !== "undefined") {
-    return global;
-  }
-  throw "Unable to locate global object";
-})();
-
-function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-
-function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin: string[] = [];
-    arr.forEach((byte) => {
-      bin.push(String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/compactor.ts b/dashboard/proto/gen/compactor.ts
deleted file mode 100644
index 3fee992c1f710..0000000000000
--- a/dashboard/proto/gen/compactor.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-/* eslint-disable */
-
-export const protobufPackage = "compactor";
-
-export interface CompactorRuntimeConfig {
-  maxConcurrentTaskNumber: number;
-}
-
-export interface SetRuntimeConfigRequest {
-  config: CompactorRuntimeConfig | undefined;
-}
-
-export interface SetRuntimeConfigResponse {
-}
-
-function createBaseCompactorRuntimeConfig(): CompactorRuntimeConfig {
-  return { maxConcurrentTaskNumber: 0 };
-}
-
-export const CompactorRuntimeConfig = {
-  fromJSON(object: any): CompactorRuntimeConfig {
-    return {
-      maxConcurrentTaskNumber: isSet(object.maxConcurrentTaskNumber) ? Number(object.maxConcurrentTaskNumber) : 0,
-    };
-  },
-
-  toJSON(message: CompactorRuntimeConfig): unknown {
-    const obj: any = {};
-    message.maxConcurrentTaskNumber !== undefined &&
-      (obj.maxConcurrentTaskNumber = Math.round(message.maxConcurrentTaskNumber));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CompactorRuntimeConfig>, I>>(object: I): CompactorRuntimeConfig {
-    const message = createBaseCompactorRuntimeConfig();
-    message.maxConcurrentTaskNumber = object.maxConcurrentTaskNumber ?? 0;
-    return message;
-  },
-};
-
-function createBaseSetRuntimeConfigRequest(): SetRuntimeConfigRequest {
-  return { config: undefined };
-}
-
-export const SetRuntimeConfigRequest = {
-  fromJSON(object: any): SetRuntimeConfigRequest {
-    return { config: isSet(object.config) ? CompactorRuntimeConfig.fromJSON(object.config) : undefined };
-  },
-
-  toJSON(message: SetRuntimeConfigRequest): unknown {
-    const obj: any = {};
-    message.config !== undefined &&
-      (obj.config = message.config ? CompactorRuntimeConfig.toJSON(message.config) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SetRuntimeConfigRequest>, I>>(object: I): SetRuntimeConfigRequest {
-    const message = createBaseSetRuntimeConfigRequest();
-    message.config = (object.config !== undefined && object.config !== null)
-      ? CompactorRuntimeConfig.fromPartial(object.config)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSetRuntimeConfigResponse(): SetRuntimeConfigResponse {
-  return {};
-}
-
-export const SetRuntimeConfigResponse = {
-  fromJSON(_: any): SetRuntimeConfigResponse {
-    return {};
-  },
-
-  toJSON(_: SetRuntimeConfigResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SetRuntimeConfigResponse>, I>>(_: I): SetRuntimeConfigResponse {
-    const message = createBaseSetRuntimeConfigResponse();
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/compute.ts b/dashboard/proto/gen/compute.ts
deleted file mode 100644
index 95d6595232634..0000000000000
--- a/dashboard/proto/gen/compute.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/* eslint-disable */
-
-export const protobufPackage = "compute";
-
-export interface ShowConfigRequest {
-}
-
-export interface ShowConfigResponse {
-  batchConfig: string;
-  streamConfig: string;
-}
-
-function createBaseShowConfigRequest(): ShowConfigRequest {
-  return {};
-}
-
-export const ShowConfigRequest = {
-  fromJSON(_: any): ShowConfigRequest {
-    return {};
-  },
-
-  toJSON(_: ShowConfigRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ShowConfigRequest>, I>>(_: I): ShowConfigRequest {
-    const message = createBaseShowConfigRequest();
-    return message;
-  },
-};
-
-function createBaseShowConfigResponse(): ShowConfigResponse {
-  return { batchConfig: "", streamConfig: "" };
-}
-
-export const ShowConfigResponse = {
-  fromJSON(object: any): ShowConfigResponse {
-    return {
-      batchConfig: isSet(object.batchConfig) ? String(object.batchConfig) : "",
-      streamConfig: isSet(object.streamConfig) ? String(object.streamConfig) : "",
-    };
-  },
-
-  toJSON(message: ShowConfigResponse): unknown {
-    const obj: any = {};
-    message.batchConfig !== undefined && (obj.batchConfig = message.batchConfig);
-    message.streamConfig !== undefined && (obj.streamConfig = message.streamConfig);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ShowConfigResponse>, I>>(object: I): ShowConfigResponse {
-    const message = createBaseShowConfigResponse();
-    message.batchConfig = object.batchConfig ?? "";
-    message.streamConfig = object.streamConfig ?? "";
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/connector_service.ts b/dashboard/proto/gen/connector_service.ts
deleted file mode 100644
index 8e8a96c48bd0d..0000000000000
--- a/dashboard/proto/gen/connector_service.ts
+++ /dev/null
@@ -1,1115 +0,0 @@
-/* eslint-disable */
-import { SinkType, sinkTypeFromJSON, sinkTypeToJSON } from "./catalog";
-import {
-  DataType_TypeName,
-  dataType_TypeNameFromJSON,
-  dataType_TypeNameToJSON,
-  Op,
-  opFromJSON,
-  opToJSON,
-} from "./data";
-
-export const protobufPackage = "connector_service";
-
-export const SinkPayloadFormat = {
-  FORMAT_UNSPECIFIED: "FORMAT_UNSPECIFIED",
-  JSON: "JSON",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type SinkPayloadFormat = typeof SinkPayloadFormat[keyof typeof SinkPayloadFormat];
-
-export function sinkPayloadFormatFromJSON(object: any): SinkPayloadFormat {
-  switch (object) {
-    case 0:
-    case "FORMAT_UNSPECIFIED":
-      return SinkPayloadFormat.FORMAT_UNSPECIFIED;
-    case 1:
-    case "JSON":
-      return SinkPayloadFormat.JSON;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return SinkPayloadFormat.UNRECOGNIZED;
-  }
-}
-
-export function sinkPayloadFormatToJSON(object: SinkPayloadFormat): string {
-  switch (object) {
-    case SinkPayloadFormat.FORMAT_UNSPECIFIED:
-      return "FORMAT_UNSPECIFIED";
-    case SinkPayloadFormat.JSON:
-      return "JSON";
-    case SinkPayloadFormat.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const SourceType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  MYSQL: "MYSQL",
-  POSTGRES: "POSTGRES",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type SourceType = typeof SourceType[keyof typeof SourceType];
-
-export function sourceTypeFromJSON(object: any): SourceType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return SourceType.UNSPECIFIED;
-    case 1:
-    case "MYSQL":
-      return SourceType.MYSQL;
-    case 2:
-    case "POSTGRES":
-      return SourceType.POSTGRES;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return SourceType.UNRECOGNIZED;
-  }
-}
-
-export function sourceTypeToJSON(object: SourceType): string {
-  switch (object) {
-    case SourceType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case SourceType.MYSQL:
-      return "MYSQL";
-    case SourceType.POSTGRES:
-      return "POSTGRES";
-    case SourceType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface TableSchema {
-  columns: TableSchema_Column[];
-  pkIndices: number[];
-}
-
-export interface TableSchema_Column {
-  name: string;
-  dataType: DataType_TypeName;
-}
-
-export interface ValidationError {
-  errorMessage: string;
-}
-
-export interface SinkConfig {
-  connectorType: string;
-  properties: { [key: string]: string };
-  tableSchema: TableSchema | undefined;
-}
-
-export interface SinkConfig_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-export interface SinkStreamRequest {
-  request?:
-    | { $case: "start"; start: SinkStreamRequest_StartSink }
-    | { $case: "startEpoch"; startEpoch: SinkStreamRequest_StartEpoch }
-    | { $case: "write"; write: SinkStreamRequest_WriteBatch }
-    | { $case: "sync"; sync: SinkStreamRequest_SyncBatch };
-}
-
-export interface SinkStreamRequest_StartSink {
-  sinkConfig: SinkConfig | undefined;
-  format: SinkPayloadFormat;
-}
-
-export interface SinkStreamRequest_WriteBatch {
-  payload?: { $case: "jsonPayload"; jsonPayload: SinkStreamRequest_WriteBatch_JsonPayload };
-  batchId: number;
-  epoch: number;
-}
-
-export interface SinkStreamRequest_WriteBatch_JsonPayload {
-  rowOps: SinkStreamRequest_WriteBatch_JsonPayload_RowOp[];
-}
-
-export interface SinkStreamRequest_WriteBatch_JsonPayload_RowOp {
-  opType: Op;
-  line: string;
-}
-
-export interface SinkStreamRequest_StartEpoch {
-  epoch: number;
-}
-
-export interface SinkStreamRequest_SyncBatch {
-  epoch: number;
-}
-
-export interface SinkResponse {
-  response?:
-    | { $case: "sync"; sync: SinkResponse_SyncResponse }
-    | { $case: "startEpoch"; startEpoch: SinkResponse_StartEpochResponse }
-    | { $case: "write"; write: SinkResponse_WriteResponse }
-    | { $case: "start"; start: SinkResponse_StartResponse };
-}
-
-export interface SinkResponse_SyncResponse {
-  epoch: number;
-}
-
-export interface SinkResponse_StartEpochResponse {
-  epoch: number;
-}
-
-export interface SinkResponse_WriteResponse {
-  epoch: number;
-  batchId: number;
-}
-
-export interface SinkResponse_StartResponse {
-}
-
-export interface ValidateSinkRequest {
-  sinkConfig: SinkConfig | undefined;
-  sinkType: SinkType;
-}
-
-export interface ValidateSinkResponse {
-  /** On validation failure, we return the error. */
-  error: ValidationError | undefined;
-}
-
-export interface CdcMessage {
-  payload: string;
-  partition: string;
-  offset: string;
-}
-
-export interface GetEventStreamRequest {
-  request?: { $case: "validate"; validate: GetEventStreamRequest_ValidateProperties } | {
-    $case: "start";
-    start: GetEventStreamRequest_StartSource;
-  };
-}
-
-export interface GetEventStreamRequest_ValidateProperties {
-  sourceId: number;
-  sourceType: SourceType;
-  properties: { [key: string]: string };
-  tableSchema: TableSchema | undefined;
-}
-
-export interface GetEventStreamRequest_ValidateProperties_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-export interface GetEventStreamRequest_StartSource {
-  sourceId: number;
-  sourceType: SourceType;
-  startOffset: string;
-  properties: { [key: string]: string };
-}
-
-export interface GetEventStreamRequest_StartSource_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-export interface GetEventStreamResponse {
-  sourceId: number;
-  events: CdcMessage[];
-}
-
-function createBaseTableSchema(): TableSchema {
-  return { columns: [], pkIndices: [] };
-}
-
-export const TableSchema = {
-  fromJSON(object: any): TableSchema {
-    return {
-      columns: Array.isArray(object?.columns) ? object.columns.map((e: any) => TableSchema_Column.fromJSON(e)) : [],
-      pkIndices: Array.isArray(object?.pkIndices) ? object.pkIndices.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: TableSchema): unknown {
-    const obj: any = {};
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? TableSchema_Column.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    if (message.pkIndices) {
-      obj.pkIndices = message.pkIndices.map((e) => Math.round(e));
-    } else {
-      obj.pkIndices = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableSchema>, I>>(object: I): TableSchema {
-    const message = createBaseTableSchema();
-    message.columns = object.columns?.map((e) => TableSchema_Column.fromPartial(e)) || [];
-    message.pkIndices = object.pkIndices?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseTableSchema_Column(): TableSchema_Column {
-  return { name: "", dataType: DataType_TypeName.TYPE_UNSPECIFIED };
-}
-
-export const TableSchema_Column = {
-  fromJSON(object: any): TableSchema_Column {
-    return {
-      name: isSet(object.name) ? String(object.name) : "",
-      dataType: isSet(object.dataType)
-        ? dataType_TypeNameFromJSON(object.dataType)
-        : DataType_TypeName.TYPE_UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: TableSchema_Column): unknown {
-    const obj: any = {};
-    message.name !== undefined && (obj.name = message.name);
-    message.dataType !== undefined && (obj.dataType = dataType_TypeNameToJSON(message.dataType));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableSchema_Column>, I>>(object: I): TableSchema_Column {
-    const message = createBaseTableSchema_Column();
-    message.name = object.name ?? "";
-    message.dataType = object.dataType ?? DataType_TypeName.TYPE_UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseValidationError(): ValidationError {
-  return { errorMessage: "" };
-}
-
-export const ValidationError = {
-  fromJSON(object: any): ValidationError {
-    return { errorMessage: isSet(object.errorMessage) ? String(object.errorMessage) : "" };
-  },
-
-  toJSON(message: ValidationError): unknown {
-    const obj: any = {};
-    message.errorMessage !== undefined && (obj.errorMessage = message.errorMessage);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ValidationError>, I>>(object: I): ValidationError {
-    const message = createBaseValidationError();
-    message.errorMessage = object.errorMessage ?? "";
-    return message;
-  },
-};
-
-function createBaseSinkConfig(): SinkConfig {
-  return { connectorType: "", properties: {}, tableSchema: undefined };
-}
-
-export const SinkConfig = {
-  fromJSON(object: any): SinkConfig {
-    return {
-      connectorType: isSet(object.connectorType) ? String(object.connectorType) : "",
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-      tableSchema: isSet(object.tableSchema) ? TableSchema.fromJSON(object.tableSchema) : undefined,
-    };
-  },
-
-  toJSON(message: SinkConfig): unknown {
-    const obj: any = {};
-    message.connectorType !== undefined && (obj.connectorType = message.connectorType);
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    message.tableSchema !== undefined &&
-      (obj.tableSchema = message.tableSchema ? TableSchema.toJSON(message.tableSchema) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkConfig>, I>>(object: I): SinkConfig {
-    const message = createBaseSinkConfig();
-    message.connectorType = object.connectorType ?? "";
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.tableSchema = (object.tableSchema !== undefined && object.tableSchema !== null)
-      ? TableSchema.fromPartial(object.tableSchema)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSinkConfig_PropertiesEntry(): SinkConfig_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const SinkConfig_PropertiesEntry = {
-  fromJSON(object: any): SinkConfig_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: SinkConfig_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkConfig_PropertiesEntry>, I>>(object: I): SinkConfig_PropertiesEntry {
-    const message = createBaseSinkConfig_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseSinkStreamRequest(): SinkStreamRequest {
-  return { request: undefined };
-}
-
-export const SinkStreamRequest = {
-  fromJSON(object: any): SinkStreamRequest {
-    return {
-      request: isSet(object.start)
-        ? { $case: "start", start: SinkStreamRequest_StartSink.fromJSON(object.start) }
-        : isSet(object.startEpoch)
-        ? { $case: "startEpoch", startEpoch: SinkStreamRequest_StartEpoch.fromJSON(object.startEpoch) }
-        : isSet(object.write)
-        ? { $case: "write", write: SinkStreamRequest_WriteBatch.fromJSON(object.write) }
-        : isSet(object.sync)
-        ? { $case: "sync", sync: SinkStreamRequest_SyncBatch.fromJSON(object.sync) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: SinkStreamRequest): unknown {
-    const obj: any = {};
-    message.request?.$case === "start" &&
-      (obj.start = message.request?.start ? SinkStreamRequest_StartSink.toJSON(message.request?.start) : undefined);
-    message.request?.$case === "startEpoch" && (obj.startEpoch = message.request?.startEpoch
-      ? SinkStreamRequest_StartEpoch.toJSON(message.request?.startEpoch)
-      : undefined);
-    message.request?.$case === "write" &&
-      (obj.write = message.request?.write ? SinkStreamRequest_WriteBatch.toJSON(message.request?.write) : undefined);
-    message.request?.$case === "sync" &&
-      (obj.sync = message.request?.sync ? SinkStreamRequest_SyncBatch.toJSON(message.request?.sync) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkStreamRequest>, I>>(object: I): SinkStreamRequest {
-    const message = createBaseSinkStreamRequest();
-    if (object.request?.$case === "start" && object.request?.start !== undefined && object.request?.start !== null) {
-      message.request = { $case: "start", start: SinkStreamRequest_StartSink.fromPartial(object.request.start) };
-    }
-    if (
-      object.request?.$case === "startEpoch" &&
-      object.request?.startEpoch !== undefined &&
-      object.request?.startEpoch !== null
-    ) {
-      message.request = {
-        $case: "startEpoch",
-        startEpoch: SinkStreamRequest_StartEpoch.fromPartial(object.request.startEpoch),
-      };
-    }
-    if (object.request?.$case === "write" && object.request?.write !== undefined && object.request?.write !== null) {
-      message.request = { $case: "write", write: SinkStreamRequest_WriteBatch.fromPartial(object.request.write) };
-    }
-    if (object.request?.$case === "sync" && object.request?.sync !== undefined && object.request?.sync !== null) {
-      message.request = { $case: "sync", sync: SinkStreamRequest_SyncBatch.fromPartial(object.request.sync) };
-    }
-    return message;
-  },
-};
-
-function createBaseSinkStreamRequest_StartSink(): SinkStreamRequest_StartSink {
-  return { sinkConfig: undefined, format: SinkPayloadFormat.FORMAT_UNSPECIFIED };
-}
-
-export const SinkStreamRequest_StartSink = {
-  fromJSON(object: any): SinkStreamRequest_StartSink {
-    return {
-      sinkConfig: isSet(object.sinkConfig) ? SinkConfig.fromJSON(object.sinkConfig) : undefined,
-      format: isSet(object.format) ? sinkPayloadFormatFromJSON(object.format) : SinkPayloadFormat.FORMAT_UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: SinkStreamRequest_StartSink): unknown {
-    const obj: any = {};
-    message.sinkConfig !== undefined &&
-      (obj.sinkConfig = message.sinkConfig ? SinkConfig.toJSON(message.sinkConfig) : undefined);
-    message.format !== undefined && (obj.format = sinkPayloadFormatToJSON(message.format));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkStreamRequest_StartSink>, I>>(object: I): SinkStreamRequest_StartSink {
-    const message = createBaseSinkStreamRequest_StartSink();
-    message.sinkConfig = (object.sinkConfig !== undefined && object.sinkConfig !== null)
-      ? SinkConfig.fromPartial(object.sinkConfig)
-      : undefined;
-    message.format = object.format ?? SinkPayloadFormat.FORMAT_UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseSinkStreamRequest_WriteBatch(): SinkStreamRequest_WriteBatch {
-  return { payload: undefined, batchId: 0, epoch: 0 };
-}
-
-export const SinkStreamRequest_WriteBatch = {
-  fromJSON(object: any): SinkStreamRequest_WriteBatch {
-    return {
-      payload: isSet(object.jsonPayload)
-        ? { $case: "jsonPayload", jsonPayload: SinkStreamRequest_WriteBatch_JsonPayload.fromJSON(object.jsonPayload) }
-        : undefined,
-      batchId: isSet(object.batchId) ? Number(object.batchId) : 0,
-      epoch: isSet(object.epoch) ? Number(object.epoch) : 0,
-    };
-  },
-
-  toJSON(message: SinkStreamRequest_WriteBatch): unknown {
-    const obj: any = {};
-    message.payload?.$case === "jsonPayload" && (obj.jsonPayload = message.payload?.jsonPayload
-      ? SinkStreamRequest_WriteBatch_JsonPayload.toJSON(message.payload?.jsonPayload)
-      : undefined);
-    message.batchId !== undefined && (obj.batchId = Math.round(message.batchId));
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkStreamRequest_WriteBatch>, I>>(object: I): SinkStreamRequest_WriteBatch {
-    const message = createBaseSinkStreamRequest_WriteBatch();
-    if (
-      object.payload?.$case === "jsonPayload" &&
-      object.payload?.jsonPayload !== undefined &&
-      object.payload?.jsonPayload !== null
-    ) {
-      message.payload = {
-        $case: "jsonPayload",
-        jsonPayload: SinkStreamRequest_WriteBatch_JsonPayload.fromPartial(object.payload.jsonPayload),
-      };
-    }
-    message.batchId = object.batchId ?? 0;
-    message.epoch = object.epoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseSinkStreamRequest_WriteBatch_JsonPayload(): SinkStreamRequest_WriteBatch_JsonPayload {
-  return { rowOps: [] };
-}
-
-export const SinkStreamRequest_WriteBatch_JsonPayload = {
-  fromJSON(object: any): SinkStreamRequest_WriteBatch_JsonPayload {
-    return {
-      rowOps: Array.isArray(object?.rowOps)
-        ? object.rowOps.map((e: any) => SinkStreamRequest_WriteBatch_JsonPayload_RowOp.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: SinkStreamRequest_WriteBatch_JsonPayload): unknown {
-    const obj: any = {};
-    if (message.rowOps) {
-      obj.rowOps = message.rowOps.map((e) => e ? SinkStreamRequest_WriteBatch_JsonPayload_RowOp.toJSON(e) : undefined);
-    } else {
-      obj.rowOps = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkStreamRequest_WriteBatch_JsonPayload>, I>>(
-    object: I,
-  ): SinkStreamRequest_WriteBatch_JsonPayload {
-    const message = createBaseSinkStreamRequest_WriteBatch_JsonPayload();
-    message.rowOps = object.rowOps?.map((e) => SinkStreamRequest_WriteBatch_JsonPayload_RowOp.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseSinkStreamRequest_WriteBatch_JsonPayload_RowOp(): SinkStreamRequest_WriteBatch_JsonPayload_RowOp {
-  return { opType: Op.OP_UNSPECIFIED, line: "" };
-}
-
-export const SinkStreamRequest_WriteBatch_JsonPayload_RowOp = {
-  fromJSON(object: any): SinkStreamRequest_WriteBatch_JsonPayload_RowOp {
-    return {
-      opType: isSet(object.opType) ? opFromJSON(object.opType) : Op.OP_UNSPECIFIED,
-      line: isSet(object.line) ? String(object.line) : "",
-    };
-  },
-
-  toJSON(message: SinkStreamRequest_WriteBatch_JsonPayload_RowOp): unknown {
-    const obj: any = {};
-    message.opType !== undefined && (obj.opType = opToJSON(message.opType));
-    message.line !== undefined && (obj.line = message.line);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkStreamRequest_WriteBatch_JsonPayload_RowOp>, I>>(
-    object: I,
-  ): SinkStreamRequest_WriteBatch_JsonPayload_RowOp {
-    const message = createBaseSinkStreamRequest_WriteBatch_JsonPayload_RowOp();
-    message.opType = object.opType ?? Op.OP_UNSPECIFIED;
-    message.line = object.line ?? "";
-    return message;
-  },
-};
-
-function createBaseSinkStreamRequest_StartEpoch(): SinkStreamRequest_StartEpoch {
-  return { epoch: 0 };
-}
-
-export const SinkStreamRequest_StartEpoch = {
-  fromJSON(object: any): SinkStreamRequest_StartEpoch {
-    return { epoch: isSet(object.epoch) ? Number(object.epoch) : 0 };
-  },
-
-  toJSON(message: SinkStreamRequest_StartEpoch): unknown {
-    const obj: any = {};
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkStreamRequest_StartEpoch>, I>>(object: I): SinkStreamRequest_StartEpoch {
-    const message = createBaseSinkStreamRequest_StartEpoch();
-    message.epoch = object.epoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseSinkStreamRequest_SyncBatch(): SinkStreamRequest_SyncBatch {
-  return { epoch: 0 };
-}
-
-export const SinkStreamRequest_SyncBatch = {
-  fromJSON(object: any): SinkStreamRequest_SyncBatch {
-    return { epoch: isSet(object.epoch) ? Number(object.epoch) : 0 };
-  },
-
-  toJSON(message: SinkStreamRequest_SyncBatch): unknown {
-    const obj: any = {};
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkStreamRequest_SyncBatch>, I>>(object: I): SinkStreamRequest_SyncBatch {
-    const message = createBaseSinkStreamRequest_SyncBatch();
-    message.epoch = object.epoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseSinkResponse(): SinkResponse {
-  return { response: undefined };
-}
-
-export const SinkResponse = {
-  fromJSON(object: any): SinkResponse {
-    return {
-      response: isSet(object.sync)
-        ? { $case: "sync", sync: SinkResponse_SyncResponse.fromJSON(object.sync) }
-        : isSet(object.startEpoch)
-        ? { $case: "startEpoch", startEpoch: SinkResponse_StartEpochResponse.fromJSON(object.startEpoch) }
-        : isSet(object.write)
-        ? { $case: "write", write: SinkResponse_WriteResponse.fromJSON(object.write) }
-        : isSet(object.start)
-        ? { $case: "start", start: SinkResponse_StartResponse.fromJSON(object.start) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: SinkResponse): unknown {
-    const obj: any = {};
-    message.response?.$case === "sync" &&
-      (obj.sync = message.response?.sync ? SinkResponse_SyncResponse.toJSON(message.response?.sync) : undefined);
-    message.response?.$case === "startEpoch" && (obj.startEpoch = message.response?.startEpoch
-      ? SinkResponse_StartEpochResponse.toJSON(message.response?.startEpoch)
-      : undefined);
-    message.response?.$case === "write" &&
-      (obj.write = message.response?.write ? SinkResponse_WriteResponse.toJSON(message.response?.write) : undefined);
-    message.response?.$case === "start" &&
-      (obj.start = message.response?.start ? SinkResponse_StartResponse.toJSON(message.response?.start) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkResponse>, I>>(object: I): SinkResponse {
-    const message = createBaseSinkResponse();
-    if (object.response?.$case === "sync" && object.response?.sync !== undefined && object.response?.sync !== null) {
-      message.response = { $case: "sync", sync: SinkResponse_SyncResponse.fromPartial(object.response.sync) };
-    }
-    if (
-      object.response?.$case === "startEpoch" &&
-      object.response?.startEpoch !== undefined &&
-      object.response?.startEpoch !== null
-    ) {
-      message.response = {
-        $case: "startEpoch",
-        startEpoch: SinkResponse_StartEpochResponse.fromPartial(object.response.startEpoch),
-      };
-    }
-    if (object.response?.$case === "write" && object.response?.write !== undefined && object.response?.write !== null) {
-      message.response = { $case: "write", write: SinkResponse_WriteResponse.fromPartial(object.response.write) };
-    }
-    if (object.response?.$case === "start" && object.response?.start !== undefined && object.response?.start !== null) {
-      message.response = { $case: "start", start: SinkResponse_StartResponse.fromPartial(object.response.start) };
-    }
-    return message;
-  },
-};
-
-function createBaseSinkResponse_SyncResponse(): SinkResponse_SyncResponse {
-  return { epoch: 0 };
-}
-
-export const SinkResponse_SyncResponse = {
-  fromJSON(object: any): SinkResponse_SyncResponse {
-    return { epoch: isSet(object.epoch) ? Number(object.epoch) : 0 };
-  },
-
-  toJSON(message: SinkResponse_SyncResponse): unknown {
-    const obj: any = {};
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkResponse_SyncResponse>, I>>(object: I): SinkResponse_SyncResponse {
-    const message = createBaseSinkResponse_SyncResponse();
-    message.epoch = object.epoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseSinkResponse_StartEpochResponse(): SinkResponse_StartEpochResponse {
-  return { epoch: 0 };
-}
-
-export const SinkResponse_StartEpochResponse = {
-  fromJSON(object: any): SinkResponse_StartEpochResponse {
-    return { epoch: isSet(object.epoch) ? Number(object.epoch) : 0 };
-  },
-
-  toJSON(message: SinkResponse_StartEpochResponse): unknown {
-    const obj: any = {};
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkResponse_StartEpochResponse>, I>>(
-    object: I,
-  ): SinkResponse_StartEpochResponse {
-    const message = createBaseSinkResponse_StartEpochResponse();
-    message.epoch = object.epoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseSinkResponse_WriteResponse(): SinkResponse_WriteResponse {
-  return { epoch: 0, batchId: 0 };
-}
-
-export const SinkResponse_WriteResponse = {
-  fromJSON(object: any): SinkResponse_WriteResponse {
-    return {
-      epoch: isSet(object.epoch) ? Number(object.epoch) : 0,
-      batchId: isSet(object.batchId) ? Number(object.batchId) : 0,
-    };
-  },
-
-  toJSON(message: SinkResponse_WriteResponse): unknown {
-    const obj: any = {};
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    message.batchId !== undefined && (obj.batchId = Math.round(message.batchId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkResponse_WriteResponse>, I>>(object: I): SinkResponse_WriteResponse {
-    const message = createBaseSinkResponse_WriteResponse();
-    message.epoch = object.epoch ?? 0;
-    message.batchId = object.batchId ?? 0;
-    return message;
-  },
-};
-
-function createBaseSinkResponse_StartResponse(): SinkResponse_StartResponse {
-  return {};
-}
-
-export const SinkResponse_StartResponse = {
-  fromJSON(_: any): SinkResponse_StartResponse {
-    return {};
-  },
-
-  toJSON(_: SinkResponse_StartResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkResponse_StartResponse>, I>>(_: I): SinkResponse_StartResponse {
-    const message = createBaseSinkResponse_StartResponse();
-    return message;
-  },
-};
-
-function createBaseValidateSinkRequest(): ValidateSinkRequest {
-  return { sinkConfig: undefined, sinkType: SinkType.UNSPECIFIED };
-}
-
-export const ValidateSinkRequest = {
-  fromJSON(object: any): ValidateSinkRequest {
-    return {
-      sinkConfig: isSet(object.sinkConfig) ? SinkConfig.fromJSON(object.sinkConfig) : undefined,
-      sinkType: isSet(object.sinkType) ? sinkTypeFromJSON(object.sinkType) : SinkType.UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: ValidateSinkRequest): unknown {
-    const obj: any = {};
-    message.sinkConfig !== undefined &&
-      (obj.sinkConfig = message.sinkConfig ? SinkConfig.toJSON(message.sinkConfig) : undefined);
-    message.sinkType !== undefined && (obj.sinkType = sinkTypeToJSON(message.sinkType));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ValidateSinkRequest>, I>>(object: I): ValidateSinkRequest {
-    const message = createBaseValidateSinkRequest();
-    message.sinkConfig = (object.sinkConfig !== undefined && object.sinkConfig !== null)
-      ? SinkConfig.fromPartial(object.sinkConfig)
-      : undefined;
-    message.sinkType = object.sinkType ?? SinkType.UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseValidateSinkResponse(): ValidateSinkResponse {
-  return { error: undefined };
-}
-
-export const ValidateSinkResponse = {
-  fromJSON(object: any): ValidateSinkResponse {
-    return { error: isSet(object.error) ? ValidationError.fromJSON(object.error) : undefined };
-  },
-
-  toJSON(message: ValidateSinkResponse): unknown {
-    const obj: any = {};
-    message.error !== undefined && (obj.error = message.error ? ValidationError.toJSON(message.error) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ValidateSinkResponse>, I>>(object: I): ValidateSinkResponse {
-    const message = createBaseValidateSinkResponse();
-    message.error = (object.error !== undefined && object.error !== null)
-      ? ValidationError.fromPartial(object.error)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCdcMessage(): CdcMessage {
-  return { payload: "", partition: "", offset: "" };
-}
-
-export const CdcMessage = {
-  fromJSON(object: any): CdcMessage {
-    return {
-      payload: isSet(object.payload) ? String(object.payload) : "",
-      partition: isSet(object.partition) ? String(object.partition) : "",
-      offset: isSet(object.offset) ? String(object.offset) : "",
-    };
-  },
-
-  toJSON(message: CdcMessage): unknown {
-    const obj: any = {};
-    message.payload !== undefined && (obj.payload = message.payload);
-    message.partition !== undefined && (obj.partition = message.partition);
-    message.offset !== undefined && (obj.offset = message.offset);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CdcMessage>, I>>(object: I): CdcMessage {
-    const message = createBaseCdcMessage();
-    message.payload = object.payload ?? "";
-    message.partition = object.partition ?? "";
-    message.offset = object.offset ?? "";
-    return message;
-  },
-};
-
-function createBaseGetEventStreamRequest(): GetEventStreamRequest {
-  return { request: undefined };
-}
-
-export const GetEventStreamRequest = {
-  fromJSON(object: any): GetEventStreamRequest {
-    return {
-      request: isSet(object.validate)
-        ? { $case: "validate", validate: GetEventStreamRequest_ValidateProperties.fromJSON(object.validate) }
-        : isSet(object.start)
-        ? { $case: "start", start: GetEventStreamRequest_StartSource.fromJSON(object.start) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: GetEventStreamRequest): unknown {
-    const obj: any = {};
-    message.request?.$case === "validate" && (obj.validate = message.request?.validate
-      ? GetEventStreamRequest_ValidateProperties.toJSON(message.request?.validate)
-      : undefined);
-    message.request?.$case === "start" &&
-      (obj.start = message.request?.start
-        ? GetEventStreamRequest_StartSource.toJSON(message.request?.start)
-        : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetEventStreamRequest>, I>>(object: I): GetEventStreamRequest {
-    const message = createBaseGetEventStreamRequest();
-    if (
-      object.request?.$case === "validate" &&
-      object.request?.validate !== undefined &&
-      object.request?.validate !== null
-    ) {
-      message.request = {
-        $case: "validate",
-        validate: GetEventStreamRequest_ValidateProperties.fromPartial(object.request.validate),
-      };
-    }
-    if (object.request?.$case === "start" && object.request?.start !== undefined && object.request?.start !== null) {
-      message.request = { $case: "start", start: GetEventStreamRequest_StartSource.fromPartial(object.request.start) };
-    }
-    return message;
-  },
-};
-
-function createBaseGetEventStreamRequest_ValidateProperties(): GetEventStreamRequest_ValidateProperties {
-  return { sourceId: 0, sourceType: SourceType.UNSPECIFIED, properties: {}, tableSchema: undefined };
-}
-
-export const GetEventStreamRequest_ValidateProperties = {
-  fromJSON(object: any): GetEventStreamRequest_ValidateProperties {
-    return {
-      sourceId: isSet(object.sourceId) ? Number(object.sourceId) : 0,
-      sourceType: isSet(object.sourceType) ? sourceTypeFromJSON(object.sourceType) : SourceType.UNSPECIFIED,
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-      tableSchema: isSet(object.tableSchema) ? TableSchema.fromJSON(object.tableSchema) : undefined,
-    };
-  },
-
-  toJSON(message: GetEventStreamRequest_ValidateProperties): unknown {
-    const obj: any = {};
-    message.sourceId !== undefined && (obj.sourceId = Math.round(message.sourceId));
-    message.sourceType !== undefined && (obj.sourceType = sourceTypeToJSON(message.sourceType));
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    message.tableSchema !== undefined &&
-      (obj.tableSchema = message.tableSchema ? TableSchema.toJSON(message.tableSchema) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetEventStreamRequest_ValidateProperties>, I>>(
-    object: I,
-  ): GetEventStreamRequest_ValidateProperties {
-    const message = createBaseGetEventStreamRequest_ValidateProperties();
-    message.sourceId = object.sourceId ?? 0;
-    message.sourceType = object.sourceType ?? SourceType.UNSPECIFIED;
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.tableSchema = (object.tableSchema !== undefined && object.tableSchema !== null)
-      ? TableSchema.fromPartial(object.tableSchema)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseGetEventStreamRequest_ValidateProperties_PropertiesEntry(): GetEventStreamRequest_ValidateProperties_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const GetEventStreamRequest_ValidateProperties_PropertiesEntry = {
-  fromJSON(object: any): GetEventStreamRequest_ValidateProperties_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: GetEventStreamRequest_ValidateProperties_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetEventStreamRequest_ValidateProperties_PropertiesEntry>, I>>(
-    object: I,
-  ): GetEventStreamRequest_ValidateProperties_PropertiesEntry {
-    const message = createBaseGetEventStreamRequest_ValidateProperties_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseGetEventStreamRequest_StartSource(): GetEventStreamRequest_StartSource {
-  return { sourceId: 0, sourceType: SourceType.UNSPECIFIED, startOffset: "", properties: {} };
-}
-
-export const GetEventStreamRequest_StartSource = {
-  fromJSON(object: any): GetEventStreamRequest_StartSource {
-    return {
-      sourceId: isSet(object.sourceId) ? Number(object.sourceId) : 0,
-      sourceType: isSet(object.sourceType) ? sourceTypeFromJSON(object.sourceType) : SourceType.UNSPECIFIED,
-      startOffset: isSet(object.startOffset) ? String(object.startOffset) : "",
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: GetEventStreamRequest_StartSource): unknown {
-    const obj: any = {};
-    message.sourceId !== undefined && (obj.sourceId = Math.round(message.sourceId));
-    message.sourceType !== undefined && (obj.sourceType = sourceTypeToJSON(message.sourceType));
-    message.startOffset !== undefined && (obj.startOffset = message.startOffset);
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetEventStreamRequest_StartSource>, I>>(
-    object: I,
-  ): GetEventStreamRequest_StartSource {
-    const message = createBaseGetEventStreamRequest_StartSource();
-    message.sourceId = object.sourceId ?? 0;
-    message.sourceType = object.sourceType ?? SourceType.UNSPECIFIED;
-    message.startOffset = object.startOffset ?? "";
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseGetEventStreamRequest_StartSource_PropertiesEntry(): GetEventStreamRequest_StartSource_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const GetEventStreamRequest_StartSource_PropertiesEntry = {
-  fromJSON(object: any): GetEventStreamRequest_StartSource_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: GetEventStreamRequest_StartSource_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetEventStreamRequest_StartSource_PropertiesEntry>, I>>(
-    object: I,
-  ): GetEventStreamRequest_StartSource_PropertiesEntry {
-    const message = createBaseGetEventStreamRequest_StartSource_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseGetEventStreamResponse(): GetEventStreamResponse {
-  return { sourceId: 0, events: [] };
-}
-
-export const GetEventStreamResponse = {
-  fromJSON(object: any): GetEventStreamResponse {
-    return {
-      sourceId: isSet(object.sourceId) ? Number(object.sourceId) : 0,
-      events: Array.isArray(object?.events) ? object.events.map((e: any) => CdcMessage.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: GetEventStreamResponse): unknown {
-    const obj: any = {};
-    message.sourceId !== undefined && (obj.sourceId = Math.round(message.sourceId));
-    if (message.events) {
-      obj.events = message.events.map((e) => e ? CdcMessage.toJSON(e) : undefined);
-    } else {
-      obj.events = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetEventStreamResponse>, I>>(object: I): GetEventStreamResponse {
-    const message = createBaseGetEventStreamResponse();
-    message.sourceId = object.sourceId ?? 0;
-    message.events = object.events?.map((e) => CdcMessage.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null;
-}
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/data.ts b/dashboard/proto/gen/data.ts
deleted file mode 100644
index d24bf8a9de15a..0000000000000
--- a/dashboard/proto/gen/data.ts
+++ /dev/null
@@ -1,964 +0,0 @@
-/* eslint-disable */
-import { Buffer } from "./common";
-
-export const protobufPackage = "data";
-
-export const RwArrayType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  INT16: "INT16",
-  INT32: "INT32",
-  INT64: "INT64",
-  FLOAT32: "FLOAT32",
-  FLOAT64: "FLOAT64",
-  UTF8: "UTF8",
-  BOOL: "BOOL",
-  DECIMAL: "DECIMAL",
-  DATE: "DATE",
-  TIME: "TIME",
-  TIMESTAMP: "TIMESTAMP",
-  INTERVAL: "INTERVAL",
-  STRUCT: "STRUCT",
-  LIST: "LIST",
-  BYTEA: "BYTEA",
-  JSONB: "JSONB",
-  SERIAL: "SERIAL",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type RwArrayType = typeof RwArrayType[keyof typeof RwArrayType];
-
-export function rwArrayTypeFromJSON(object: any): RwArrayType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return RwArrayType.UNSPECIFIED;
-    case 1:
-    case "INT16":
-      return RwArrayType.INT16;
-    case 2:
-    case "INT32":
-      return RwArrayType.INT32;
-    case 3:
-    case "INT64":
-      return RwArrayType.INT64;
-    case 4:
-    case "FLOAT32":
-      return RwArrayType.FLOAT32;
-    case 5:
-    case "FLOAT64":
-      return RwArrayType.FLOAT64;
-    case 6:
-    case "UTF8":
-      return RwArrayType.UTF8;
-    case 7:
-    case "BOOL":
-      return RwArrayType.BOOL;
-    case 8:
-    case "DECIMAL":
-      return RwArrayType.DECIMAL;
-    case 9:
-    case "DATE":
-      return RwArrayType.DATE;
-    case 10:
-    case "TIME":
-      return RwArrayType.TIME;
-    case 11:
-    case "TIMESTAMP":
-      return RwArrayType.TIMESTAMP;
-    case 12:
-    case "INTERVAL":
-      return RwArrayType.INTERVAL;
-    case 13:
-    case "STRUCT":
-      return RwArrayType.STRUCT;
-    case 14:
-    case "LIST":
-      return RwArrayType.LIST;
-    case 15:
-    case "BYTEA":
-      return RwArrayType.BYTEA;
-    case 16:
-    case "JSONB":
-      return RwArrayType.JSONB;
-    case 17:
-    case "SERIAL":
-      return RwArrayType.SERIAL;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return RwArrayType.UNRECOGNIZED;
-  }
-}
-
-export function rwArrayTypeToJSON(object: RwArrayType): string {
-  switch (object) {
-    case RwArrayType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case RwArrayType.INT16:
-      return "INT16";
-    case RwArrayType.INT32:
-      return "INT32";
-    case RwArrayType.INT64:
-      return "INT64";
-    case RwArrayType.FLOAT32:
-      return "FLOAT32";
-    case RwArrayType.FLOAT64:
-      return "FLOAT64";
-    case RwArrayType.UTF8:
-      return "UTF8";
-    case RwArrayType.BOOL:
-      return "BOOL";
-    case RwArrayType.DECIMAL:
-      return "DECIMAL";
-    case RwArrayType.DATE:
-      return "DATE";
-    case RwArrayType.TIME:
-      return "TIME";
-    case RwArrayType.TIMESTAMP:
-      return "TIMESTAMP";
-    case RwArrayType.INTERVAL:
-      return "INTERVAL";
-    case RwArrayType.STRUCT:
-      return "STRUCT";
-    case RwArrayType.LIST:
-      return "LIST";
-    case RwArrayType.BYTEA:
-      return "BYTEA";
-    case RwArrayType.JSONB:
-      return "JSONB";
-    case RwArrayType.SERIAL:
-      return "SERIAL";
-    case RwArrayType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const Op = {
-  OP_UNSPECIFIED: "OP_UNSPECIFIED",
-  INSERT: "INSERT",
-  DELETE: "DELETE",
-  UPDATE_INSERT: "UPDATE_INSERT",
-  UPDATE_DELETE: "UPDATE_DELETE",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type Op = typeof Op[keyof typeof Op];
-
-export function opFromJSON(object: any): Op {
-  switch (object) {
-    case 0:
-    case "OP_UNSPECIFIED":
-      return Op.OP_UNSPECIFIED;
-    case 1:
-    case "INSERT":
-      return Op.INSERT;
-    case 2:
-    case "DELETE":
-      return Op.DELETE;
-    case 3:
-    case "UPDATE_INSERT":
-      return Op.UPDATE_INSERT;
-    case 4:
-    case "UPDATE_DELETE":
-      return Op.UPDATE_DELETE;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return Op.UNRECOGNIZED;
-  }
-}
-
-export function opToJSON(object: Op): string {
-  switch (object) {
-    case Op.OP_UNSPECIFIED:
-      return "OP_UNSPECIFIED";
-    case Op.INSERT:
-      return "INSERT";
-    case Op.DELETE:
-      return "DELETE";
-    case Op.UPDATE_INSERT:
-      return "UPDATE_INSERT";
-    case Op.UPDATE_DELETE:
-      return "UPDATE_DELETE";
-    case Op.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface IntervalUnit {
-  months: number;
-  days: number;
-  usecs: number;
-}
-
-export interface DataType {
-  typeName: DataType_TypeName;
-  /**
-   * Data length for char.
-   * Max data length for varchar.
-   * Precision for time, decimal.
-   */
-  precision: number;
-  /** Scale for decimal. */
-  scale: number;
-  isNullable: boolean;
-  intervalType: DataType_IntervalType;
-  /**
-   * For struct type, it represents all the fields in the struct.
-   * For list type it only contains 1 element which is the inner item type of the List.
-   * For example, `ARRAY<INTEGER>` will be represented as `vec![DataType::Int32]`.
-   */
-  fieldType: DataType[];
-  /** Name of the fields if it is a struct type. For other types it will be empty. */
-  fieldNames: string[];
-}
-
-export const DataType_IntervalType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  YEAR: "YEAR",
-  MONTH: "MONTH",
-  DAY: "DAY",
-  HOUR: "HOUR",
-  MINUTE: "MINUTE",
-  SECOND: "SECOND",
-  YEAR_TO_MONTH: "YEAR_TO_MONTH",
-  DAY_TO_HOUR: "DAY_TO_HOUR",
-  DAY_TO_MINUTE: "DAY_TO_MINUTE",
-  DAY_TO_SECOND: "DAY_TO_SECOND",
-  HOUR_TO_MINUTE: "HOUR_TO_MINUTE",
-  HOUR_TO_SECOND: "HOUR_TO_SECOND",
-  MINUTE_TO_SECOND: "MINUTE_TO_SECOND",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type DataType_IntervalType = typeof DataType_IntervalType[keyof typeof DataType_IntervalType];
-
-export function dataType_IntervalTypeFromJSON(object: any): DataType_IntervalType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return DataType_IntervalType.UNSPECIFIED;
-    case 1:
-    case "YEAR":
-      return DataType_IntervalType.YEAR;
-    case 2:
-    case "MONTH":
-      return DataType_IntervalType.MONTH;
-    case 3:
-    case "DAY":
-      return DataType_IntervalType.DAY;
-    case 4:
-    case "HOUR":
-      return DataType_IntervalType.HOUR;
-    case 5:
-    case "MINUTE":
-      return DataType_IntervalType.MINUTE;
-    case 6:
-    case "SECOND":
-      return DataType_IntervalType.SECOND;
-    case 7:
-    case "YEAR_TO_MONTH":
-      return DataType_IntervalType.YEAR_TO_MONTH;
-    case 8:
-    case "DAY_TO_HOUR":
-      return DataType_IntervalType.DAY_TO_HOUR;
-    case 9:
-    case "DAY_TO_MINUTE":
-      return DataType_IntervalType.DAY_TO_MINUTE;
-    case 10:
-    case "DAY_TO_SECOND":
-      return DataType_IntervalType.DAY_TO_SECOND;
-    case 11:
-    case "HOUR_TO_MINUTE":
-      return DataType_IntervalType.HOUR_TO_MINUTE;
-    case 12:
-    case "HOUR_TO_SECOND":
-      return DataType_IntervalType.HOUR_TO_SECOND;
-    case 13:
-    case "MINUTE_TO_SECOND":
-      return DataType_IntervalType.MINUTE_TO_SECOND;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return DataType_IntervalType.UNRECOGNIZED;
-  }
-}
-
-export function dataType_IntervalTypeToJSON(object: DataType_IntervalType): string {
-  switch (object) {
-    case DataType_IntervalType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case DataType_IntervalType.YEAR:
-      return "YEAR";
-    case DataType_IntervalType.MONTH:
-      return "MONTH";
-    case DataType_IntervalType.DAY:
-      return "DAY";
-    case DataType_IntervalType.HOUR:
-      return "HOUR";
-    case DataType_IntervalType.MINUTE:
-      return "MINUTE";
-    case DataType_IntervalType.SECOND:
-      return "SECOND";
-    case DataType_IntervalType.YEAR_TO_MONTH:
-      return "YEAR_TO_MONTH";
-    case DataType_IntervalType.DAY_TO_HOUR:
-      return "DAY_TO_HOUR";
-    case DataType_IntervalType.DAY_TO_MINUTE:
-      return "DAY_TO_MINUTE";
-    case DataType_IntervalType.DAY_TO_SECOND:
-      return "DAY_TO_SECOND";
-    case DataType_IntervalType.HOUR_TO_MINUTE:
-      return "HOUR_TO_MINUTE";
-    case DataType_IntervalType.HOUR_TO_SECOND:
-      return "HOUR_TO_SECOND";
-    case DataType_IntervalType.MINUTE_TO_SECOND:
-      return "MINUTE_TO_SECOND";
-    case DataType_IntervalType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const DataType_TypeName = {
-  TYPE_UNSPECIFIED: "TYPE_UNSPECIFIED",
-  INT16: "INT16",
-  INT32: "INT32",
-  INT64: "INT64",
-  FLOAT: "FLOAT",
-  DOUBLE: "DOUBLE",
-  BOOLEAN: "BOOLEAN",
-  VARCHAR: "VARCHAR",
-  DECIMAL: "DECIMAL",
-  TIME: "TIME",
-  TIMESTAMP: "TIMESTAMP",
-  INTERVAL: "INTERVAL",
-  DATE: "DATE",
-  /** TIMESTAMPTZ - Timestamp type with timezone */
-  TIMESTAMPTZ: "TIMESTAMPTZ",
-  STRUCT: "STRUCT",
-  LIST: "LIST",
-  BYTEA: "BYTEA",
-  JSONB: "JSONB",
-  SERIAL: "SERIAL",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type DataType_TypeName = typeof DataType_TypeName[keyof typeof DataType_TypeName];
-
-export function dataType_TypeNameFromJSON(object: any): DataType_TypeName {
-  switch (object) {
-    case 0:
-    case "TYPE_UNSPECIFIED":
-      return DataType_TypeName.TYPE_UNSPECIFIED;
-    case 1:
-    case "INT16":
-      return DataType_TypeName.INT16;
-    case 2:
-    case "INT32":
-      return DataType_TypeName.INT32;
-    case 3:
-    case "INT64":
-      return DataType_TypeName.INT64;
-    case 4:
-    case "FLOAT":
-      return DataType_TypeName.FLOAT;
-    case 5:
-    case "DOUBLE":
-      return DataType_TypeName.DOUBLE;
-    case 6:
-    case "BOOLEAN":
-      return DataType_TypeName.BOOLEAN;
-    case 7:
-    case "VARCHAR":
-      return DataType_TypeName.VARCHAR;
-    case 8:
-    case "DECIMAL":
-      return DataType_TypeName.DECIMAL;
-    case 9:
-    case "TIME":
-      return DataType_TypeName.TIME;
-    case 10:
-    case "TIMESTAMP":
-      return DataType_TypeName.TIMESTAMP;
-    case 11:
-    case "INTERVAL":
-      return DataType_TypeName.INTERVAL;
-    case 12:
-    case "DATE":
-      return DataType_TypeName.DATE;
-    case 13:
-    case "TIMESTAMPTZ":
-      return DataType_TypeName.TIMESTAMPTZ;
-    case 15:
-    case "STRUCT":
-      return DataType_TypeName.STRUCT;
-    case 16:
-    case "LIST":
-      return DataType_TypeName.LIST;
-    case 17:
-    case "BYTEA":
-      return DataType_TypeName.BYTEA;
-    case 18:
-    case "JSONB":
-      return DataType_TypeName.JSONB;
-    case 19:
-    case "SERIAL":
-      return DataType_TypeName.SERIAL;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return DataType_TypeName.UNRECOGNIZED;
-  }
-}
-
-export function dataType_TypeNameToJSON(object: DataType_TypeName): string {
-  switch (object) {
-    case DataType_TypeName.TYPE_UNSPECIFIED:
-      return "TYPE_UNSPECIFIED";
-    case DataType_TypeName.INT16:
-      return "INT16";
-    case DataType_TypeName.INT32:
-      return "INT32";
-    case DataType_TypeName.INT64:
-      return "INT64";
-    case DataType_TypeName.FLOAT:
-      return "FLOAT";
-    case DataType_TypeName.DOUBLE:
-      return "DOUBLE";
-    case DataType_TypeName.BOOLEAN:
-      return "BOOLEAN";
-    case DataType_TypeName.VARCHAR:
-      return "VARCHAR";
-    case DataType_TypeName.DECIMAL:
-      return "DECIMAL";
-    case DataType_TypeName.TIME:
-      return "TIME";
-    case DataType_TypeName.TIMESTAMP:
-      return "TIMESTAMP";
-    case DataType_TypeName.INTERVAL:
-      return "INTERVAL";
-    case DataType_TypeName.DATE:
-      return "DATE";
-    case DataType_TypeName.TIMESTAMPTZ:
-      return "TIMESTAMPTZ";
-    case DataType_TypeName.STRUCT:
-      return "STRUCT";
-    case DataType_TypeName.LIST:
-      return "LIST";
-    case DataType_TypeName.BYTEA:
-      return "BYTEA";
-    case DataType_TypeName.JSONB:
-      return "JSONB";
-    case DataType_TypeName.SERIAL:
-      return "SERIAL";
-    case DataType_TypeName.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface StructRwArrayData {
-  childrenArray: RwArray[];
-  childrenType: DataType[];
-}
-
-export interface ListRwArrayData {
-  offsets: number[];
-  value: RwArray | undefined;
-  valueType: DataType | undefined;
-}
-
-export interface RwArray {
-  arrayType: RwArrayType;
-  nullBitmap: Buffer | undefined;
-  values: Buffer[];
-  structArrayData: StructRwArrayData | undefined;
-  listArrayData: ListRwArrayData | undefined;
-}
-
-export interface Datum {
-  /**
-   * bool array/bitmap: one byte, 0 for false (null), non-zero for true (non-null)
-   * integer, float,  double: big-endianness
-   * interval: encoded to (months, days, milliseconds), big-endianness
-   * varchar: encoded accorded to encoding, currently only utf8 is supported.
-   */
-  body: Uint8Array;
-}
-
-/**
- * New column proto def to replace fixed width column. This def
- * aims to include all column type. Currently it do not support struct/array
- * but capable of extending in future by add other fields.
- */
-export interface Column {
-  array: RwArray | undefined;
-}
-
-export interface DataChunk {
-  cardinality: number;
-  columns: Column[];
-}
-
-export interface StreamChunk {
-  /** for Column::from_protobuf(), may not need later */
-  cardinality: number;
-  ops: Op[];
-  columns: Column[];
-}
-
-export interface Epoch {
-  curr: number;
-  prev: number;
-}
-
-export interface Terminate {
-}
-
-function createBaseIntervalUnit(): IntervalUnit {
-  return { months: 0, days: 0, usecs: 0 };
-}
-
-export const IntervalUnit = {
-  fromJSON(object: any): IntervalUnit {
-    return {
-      months: isSet(object.months) ? Number(object.months) : 0,
-      days: isSet(object.days) ? Number(object.days) : 0,
-      usecs: isSet(object.usecs) ? Number(object.usecs) : 0,
-    };
-  },
-
-  toJSON(message: IntervalUnit): unknown {
-    const obj: any = {};
-    message.months !== undefined && (obj.months = Math.round(message.months));
-    message.days !== undefined && (obj.days = Math.round(message.days));
-    message.usecs !== undefined && (obj.usecs = Math.round(message.usecs));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<IntervalUnit>, I>>(object: I): IntervalUnit {
-    const message = createBaseIntervalUnit();
-    message.months = object.months ?? 0;
-    message.days = object.days ?? 0;
-    message.usecs = object.usecs ?? 0;
-    return message;
-  },
-};
-
-function createBaseDataType(): DataType {
-  return {
-    typeName: DataType_TypeName.TYPE_UNSPECIFIED,
-    precision: 0,
-    scale: 0,
-    isNullable: false,
-    intervalType: DataType_IntervalType.UNSPECIFIED,
-    fieldType: [],
-    fieldNames: [],
-  };
-}
-
-export const DataType = {
-  fromJSON(object: any): DataType {
-    return {
-      typeName: isSet(object.typeName)
-        ? dataType_TypeNameFromJSON(object.typeName)
-        : DataType_TypeName.TYPE_UNSPECIFIED,
-      precision: isSet(object.precision) ? Number(object.precision) : 0,
-      scale: isSet(object.scale) ? Number(object.scale) : 0,
-      isNullable: isSet(object.isNullable) ? Boolean(object.isNullable) : false,
-      intervalType: isSet(object.intervalType)
-        ? dataType_IntervalTypeFromJSON(object.intervalType)
-        : DataType_IntervalType.UNSPECIFIED,
-      fieldType: Array.isArray(object?.fieldType) ? object.fieldType.map((e: any) => DataType.fromJSON(e)) : [],
-      fieldNames: Array.isArray(object?.fieldNames) ? object.fieldNames.map((e: any) => String(e)) : [],
-    };
-  },
-
-  toJSON(message: DataType): unknown {
-    const obj: any = {};
-    message.typeName !== undefined && (obj.typeName = dataType_TypeNameToJSON(message.typeName));
-    message.precision !== undefined && (obj.precision = Math.round(message.precision));
-    message.scale !== undefined && (obj.scale = Math.round(message.scale));
-    message.isNullable !== undefined && (obj.isNullable = message.isNullable);
-    message.intervalType !== undefined && (obj.intervalType = dataType_IntervalTypeToJSON(message.intervalType));
-    if (message.fieldType) {
-      obj.fieldType = message.fieldType.map((e) => e ? DataType.toJSON(e) : undefined);
-    } else {
-      obj.fieldType = [];
-    }
-    if (message.fieldNames) {
-      obj.fieldNames = message.fieldNames.map((e) => e);
-    } else {
-      obj.fieldNames = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DataType>, I>>(object: I): DataType {
-    const message = createBaseDataType();
-    message.typeName = object.typeName ?? DataType_TypeName.TYPE_UNSPECIFIED;
-    message.precision = object.precision ?? 0;
-    message.scale = object.scale ?? 0;
-    message.isNullable = object.isNullable ?? false;
-    message.intervalType = object.intervalType ?? DataType_IntervalType.UNSPECIFIED;
-    message.fieldType = object.fieldType?.map((e) => DataType.fromPartial(e)) || [];
-    message.fieldNames = object.fieldNames?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseStructRwArrayData(): StructRwArrayData {
-  return { childrenArray: [], childrenType: [] };
-}
-
-export const StructRwArrayData = {
-  fromJSON(object: any): StructRwArrayData {
-    return {
-      childrenArray: Array.isArray(object?.childrenArray)
-        ? object.childrenArray.map((e: any) => RwArray.fromJSON(e))
-        : [],
-      childrenType: Array.isArray(object?.childrenType)
-        ? object.childrenType.map((e: any) => DataType.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: StructRwArrayData): unknown {
-    const obj: any = {};
-    if (message.childrenArray) {
-      obj.childrenArray = message.childrenArray.map((e) => e ? RwArray.toJSON(e) : undefined);
-    } else {
-      obj.childrenArray = [];
-    }
-    if (message.childrenType) {
-      obj.childrenType = message.childrenType.map((e) => e ? DataType.toJSON(e) : undefined);
-    } else {
-      obj.childrenType = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StructRwArrayData>, I>>(object: I): StructRwArrayData {
-    const message = createBaseStructRwArrayData();
-    message.childrenArray = object.childrenArray?.map((e) => RwArray.fromPartial(e)) || [];
-    message.childrenType = object.childrenType?.map((e) => DataType.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseListRwArrayData(): ListRwArrayData {
-  return { offsets: [], value: undefined, valueType: undefined };
-}
-
-export const ListRwArrayData = {
-  fromJSON(object: any): ListRwArrayData {
-    return {
-      offsets: Array.isArray(object?.offsets) ? object.offsets.map((e: any) => Number(e)) : [],
-      value: isSet(object.value) ? RwArray.fromJSON(object.value) : undefined,
-      valueType: isSet(object.valueType) ? DataType.fromJSON(object.valueType) : undefined,
-    };
-  },
-
-  toJSON(message: ListRwArrayData): unknown {
-    const obj: any = {};
-    if (message.offsets) {
-      obj.offsets = message.offsets.map((e) => Math.round(e));
-    } else {
-      obj.offsets = [];
-    }
-    message.value !== undefined && (obj.value = message.value ? RwArray.toJSON(message.value) : undefined);
-    message.valueType !== undefined &&
-      (obj.valueType = message.valueType ? DataType.toJSON(message.valueType) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListRwArrayData>, I>>(object: I): ListRwArrayData {
-    const message = createBaseListRwArrayData();
-    message.offsets = object.offsets?.map((e) => e) || [];
-    message.value = (object.value !== undefined && object.value !== null)
-      ? RwArray.fromPartial(object.value)
-      : undefined;
-    message.valueType = (object.valueType !== undefined && object.valueType !== null)
-      ? DataType.fromPartial(object.valueType)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseRwArray(): RwArray {
-  return {
-    arrayType: RwArrayType.UNSPECIFIED,
-    nullBitmap: undefined,
-    values: [],
-    structArrayData: undefined,
-    listArrayData: undefined,
-  };
-}
-
-export const RwArray = {
-  fromJSON(object: any): RwArray {
-    return {
-      arrayType: isSet(object.arrayType) ? rwArrayTypeFromJSON(object.arrayType) : RwArrayType.UNSPECIFIED,
-      nullBitmap: isSet(object.nullBitmap) ? Buffer.fromJSON(object.nullBitmap) : undefined,
-      values: Array.isArray(object?.values) ? object.values.map((e: any) => Buffer.fromJSON(e)) : [],
-      structArrayData: isSet(object.structArrayData) ? StructRwArrayData.fromJSON(object.structArrayData) : undefined,
-      listArrayData: isSet(object.listArrayData) ? ListRwArrayData.fromJSON(object.listArrayData) : undefined,
-    };
-  },
-
-  toJSON(message: RwArray): unknown {
-    const obj: any = {};
-    message.arrayType !== undefined && (obj.arrayType = rwArrayTypeToJSON(message.arrayType));
-    message.nullBitmap !== undefined &&
-      (obj.nullBitmap = message.nullBitmap ? Buffer.toJSON(message.nullBitmap) : undefined);
-    if (message.values) {
-      obj.values = message.values.map((e) => e ? Buffer.toJSON(e) : undefined);
-    } else {
-      obj.values = [];
-    }
-    message.structArrayData !== undefined &&
-      (obj.structArrayData = message.structArrayData ? StructRwArrayData.toJSON(message.structArrayData) : undefined);
-    message.listArrayData !== undefined &&
-      (obj.listArrayData = message.listArrayData ? ListRwArrayData.toJSON(message.listArrayData) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RwArray>, I>>(object: I): RwArray {
-    const message = createBaseRwArray();
-    message.arrayType = object.arrayType ?? RwArrayType.UNSPECIFIED;
-    message.nullBitmap = (object.nullBitmap !== undefined && object.nullBitmap !== null)
-      ? Buffer.fromPartial(object.nullBitmap)
-      : undefined;
-    message.values = object.values?.map((e) => Buffer.fromPartial(e)) || [];
-    message.structArrayData = (object.structArrayData !== undefined && object.structArrayData !== null)
-      ? StructRwArrayData.fromPartial(object.structArrayData)
-      : undefined;
-    message.listArrayData = (object.listArrayData !== undefined && object.listArrayData !== null)
-      ? ListRwArrayData.fromPartial(object.listArrayData)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseDatum(): Datum {
-  return { body: new Uint8Array() };
-}
-
-export const Datum = {
-  fromJSON(object: any): Datum {
-    return { body: isSet(object.body) ? bytesFromBase64(object.body) : new Uint8Array() };
-  },
-
-  toJSON(message: Datum): unknown {
-    const obj: any = {};
-    message.body !== undefined &&
-      (obj.body = base64FromBytes(message.body !== undefined ? message.body : new Uint8Array()));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Datum>, I>>(object: I): Datum {
-    const message = createBaseDatum();
-    message.body = object.body ?? new Uint8Array();
-    return message;
-  },
-};
-
-function createBaseColumn(): Column {
-  return { array: undefined };
-}
-
-export const Column = {
-  fromJSON(object: any): Column {
-    return { array: isSet(object.array) ? RwArray.fromJSON(object.array) : undefined };
-  },
-
-  toJSON(message: Column): unknown {
-    const obj: any = {};
-    message.array !== undefined && (obj.array = message.array ? RwArray.toJSON(message.array) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Column>, I>>(object: I): Column {
-    const message = createBaseColumn();
-    message.array = (object.array !== undefined && object.array !== null)
-      ? RwArray.fromPartial(object.array)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseDataChunk(): DataChunk {
-  return { cardinality: 0, columns: [] };
-}
-
-export const DataChunk = {
-  fromJSON(object: any): DataChunk {
-    return {
-      cardinality: isSet(object.cardinality) ? Number(object.cardinality) : 0,
-      columns: Array.isArray(object?.columns) ? object.columns.map((e: any) => Column.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: DataChunk): unknown {
-    const obj: any = {};
-    message.cardinality !== undefined && (obj.cardinality = Math.round(message.cardinality));
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? Column.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DataChunk>, I>>(object: I): DataChunk {
-    const message = createBaseDataChunk();
-    message.cardinality = object.cardinality ?? 0;
-    message.columns = object.columns?.map((e) => Column.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseStreamChunk(): StreamChunk {
-  return { cardinality: 0, ops: [], columns: [] };
-}
-
-export const StreamChunk = {
-  fromJSON(object: any): StreamChunk {
-    return {
-      cardinality: isSet(object.cardinality) ? Number(object.cardinality) : 0,
-      ops: Array.isArray(object?.ops) ? object.ops.map((e: any) => opFromJSON(e)) : [],
-      columns: Array.isArray(object?.columns) ? object.columns.map((e: any) => Column.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: StreamChunk): unknown {
-    const obj: any = {};
-    message.cardinality !== undefined && (obj.cardinality = Math.round(message.cardinality));
-    if (message.ops) {
-      obj.ops = message.ops.map((e) => opToJSON(e));
-    } else {
-      obj.ops = [];
-    }
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? Column.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamChunk>, I>>(object: I): StreamChunk {
-    const message = createBaseStreamChunk();
-    message.cardinality = object.cardinality ?? 0;
-    message.ops = object.ops?.map((e) => e) || [];
-    message.columns = object.columns?.map((e) => Column.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseEpoch(): Epoch {
-  return { curr: 0, prev: 0 };
-}
-
-export const Epoch = {
-  fromJSON(object: any): Epoch {
-    return { curr: isSet(object.curr) ? Number(object.curr) : 0, prev: isSet(object.prev) ? Number(object.prev) : 0 };
-  },
-
-  toJSON(message: Epoch): unknown {
-    const obj: any = {};
-    message.curr !== undefined && (obj.curr = Math.round(message.curr));
-    message.prev !== undefined && (obj.prev = Math.round(message.prev));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Epoch>, I>>(object: I): Epoch {
-    const message = createBaseEpoch();
-    message.curr = object.curr ?? 0;
-    message.prev = object.prev ?? 0;
-    return message;
-  },
-};
-
-function createBaseTerminate(): Terminate {
-  return {};
-}
-
-export const Terminate = {
-  fromJSON(_: any): Terminate {
-    return {};
-  },
-
-  toJSON(_: Terminate): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Terminate>, I>>(_: I): Terminate {
-    const message = createBaseTerminate();
-    return message;
-  },
-};
-
-declare var self: any | undefined;
-declare var window: any | undefined;
-declare var global: any | undefined;
-var globalThis: any = (() => {
-  if (typeof globalThis !== "undefined") {
-    return globalThis;
-  }
-  if (typeof self !== "undefined") {
-    return self;
-  }
-  if (typeof window !== "undefined") {
-    return window;
-  }
-  if (typeof global !== "undefined") {
-    return global;
-  }
-  throw "Unable to locate global object";
-})();
-
-function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-
-function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin: string[] = [];
-    arr.forEach((byte) => {
-      bin.push(String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/ddl_service.ts b/dashboard/proto/gen/ddl_service.ts
deleted file mode 100644
index 56ba0f8aefac3..0000000000000
--- a/dashboard/proto/gen/ddl_service.ts
+++ /dev/null
@@ -1,1738 +0,0 @@
-/* eslint-disable */
-import { ColIndexMapping, Connection, Database, Function, Index, Schema, Sink, Source, Table, View } from "./catalog";
-import { Status } from "./common";
-import { StreamFragmentGraph } from "./stream_plan";
-
-export const protobufPackage = "ddl_service";
-
-export interface CreateDatabaseRequest {
-  db: Database | undefined;
-}
-
-export interface CreateDatabaseResponse {
-  status: Status | undefined;
-  databaseId: number;
-  version: number;
-}
-
-export interface DropDatabaseRequest {
-  databaseId: number;
-}
-
-export interface DropDatabaseResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface CreateSchemaRequest {
-  schema: Schema | undefined;
-}
-
-export interface CreateSchemaResponse {
-  status: Status | undefined;
-  schemaId: number;
-  version: number;
-}
-
-export interface DropSchemaRequest {
-  schemaId: number;
-}
-
-export interface DropSchemaResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface CreateSourceRequest {
-  source: Source | undefined;
-}
-
-export interface CreateSourceResponse {
-  status: Status | undefined;
-  sourceId: number;
-  version: number;
-}
-
-export interface DropSourceRequest {
-  sourceId: number;
-}
-
-export interface DropSourceResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface CreateSinkRequest {
-  sink: Sink | undefined;
-  fragmentGraph: StreamFragmentGraph | undefined;
-}
-
-export interface CreateSinkResponse {
-  status: Status | undefined;
-  sinkId: number;
-  version: number;
-}
-
-export interface DropSinkRequest {
-  sinkId: number;
-}
-
-export interface DropSinkResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface CreateMaterializedViewRequest {
-  materializedView: Table | undefined;
-  fragmentGraph: StreamFragmentGraph | undefined;
-}
-
-export interface CreateMaterializedViewResponse {
-  status: Status | undefined;
-  tableId: number;
-  version: number;
-}
-
-export interface DropMaterializedViewRequest {
-  tableId: number;
-}
-
-export interface DropMaterializedViewResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface CreateViewRequest {
-  view: View | undefined;
-}
-
-export interface CreateViewResponse {
-  status: Status | undefined;
-  viewId: number;
-  version: number;
-}
-
-export interface DropViewRequest {
-  viewId: number;
-}
-
-export interface DropViewResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface CreateTableRequest {
-  /**
-   * An optional field and will be `Some` for tables with an external connector. If so, the table
-   * will subscribe to the changes of the external connector and materialize the data.
-   */
-  source: Source | undefined;
-  materializedView: Table | undefined;
-  fragmentGraph: StreamFragmentGraph | undefined;
-}
-
-export interface CreateTableResponse {
-  status: Status | undefined;
-  tableId: number;
-  version: number;
-}
-
-export interface CreateFunctionRequest {
-  function: Function | undefined;
-}
-
-export interface CreateFunctionResponse {
-  status: Status | undefined;
-  functionId: number;
-  version: number;
-}
-
-export interface DropFunctionRequest {
-  functionId: number;
-}
-
-export interface DropFunctionResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface DropTableRequest {
-  sourceId?: { $case: "id"; id: number };
-  tableId: number;
-}
-
-export interface DropTableResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-/** Used by risectl (and in the future, dashboard) */
-export interface RisectlListStateTablesRequest {
-}
-
-/** Used by risectl (and in the future, dashboard) */
-export interface RisectlListStateTablesResponse {
-  tables: Table[];
-}
-
-export interface CreateIndexRequest {
-  index: Index | undefined;
-  indexTable: Table | undefined;
-  fragmentGraph: StreamFragmentGraph | undefined;
-}
-
-export interface CreateIndexResponse {
-  status: Status | undefined;
-  indexId: number;
-  version: number;
-}
-
-export interface DropIndexRequest {
-  indexId: number;
-}
-
-export interface DropIndexResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface ReplaceTablePlanRequest {
-  /**
-   * The new table catalog, with the correct table ID and a new version.
-   * If the new version does not match the subsequent version in the meta service's
-   * catalog, this request will be rejected.
-   */
-  table:
-    | Table
-    | undefined;
-  /** The new materialization plan, where all schema are updated. */
-  fragmentGraph:
-    | StreamFragmentGraph
-    | undefined;
-  /** The mapping from the old columns to the new columns of the table. */
-  tableColIndexMapping: ColIndexMapping | undefined;
-}
-
-export interface ReplaceTablePlanResponse {
-  status:
-    | Status
-    | undefined;
-  /** The new global catalog version. */
-  version: number;
-}
-
-export interface GetTableRequest {
-  databaseName: string;
-  tableName: string;
-}
-
-export interface GetTableResponse {
-  table: Table | undefined;
-}
-
-export interface GetDdlProgressRequest {
-}
-
-export interface DdlProgress {
-  id: number;
-  statement: string;
-  progress: string;
-}
-
-export interface GetDdlProgressResponse {
-  ddlProgress: DdlProgress[];
-}
-
-export interface CreateConnectionRequest {
-  payload?: { $case: "privateLink"; privateLink: CreateConnectionRequest_PrivateLink };
-}
-
-export interface CreateConnectionRequest_PrivateLink {
-  provider: string;
-  serviceName: string;
-  availabilityZones: string[];
-}
-
-export interface CreateConnectionResponse {
-  connectionId: number;
-  /** global catalog version */
-  version: number;
-}
-
-export interface ListConnectionsRequest {
-}
-
-export interface ListConnectionsResponse {
-  connections: Connection[];
-}
-
-export interface DropConnectionRequest {
-  connectionName: string;
-}
-
-export interface DropConnectionResponse {
-}
-
-function createBaseCreateDatabaseRequest(): CreateDatabaseRequest {
-  return { db: undefined };
-}
-
-export const CreateDatabaseRequest = {
-  fromJSON(object: any): CreateDatabaseRequest {
-    return { db: isSet(object.db) ? Database.fromJSON(object.db) : undefined };
-  },
-
-  toJSON(message: CreateDatabaseRequest): unknown {
-    const obj: any = {};
-    message.db !== undefined && (obj.db = message.db ? Database.toJSON(message.db) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateDatabaseRequest>, I>>(object: I): CreateDatabaseRequest {
-    const message = createBaseCreateDatabaseRequest();
-    message.db = (object.db !== undefined && object.db !== null) ? Database.fromPartial(object.db) : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateDatabaseResponse(): CreateDatabaseResponse {
-  return { status: undefined, databaseId: 0, version: 0 };
-}
-
-export const CreateDatabaseResponse = {
-  fromJSON(object: any): CreateDatabaseResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateDatabaseResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateDatabaseResponse>, I>>(object: I): CreateDatabaseResponse {
-    const message = createBaseCreateDatabaseResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.databaseId = object.databaseId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropDatabaseRequest(): DropDatabaseRequest {
-  return { databaseId: 0 };
-}
-
-export const DropDatabaseRequest = {
-  fromJSON(object: any): DropDatabaseRequest {
-    return { databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0 };
-  },
-
-  toJSON(message: DropDatabaseRequest): unknown {
-    const obj: any = {};
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropDatabaseRequest>, I>>(object: I): DropDatabaseRequest {
-    const message = createBaseDropDatabaseRequest();
-    message.databaseId = object.databaseId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropDatabaseResponse(): DropDatabaseResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropDatabaseResponse = {
-  fromJSON(object: any): DropDatabaseResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropDatabaseResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropDatabaseResponse>, I>>(object: I): DropDatabaseResponse {
-    const message = createBaseDropDatabaseResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseCreateSchemaRequest(): CreateSchemaRequest {
-  return { schema: undefined };
-}
-
-export const CreateSchemaRequest = {
-  fromJSON(object: any): CreateSchemaRequest {
-    return { schema: isSet(object.schema) ? Schema.fromJSON(object.schema) : undefined };
-  },
-
-  toJSON(message: CreateSchemaRequest): unknown {
-    const obj: any = {};
-    message.schema !== undefined && (obj.schema = message.schema ? Schema.toJSON(message.schema) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateSchemaRequest>, I>>(object: I): CreateSchemaRequest {
-    const message = createBaseCreateSchemaRequest();
-    message.schema = (object.schema !== undefined && object.schema !== null)
-      ? Schema.fromPartial(object.schema)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateSchemaResponse(): CreateSchemaResponse {
-  return { status: undefined, schemaId: 0, version: 0 };
-}
-
-export const CreateSchemaResponse = {
-  fromJSON(object: any): CreateSchemaResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      schemaId: isSet(object.schemaId) ? Number(object.schemaId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateSchemaResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.schemaId !== undefined && (obj.schemaId = Math.round(message.schemaId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateSchemaResponse>, I>>(object: I): CreateSchemaResponse {
-    const message = createBaseCreateSchemaResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.schemaId = object.schemaId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropSchemaRequest(): DropSchemaRequest {
-  return { schemaId: 0 };
-}
-
-export const DropSchemaRequest = {
-  fromJSON(object: any): DropSchemaRequest {
-    return { schemaId: isSet(object.schemaId) ? Number(object.schemaId) : 0 };
-  },
-
-  toJSON(message: DropSchemaRequest): unknown {
-    const obj: any = {};
-    message.schemaId !== undefined && (obj.schemaId = Math.round(message.schemaId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropSchemaRequest>, I>>(object: I): DropSchemaRequest {
-    const message = createBaseDropSchemaRequest();
-    message.schemaId = object.schemaId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropSchemaResponse(): DropSchemaResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropSchemaResponse = {
-  fromJSON(object: any): DropSchemaResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropSchemaResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropSchemaResponse>, I>>(object: I): DropSchemaResponse {
-    const message = createBaseDropSchemaResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseCreateSourceRequest(): CreateSourceRequest {
-  return { source: undefined };
-}
-
-export const CreateSourceRequest = {
-  fromJSON(object: any): CreateSourceRequest {
-    return { source: isSet(object.source) ? Source.fromJSON(object.source) : undefined };
-  },
-
-  toJSON(message: CreateSourceRequest): unknown {
-    const obj: any = {};
-    message.source !== undefined && (obj.source = message.source ? Source.toJSON(message.source) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateSourceRequest>, I>>(object: I): CreateSourceRequest {
-    const message = createBaseCreateSourceRequest();
-    message.source = (object.source !== undefined && object.source !== null)
-      ? Source.fromPartial(object.source)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateSourceResponse(): CreateSourceResponse {
-  return { status: undefined, sourceId: 0, version: 0 };
-}
-
-export const CreateSourceResponse = {
-  fromJSON(object: any): CreateSourceResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      sourceId: isSet(object.sourceId) ? Number(object.sourceId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateSourceResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.sourceId !== undefined && (obj.sourceId = Math.round(message.sourceId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateSourceResponse>, I>>(object: I): CreateSourceResponse {
-    const message = createBaseCreateSourceResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.sourceId = object.sourceId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropSourceRequest(): DropSourceRequest {
-  return { sourceId: 0 };
-}
-
-export const DropSourceRequest = {
-  fromJSON(object: any): DropSourceRequest {
-    return { sourceId: isSet(object.sourceId) ? Number(object.sourceId) : 0 };
-  },
-
-  toJSON(message: DropSourceRequest): unknown {
-    const obj: any = {};
-    message.sourceId !== undefined && (obj.sourceId = Math.round(message.sourceId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropSourceRequest>, I>>(object: I): DropSourceRequest {
-    const message = createBaseDropSourceRequest();
-    message.sourceId = object.sourceId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropSourceResponse(): DropSourceResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropSourceResponse = {
-  fromJSON(object: any): DropSourceResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropSourceResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropSourceResponse>, I>>(object: I): DropSourceResponse {
-    const message = createBaseDropSourceResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseCreateSinkRequest(): CreateSinkRequest {
-  return { sink: undefined, fragmentGraph: undefined };
-}
-
-export const CreateSinkRequest = {
-  fromJSON(object: any): CreateSinkRequest {
-    return {
-      sink: isSet(object.sink) ? Sink.fromJSON(object.sink) : undefined,
-      fragmentGraph: isSet(object.fragmentGraph) ? StreamFragmentGraph.fromJSON(object.fragmentGraph) : undefined,
-    };
-  },
-
-  toJSON(message: CreateSinkRequest): unknown {
-    const obj: any = {};
-    message.sink !== undefined && (obj.sink = message.sink ? Sink.toJSON(message.sink) : undefined);
-    message.fragmentGraph !== undefined &&
-      (obj.fragmentGraph = message.fragmentGraph ? StreamFragmentGraph.toJSON(message.fragmentGraph) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateSinkRequest>, I>>(object: I): CreateSinkRequest {
-    const message = createBaseCreateSinkRequest();
-    message.sink = (object.sink !== undefined && object.sink !== null) ? Sink.fromPartial(object.sink) : undefined;
-    message.fragmentGraph = (object.fragmentGraph !== undefined && object.fragmentGraph !== null)
-      ? StreamFragmentGraph.fromPartial(object.fragmentGraph)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateSinkResponse(): CreateSinkResponse {
-  return { status: undefined, sinkId: 0, version: 0 };
-}
-
-export const CreateSinkResponse = {
-  fromJSON(object: any): CreateSinkResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      sinkId: isSet(object.sinkId) ? Number(object.sinkId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateSinkResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.sinkId !== undefined && (obj.sinkId = Math.round(message.sinkId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateSinkResponse>, I>>(object: I): CreateSinkResponse {
-    const message = createBaseCreateSinkResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.sinkId = object.sinkId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropSinkRequest(): DropSinkRequest {
-  return { sinkId: 0 };
-}
-
-export const DropSinkRequest = {
-  fromJSON(object: any): DropSinkRequest {
-    return { sinkId: isSet(object.sinkId) ? Number(object.sinkId) : 0 };
-  },
-
-  toJSON(message: DropSinkRequest): unknown {
-    const obj: any = {};
-    message.sinkId !== undefined && (obj.sinkId = Math.round(message.sinkId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropSinkRequest>, I>>(object: I): DropSinkRequest {
-    const message = createBaseDropSinkRequest();
-    message.sinkId = object.sinkId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropSinkResponse(): DropSinkResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropSinkResponse = {
-  fromJSON(object: any): DropSinkResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropSinkResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropSinkResponse>, I>>(object: I): DropSinkResponse {
-    const message = createBaseDropSinkResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseCreateMaterializedViewRequest(): CreateMaterializedViewRequest {
-  return { materializedView: undefined, fragmentGraph: undefined };
-}
-
-export const CreateMaterializedViewRequest = {
-  fromJSON(object: any): CreateMaterializedViewRequest {
-    return {
-      materializedView: isSet(object.materializedView) ? Table.fromJSON(object.materializedView) : undefined,
-      fragmentGraph: isSet(object.fragmentGraph) ? StreamFragmentGraph.fromJSON(object.fragmentGraph) : undefined,
-    };
-  },
-
-  toJSON(message: CreateMaterializedViewRequest): unknown {
-    const obj: any = {};
-    message.materializedView !== undefined &&
-      (obj.materializedView = message.materializedView ? Table.toJSON(message.materializedView) : undefined);
-    message.fragmentGraph !== undefined &&
-      (obj.fragmentGraph = message.fragmentGraph ? StreamFragmentGraph.toJSON(message.fragmentGraph) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateMaterializedViewRequest>, I>>(
-    object: I,
-  ): CreateMaterializedViewRequest {
-    const message = createBaseCreateMaterializedViewRequest();
-    message.materializedView = (object.materializedView !== undefined && object.materializedView !== null)
-      ? Table.fromPartial(object.materializedView)
-      : undefined;
-    message.fragmentGraph = (object.fragmentGraph !== undefined && object.fragmentGraph !== null)
-      ? StreamFragmentGraph.fromPartial(object.fragmentGraph)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateMaterializedViewResponse(): CreateMaterializedViewResponse {
-  return { status: undefined, tableId: 0, version: 0 };
-}
-
-export const CreateMaterializedViewResponse = {
-  fromJSON(object: any): CreateMaterializedViewResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateMaterializedViewResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateMaterializedViewResponse>, I>>(
-    object: I,
-  ): CreateMaterializedViewResponse {
-    const message = createBaseCreateMaterializedViewResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.tableId = object.tableId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropMaterializedViewRequest(): DropMaterializedViewRequest {
-  return { tableId: 0 };
-}
-
-export const DropMaterializedViewRequest = {
-  fromJSON(object: any): DropMaterializedViewRequest {
-    return { tableId: isSet(object.tableId) ? Number(object.tableId) : 0 };
-  },
-
-  toJSON(message: DropMaterializedViewRequest): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropMaterializedViewRequest>, I>>(object: I): DropMaterializedViewRequest {
-    const message = createBaseDropMaterializedViewRequest();
-    message.tableId = object.tableId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropMaterializedViewResponse(): DropMaterializedViewResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropMaterializedViewResponse = {
-  fromJSON(object: any): DropMaterializedViewResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropMaterializedViewResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropMaterializedViewResponse>, I>>(object: I): DropMaterializedViewResponse {
-    const message = createBaseDropMaterializedViewResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseCreateViewRequest(): CreateViewRequest {
-  return { view: undefined };
-}
-
-export const CreateViewRequest = {
-  fromJSON(object: any): CreateViewRequest {
-    return { view: isSet(object.view) ? View.fromJSON(object.view) : undefined };
-  },
-
-  toJSON(message: CreateViewRequest): unknown {
-    const obj: any = {};
-    message.view !== undefined && (obj.view = message.view ? View.toJSON(message.view) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateViewRequest>, I>>(object: I): CreateViewRequest {
-    const message = createBaseCreateViewRequest();
-    message.view = (object.view !== undefined && object.view !== null) ? View.fromPartial(object.view) : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateViewResponse(): CreateViewResponse {
-  return { status: undefined, viewId: 0, version: 0 };
-}
-
-export const CreateViewResponse = {
-  fromJSON(object: any): CreateViewResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      viewId: isSet(object.viewId) ? Number(object.viewId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateViewResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.viewId !== undefined && (obj.viewId = Math.round(message.viewId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateViewResponse>, I>>(object: I): CreateViewResponse {
-    const message = createBaseCreateViewResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.viewId = object.viewId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropViewRequest(): DropViewRequest {
-  return { viewId: 0 };
-}
-
-export const DropViewRequest = {
-  fromJSON(object: any): DropViewRequest {
-    return { viewId: isSet(object.viewId) ? Number(object.viewId) : 0 };
-  },
-
-  toJSON(message: DropViewRequest): unknown {
-    const obj: any = {};
-    message.viewId !== undefined && (obj.viewId = Math.round(message.viewId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropViewRequest>, I>>(object: I): DropViewRequest {
-    const message = createBaseDropViewRequest();
-    message.viewId = object.viewId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropViewResponse(): DropViewResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropViewResponse = {
-  fromJSON(object: any): DropViewResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropViewResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropViewResponse>, I>>(object: I): DropViewResponse {
-    const message = createBaseDropViewResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseCreateTableRequest(): CreateTableRequest {
-  return { source: undefined, materializedView: undefined, fragmentGraph: undefined };
-}
-
-export const CreateTableRequest = {
-  fromJSON(object: any): CreateTableRequest {
-    return {
-      source: isSet(object.source) ? Source.fromJSON(object.source) : undefined,
-      materializedView: isSet(object.materializedView) ? Table.fromJSON(object.materializedView) : undefined,
-      fragmentGraph: isSet(object.fragmentGraph) ? StreamFragmentGraph.fromJSON(object.fragmentGraph) : undefined,
-    };
-  },
-
-  toJSON(message: CreateTableRequest): unknown {
-    const obj: any = {};
-    message.source !== undefined && (obj.source = message.source ? Source.toJSON(message.source) : undefined);
-    message.materializedView !== undefined &&
-      (obj.materializedView = message.materializedView ? Table.toJSON(message.materializedView) : undefined);
-    message.fragmentGraph !== undefined &&
-      (obj.fragmentGraph = message.fragmentGraph ? StreamFragmentGraph.toJSON(message.fragmentGraph) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateTableRequest>, I>>(object: I): CreateTableRequest {
-    const message = createBaseCreateTableRequest();
-    message.source = (object.source !== undefined && object.source !== null)
-      ? Source.fromPartial(object.source)
-      : undefined;
-    message.materializedView = (object.materializedView !== undefined && object.materializedView !== null)
-      ? Table.fromPartial(object.materializedView)
-      : undefined;
-    message.fragmentGraph = (object.fragmentGraph !== undefined && object.fragmentGraph !== null)
-      ? StreamFragmentGraph.fromPartial(object.fragmentGraph)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateTableResponse(): CreateTableResponse {
-  return { status: undefined, tableId: 0, version: 0 };
-}
-
-export const CreateTableResponse = {
-  fromJSON(object: any): CreateTableResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateTableResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateTableResponse>, I>>(object: I): CreateTableResponse {
-    const message = createBaseCreateTableResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.tableId = object.tableId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseCreateFunctionRequest(): CreateFunctionRequest {
-  return { function: undefined };
-}
-
-export const CreateFunctionRequest = {
-  fromJSON(object: any): CreateFunctionRequest {
-    return { function: isSet(object.function) ? Function.fromJSON(object.function) : undefined };
-  },
-
-  toJSON(message: CreateFunctionRequest): unknown {
-    const obj: any = {};
-    message.function !== undefined && (obj.function = message.function ? Function.toJSON(message.function) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateFunctionRequest>, I>>(object: I): CreateFunctionRequest {
-    const message = createBaseCreateFunctionRequest();
-    message.function = (object.function !== undefined && object.function !== null)
-      ? Function.fromPartial(object.function)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateFunctionResponse(): CreateFunctionResponse {
-  return { status: undefined, functionId: 0, version: 0 };
-}
-
-export const CreateFunctionResponse = {
-  fromJSON(object: any): CreateFunctionResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      functionId: isSet(object.functionId) ? Number(object.functionId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateFunctionResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.functionId !== undefined && (obj.functionId = Math.round(message.functionId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateFunctionResponse>, I>>(object: I): CreateFunctionResponse {
-    const message = createBaseCreateFunctionResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.functionId = object.functionId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropFunctionRequest(): DropFunctionRequest {
-  return { functionId: 0 };
-}
-
-export const DropFunctionRequest = {
-  fromJSON(object: any): DropFunctionRequest {
-    return { functionId: isSet(object.functionId) ? Number(object.functionId) : 0 };
-  },
-
-  toJSON(message: DropFunctionRequest): unknown {
-    const obj: any = {};
-    message.functionId !== undefined && (obj.functionId = Math.round(message.functionId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropFunctionRequest>, I>>(object: I): DropFunctionRequest {
-    const message = createBaseDropFunctionRequest();
-    message.functionId = object.functionId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropFunctionResponse(): DropFunctionResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropFunctionResponse = {
-  fromJSON(object: any): DropFunctionResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropFunctionResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropFunctionResponse>, I>>(object: I): DropFunctionResponse {
-    const message = createBaseDropFunctionResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropTableRequest(): DropTableRequest {
-  return { sourceId: undefined, tableId: 0 };
-}
-
-export const DropTableRequest = {
-  fromJSON(object: any): DropTableRequest {
-    return {
-      sourceId: isSet(object.id) ? { $case: "id", id: Number(object.id) } : undefined,
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-    };
-  },
-
-  toJSON(message: DropTableRequest): unknown {
-    const obj: any = {};
-    message.sourceId?.$case === "id" && (obj.id = Math.round(message.sourceId?.id));
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropTableRequest>, I>>(object: I): DropTableRequest {
-    const message = createBaseDropTableRequest();
-    if (object.sourceId?.$case === "id" && object.sourceId?.id !== undefined && object.sourceId?.id !== null) {
-      message.sourceId = { $case: "id", id: object.sourceId.id };
-    }
-    message.tableId = object.tableId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropTableResponse(): DropTableResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropTableResponse = {
-  fromJSON(object: any): DropTableResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropTableResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropTableResponse>, I>>(object: I): DropTableResponse {
-    const message = createBaseDropTableResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseRisectlListStateTablesRequest(): RisectlListStateTablesRequest {
-  return {};
-}
-
-export const RisectlListStateTablesRequest = {
-  fromJSON(_: any): RisectlListStateTablesRequest {
-    return {};
-  },
-
-  toJSON(_: RisectlListStateTablesRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RisectlListStateTablesRequest>, I>>(_: I): RisectlListStateTablesRequest {
-    const message = createBaseRisectlListStateTablesRequest();
-    return message;
-  },
-};
-
-function createBaseRisectlListStateTablesResponse(): RisectlListStateTablesResponse {
-  return { tables: [] };
-}
-
-export const RisectlListStateTablesResponse = {
-  fromJSON(object: any): RisectlListStateTablesResponse {
-    return { tables: Array.isArray(object?.tables) ? object.tables.map((e: any) => Table.fromJSON(e)) : [] };
-  },
-
-  toJSON(message: RisectlListStateTablesResponse): unknown {
-    const obj: any = {};
-    if (message.tables) {
-      obj.tables = message.tables.map((e) => e ? Table.toJSON(e) : undefined);
-    } else {
-      obj.tables = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RisectlListStateTablesResponse>, I>>(
-    object: I,
-  ): RisectlListStateTablesResponse {
-    const message = createBaseRisectlListStateTablesResponse();
-    message.tables = object.tables?.map((e) => Table.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseCreateIndexRequest(): CreateIndexRequest {
-  return { index: undefined, indexTable: undefined, fragmentGraph: undefined };
-}
-
-export const CreateIndexRequest = {
-  fromJSON(object: any): CreateIndexRequest {
-    return {
-      index: isSet(object.index) ? Index.fromJSON(object.index) : undefined,
-      indexTable: isSet(object.indexTable) ? Table.fromJSON(object.indexTable) : undefined,
-      fragmentGraph: isSet(object.fragmentGraph) ? StreamFragmentGraph.fromJSON(object.fragmentGraph) : undefined,
-    };
-  },
-
-  toJSON(message: CreateIndexRequest): unknown {
-    const obj: any = {};
-    message.index !== undefined && (obj.index = message.index ? Index.toJSON(message.index) : undefined);
-    message.indexTable !== undefined &&
-      (obj.indexTable = message.indexTable ? Table.toJSON(message.indexTable) : undefined);
-    message.fragmentGraph !== undefined &&
-      (obj.fragmentGraph = message.fragmentGraph ? StreamFragmentGraph.toJSON(message.fragmentGraph) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateIndexRequest>, I>>(object: I): CreateIndexRequest {
-    const message = createBaseCreateIndexRequest();
-    message.index = (object.index !== undefined && object.index !== null) ? Index.fromPartial(object.index) : undefined;
-    message.indexTable = (object.indexTable !== undefined && object.indexTable !== null)
-      ? Table.fromPartial(object.indexTable)
-      : undefined;
-    message.fragmentGraph = (object.fragmentGraph !== undefined && object.fragmentGraph !== null)
-      ? StreamFragmentGraph.fromPartial(object.fragmentGraph)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateIndexResponse(): CreateIndexResponse {
-  return { status: undefined, indexId: 0, version: 0 };
-}
-
-export const CreateIndexResponse = {
-  fromJSON(object: any): CreateIndexResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      indexId: isSet(object.indexId) ? Number(object.indexId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateIndexResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.indexId !== undefined && (obj.indexId = Math.round(message.indexId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateIndexResponse>, I>>(object: I): CreateIndexResponse {
-    const message = createBaseCreateIndexResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.indexId = object.indexId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropIndexRequest(): DropIndexRequest {
-  return { indexId: 0 };
-}
-
-export const DropIndexRequest = {
-  fromJSON(object: any): DropIndexRequest {
-    return { indexId: isSet(object.indexId) ? Number(object.indexId) : 0 };
-  },
-
-  toJSON(message: DropIndexRequest): unknown {
-    const obj: any = {};
-    message.indexId !== undefined && (obj.indexId = Math.round(message.indexId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropIndexRequest>, I>>(object: I): DropIndexRequest {
-    const message = createBaseDropIndexRequest();
-    message.indexId = object.indexId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropIndexResponse(): DropIndexResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropIndexResponse = {
-  fromJSON(object: any): DropIndexResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropIndexResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropIndexResponse>, I>>(object: I): DropIndexResponse {
-    const message = createBaseDropIndexResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseReplaceTablePlanRequest(): ReplaceTablePlanRequest {
-  return { table: undefined, fragmentGraph: undefined, tableColIndexMapping: undefined };
-}
-
-export const ReplaceTablePlanRequest = {
-  fromJSON(object: any): ReplaceTablePlanRequest {
-    return {
-      table: isSet(object.table) ? Table.fromJSON(object.table) : undefined,
-      fragmentGraph: isSet(object.fragmentGraph) ? StreamFragmentGraph.fromJSON(object.fragmentGraph) : undefined,
-      tableColIndexMapping: isSet(object.tableColIndexMapping)
-        ? ColIndexMapping.fromJSON(object.tableColIndexMapping)
-        : undefined,
-    };
-  },
-
-  toJSON(message: ReplaceTablePlanRequest): unknown {
-    const obj: any = {};
-    message.table !== undefined && (obj.table = message.table ? Table.toJSON(message.table) : undefined);
-    message.fragmentGraph !== undefined &&
-      (obj.fragmentGraph = message.fragmentGraph ? StreamFragmentGraph.toJSON(message.fragmentGraph) : undefined);
-    message.tableColIndexMapping !== undefined && (obj.tableColIndexMapping = message.tableColIndexMapping
-      ? ColIndexMapping.toJSON(message.tableColIndexMapping)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReplaceTablePlanRequest>, I>>(object: I): ReplaceTablePlanRequest {
-    const message = createBaseReplaceTablePlanRequest();
-    message.table = (object.table !== undefined && object.table !== null) ? Table.fromPartial(object.table) : undefined;
-    message.fragmentGraph = (object.fragmentGraph !== undefined && object.fragmentGraph !== null)
-      ? StreamFragmentGraph.fromPartial(object.fragmentGraph)
-      : undefined;
-    message.tableColIndexMapping = (object.tableColIndexMapping !== undefined && object.tableColIndexMapping !== null)
-      ? ColIndexMapping.fromPartial(object.tableColIndexMapping)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseReplaceTablePlanResponse(): ReplaceTablePlanResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const ReplaceTablePlanResponse = {
-  fromJSON(object: any): ReplaceTablePlanResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: ReplaceTablePlanResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReplaceTablePlanResponse>, I>>(object: I): ReplaceTablePlanResponse {
-    const message = createBaseReplaceTablePlanResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseGetTableRequest(): GetTableRequest {
-  return { databaseName: "", tableName: "" };
-}
-
-export const GetTableRequest = {
-  fromJSON(object: any): GetTableRequest {
-    return {
-      databaseName: isSet(object.databaseName) ? String(object.databaseName) : "",
-      tableName: isSet(object.tableName) ? String(object.tableName) : "",
-    };
-  },
-
-  toJSON(message: GetTableRequest): unknown {
-    const obj: any = {};
-    message.databaseName !== undefined && (obj.databaseName = message.databaseName);
-    message.tableName !== undefined && (obj.tableName = message.tableName);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetTableRequest>, I>>(object: I): GetTableRequest {
-    const message = createBaseGetTableRequest();
-    message.databaseName = object.databaseName ?? "";
-    message.tableName = object.tableName ?? "";
-    return message;
-  },
-};
-
-function createBaseGetTableResponse(): GetTableResponse {
-  return { table: undefined };
-}
-
-export const GetTableResponse = {
-  fromJSON(object: any): GetTableResponse {
-    return { table: isSet(object.table) ? Table.fromJSON(object.table) : undefined };
-  },
-
-  toJSON(message: GetTableResponse): unknown {
-    const obj: any = {};
-    message.table !== undefined && (obj.table = message.table ? Table.toJSON(message.table) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetTableResponse>, I>>(object: I): GetTableResponse {
-    const message = createBaseGetTableResponse();
-    message.table = (object.table !== undefined && object.table !== null) ? Table.fromPartial(object.table) : undefined;
-    return message;
-  },
-};
-
-function createBaseGetDdlProgressRequest(): GetDdlProgressRequest {
-  return {};
-}
-
-export const GetDdlProgressRequest = {
-  fromJSON(_: any): GetDdlProgressRequest {
-    return {};
-  },
-
-  toJSON(_: GetDdlProgressRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetDdlProgressRequest>, I>>(_: I): GetDdlProgressRequest {
-    const message = createBaseGetDdlProgressRequest();
-    return message;
-  },
-};
-
-function createBaseDdlProgress(): DdlProgress {
-  return { id: 0, statement: "", progress: "" };
-}
-
-export const DdlProgress = {
-  fromJSON(object: any): DdlProgress {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      statement: isSet(object.statement) ? String(object.statement) : "",
-      progress: isSet(object.progress) ? String(object.progress) : "",
-    };
-  },
-
-  toJSON(message: DdlProgress): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.statement !== undefined && (obj.statement = message.statement);
-    message.progress !== undefined && (obj.progress = message.progress);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DdlProgress>, I>>(object: I): DdlProgress {
-    const message = createBaseDdlProgress();
-    message.id = object.id ?? 0;
-    message.statement = object.statement ?? "";
-    message.progress = object.progress ?? "";
-    return message;
-  },
-};
-
-function createBaseGetDdlProgressResponse(): GetDdlProgressResponse {
-  return { ddlProgress: [] };
-}
-
-export const GetDdlProgressResponse = {
-  fromJSON(object: any): GetDdlProgressResponse {
-    return {
-      ddlProgress: Array.isArray(object?.ddlProgress)
-        ? object.ddlProgress.map((e: any) => DdlProgress.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: GetDdlProgressResponse): unknown {
-    const obj: any = {};
-    if (message.ddlProgress) {
-      obj.ddlProgress = message.ddlProgress.map((e) => e ? DdlProgress.toJSON(e) : undefined);
-    } else {
-      obj.ddlProgress = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetDdlProgressResponse>, I>>(object: I): GetDdlProgressResponse {
-    const message = createBaseGetDdlProgressResponse();
-    message.ddlProgress = object.ddlProgress?.map((e) => DdlProgress.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseCreateConnectionRequest(): CreateConnectionRequest {
-  return { payload: undefined };
-}
-
-export const CreateConnectionRequest = {
-  fromJSON(object: any): CreateConnectionRequest {
-    return {
-      payload: isSet(object.privateLink)
-        ? { $case: "privateLink", privateLink: CreateConnectionRequest_PrivateLink.fromJSON(object.privateLink) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: CreateConnectionRequest): unknown {
-    const obj: any = {};
-    message.payload?.$case === "privateLink" && (obj.privateLink = message.payload?.privateLink
-      ? CreateConnectionRequest_PrivateLink.toJSON(message.payload?.privateLink)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateConnectionRequest>, I>>(object: I): CreateConnectionRequest {
-    const message = createBaseCreateConnectionRequest();
-    if (
-      object.payload?.$case === "privateLink" &&
-      object.payload?.privateLink !== undefined &&
-      object.payload?.privateLink !== null
-    ) {
-      message.payload = {
-        $case: "privateLink",
-        privateLink: CreateConnectionRequest_PrivateLink.fromPartial(object.payload.privateLink),
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseCreateConnectionRequest_PrivateLink(): CreateConnectionRequest_PrivateLink {
-  return { provider: "", serviceName: "", availabilityZones: [] };
-}
-
-export const CreateConnectionRequest_PrivateLink = {
-  fromJSON(object: any): CreateConnectionRequest_PrivateLink {
-    return {
-      provider: isSet(object.provider) ? String(object.provider) : "",
-      serviceName: isSet(object.serviceName) ? String(object.serviceName) : "",
-      availabilityZones: Array.isArray(object?.availabilityZones)
-        ? object.availabilityZones.map((e: any) => String(e))
-        : [],
-    };
-  },
-
-  toJSON(message: CreateConnectionRequest_PrivateLink): unknown {
-    const obj: any = {};
-    message.provider !== undefined && (obj.provider = message.provider);
-    message.serviceName !== undefined && (obj.serviceName = message.serviceName);
-    if (message.availabilityZones) {
-      obj.availabilityZones = message.availabilityZones.map((e) => e);
-    } else {
-      obj.availabilityZones = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateConnectionRequest_PrivateLink>, I>>(
-    object: I,
-  ): CreateConnectionRequest_PrivateLink {
-    const message = createBaseCreateConnectionRequest_PrivateLink();
-    message.provider = object.provider ?? "";
-    message.serviceName = object.serviceName ?? "";
-    message.availabilityZones = object.availabilityZones?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseCreateConnectionResponse(): CreateConnectionResponse {
-  return { connectionId: 0, version: 0 };
-}
-
-export const CreateConnectionResponse = {
-  fromJSON(object: any): CreateConnectionResponse {
-    return {
-      connectionId: isSet(object.connectionId) ? Number(object.connectionId) : 0,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateConnectionResponse): unknown {
-    const obj: any = {};
-    message.connectionId !== undefined && (obj.connectionId = Math.round(message.connectionId));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateConnectionResponse>, I>>(object: I): CreateConnectionResponse {
-    const message = createBaseCreateConnectionResponse();
-    message.connectionId = object.connectionId ?? 0;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseListConnectionsRequest(): ListConnectionsRequest {
-  return {};
-}
-
-export const ListConnectionsRequest = {
-  fromJSON(_: any): ListConnectionsRequest {
-    return {};
-  },
-
-  toJSON(_: ListConnectionsRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListConnectionsRequest>, I>>(_: I): ListConnectionsRequest {
-    const message = createBaseListConnectionsRequest();
-    return message;
-  },
-};
-
-function createBaseListConnectionsResponse(): ListConnectionsResponse {
-  return { connections: [] };
-}
-
-export const ListConnectionsResponse = {
-  fromJSON(object: any): ListConnectionsResponse {
-    return {
-      connections: Array.isArray(object?.connections) ? object.connections.map((e: any) => Connection.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: ListConnectionsResponse): unknown {
-    const obj: any = {};
-    if (message.connections) {
-      obj.connections = message.connections.map((e) => e ? Connection.toJSON(e) : undefined);
-    } else {
-      obj.connections = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListConnectionsResponse>, I>>(object: I): ListConnectionsResponse {
-    const message = createBaseListConnectionsResponse();
-    message.connections = object.connections?.map((e) => Connection.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseDropConnectionRequest(): DropConnectionRequest {
-  return { connectionName: "" };
-}
-
-export const DropConnectionRequest = {
-  fromJSON(object: any): DropConnectionRequest {
-    return { connectionName: isSet(object.connectionName) ? String(object.connectionName) : "" };
-  },
-
-  toJSON(message: DropConnectionRequest): unknown {
-    const obj: any = {};
-    message.connectionName !== undefined && (obj.connectionName = message.connectionName);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropConnectionRequest>, I>>(object: I): DropConnectionRequest {
-    const message = createBaseDropConnectionRequest();
-    message.connectionName = object.connectionName ?? "";
-    return message;
-  },
-};
-
-function createBaseDropConnectionResponse(): DropConnectionResponse {
-  return {};
-}
-
-export const DropConnectionResponse = {
-  fromJSON(_: any): DropConnectionResponse {
-    return {};
-  },
-
-  toJSON(_: DropConnectionResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropConnectionResponse>, I>>(_: I): DropConnectionResponse {
-    const message = createBaseDropConnectionResponse();
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/expr.ts b/dashboard/proto/gen/expr.ts
deleted file mode 100644
index 4faa1e414aa7a..0000000000000
--- a/dashboard/proto/gen/expr.ts
+++ /dev/null
@@ -1,1267 +0,0 @@
-/* eslint-disable */
-import { ColumnOrder } from "./common";
-import { DataType, Datum } from "./data";
-
-export const protobufPackage = "expr";
-
-export interface ExprNode {
-  exprType: ExprNode_Type;
-  returnType: DataType | undefined;
-  rexNode?: { $case: "inputRef"; inputRef: number } | { $case: "constant"; constant: Datum } | {
-    $case: "funcCall";
-    funcCall: FunctionCall;
-  } | { $case: "udf"; udf: UserDefinedFunction };
-}
-
-/**
- * a "pure function" will be defined as having `1 < expr_node as i32 <= 600`.
- * Please modify this definition if adding a pure function that does not belong
- * to this range.
- */
-export const ExprNode_Type = {
-  UNSPECIFIED: "UNSPECIFIED",
-  INPUT_REF: "INPUT_REF",
-  CONSTANT_VALUE: "CONSTANT_VALUE",
-  /** ADD - arithmetics operators */
-  ADD: "ADD",
-  SUBTRACT: "SUBTRACT",
-  MULTIPLY: "MULTIPLY",
-  DIVIDE: "DIVIDE",
-  MODULUS: "MODULUS",
-  /** EQUAL - comparison operators */
-  EQUAL: "EQUAL",
-  NOT_EQUAL: "NOT_EQUAL",
-  LESS_THAN: "LESS_THAN",
-  LESS_THAN_OR_EQUAL: "LESS_THAN_OR_EQUAL",
-  GREATER_THAN: "GREATER_THAN",
-  GREATER_THAN_OR_EQUAL: "GREATER_THAN_OR_EQUAL",
-  /** AND - logical operators */
-  AND: "AND",
-  OR: "OR",
-  NOT: "NOT",
-  IN: "IN",
-  SOME: "SOME",
-  ALL: "ALL",
-  /** BITWISE_AND - bitwise operators */
-  BITWISE_AND: "BITWISE_AND",
-  BITWISE_OR: "BITWISE_OR",
-  BITWISE_XOR: "BITWISE_XOR",
-  BITWISE_NOT: "BITWISE_NOT",
-  BITWISE_SHIFT_LEFT: "BITWISE_SHIFT_LEFT",
-  BITWISE_SHIFT_RIGHT: "BITWISE_SHIFT_RIGHT",
-  /** EXTRACT - date functions */
-  EXTRACT: "EXTRACT",
-  TUMBLE_START: "TUMBLE_START",
-  /**
-   * TO_TIMESTAMP - From f64 to timestamp.
-   * e.g. `select to_timestamp(1672044740.0)`
-   */
-  TO_TIMESTAMP: "TO_TIMESTAMP",
-  AT_TIME_ZONE: "AT_TIME_ZONE",
-  DATE_TRUNC: "DATE_TRUNC",
-  /**
-   * TO_TIMESTAMP1 - Parse text to timestamp by format string.
-   * e.g. `select to_timestamp('2022 08 21', 'YYYY MM DD')`
-   */
-  TO_TIMESTAMP1: "TO_TIMESTAMP1",
-  /** CAST_WITH_TIME_ZONE - Performs a cast with additional timezone information. */
-  CAST_WITH_TIME_ZONE: "CAST_WITH_TIME_ZONE",
-  /** CAST - other functions */
-  CAST: "CAST",
-  SUBSTR: "SUBSTR",
-  LENGTH: "LENGTH",
-  LIKE: "LIKE",
-  UPPER: "UPPER",
-  LOWER: "LOWER",
-  TRIM: "TRIM",
-  REPLACE: "REPLACE",
-  POSITION: "POSITION",
-  LTRIM: "LTRIM",
-  RTRIM: "RTRIM",
-  CASE: "CASE",
-  /** ROUND_DIGIT - ROUND(numeric, integer) -> numeric */
-  ROUND_DIGIT: "ROUND_DIGIT",
-  /**
-   * ROUND - ROUND(numeric) -> numeric
-   * ROUND(double precision) -> double precision
-   */
-  ROUND: "ROUND",
-  ASCII: "ASCII",
-  TRANSLATE: "TRANSLATE",
-  COALESCE: "COALESCE",
-  CONCAT_WS: "CONCAT_WS",
-  ABS: "ABS",
-  SPLIT_PART: "SPLIT_PART",
-  CEIL: "CEIL",
-  FLOOR: "FLOOR",
-  TO_CHAR: "TO_CHAR",
-  MD5: "MD5",
-  CHAR_LENGTH: "CHAR_LENGTH",
-  REPEAT: "REPEAT",
-  CONCAT_OP: "CONCAT_OP",
-  /** BOOL_OUT - BOOL_OUT is different from CAST-bool-to-varchar in PostgreSQL. */
-  BOOL_OUT: "BOOL_OUT",
-  OCTET_LENGTH: "OCTET_LENGTH",
-  BIT_LENGTH: "BIT_LENGTH",
-  OVERLAY: "OVERLAY",
-  REGEXP_MATCH: "REGEXP_MATCH",
-  POW: "POW",
-  EXP: "EXP",
-  /** IS_TRUE - Boolean comparison */
-  IS_TRUE: "IS_TRUE",
-  IS_NOT_TRUE: "IS_NOT_TRUE",
-  IS_FALSE: "IS_FALSE",
-  IS_NOT_FALSE: "IS_NOT_FALSE",
-  IS_NULL: "IS_NULL",
-  IS_NOT_NULL: "IS_NOT_NULL",
-  IS_DISTINCT_FROM: "IS_DISTINCT_FROM",
-  IS_NOT_DISTINCT_FROM: "IS_NOT_DISTINCT_FROM",
-  /** NEG - Unary operators */
-  NEG: "NEG",
-  /** FIELD - Nested selection operators */
-  FIELD: "FIELD",
-  /** ARRAY - Array expression. */
-  ARRAY: "ARRAY",
-  ARRAY_ACCESS: "ARRAY_ACCESS",
-  ROW: "ROW",
-  ARRAY_TO_STRING: "ARRAY_TO_STRING",
-  /** ARRAY_CAT - Array functions */
-  ARRAY_CAT: "ARRAY_CAT",
-  ARRAY_APPEND: "ARRAY_APPEND",
-  ARRAY_PREPEND: "ARRAY_PREPEND",
-  FORMAT_TYPE: "FORMAT_TYPE",
-  ARRAY_DISTINCT: "ARRAY_DISTINCT",
-  /** JSONB_ACCESS_INNER - jsonb -> int, jsonb -> text, jsonb #> text[] that returns jsonb */
-  JSONB_ACCESS_INNER: "JSONB_ACCESS_INNER",
-  /** JSONB_ACCESS_STR - jsonb ->> int, jsonb ->> text, jsonb #>> text[] that returns text */
-  JSONB_ACCESS_STR: "JSONB_ACCESS_STR",
-  JSONB_TYPEOF: "JSONB_TYPEOF",
-  JSONB_ARRAY_LENGTH: "JSONB_ARRAY_LENGTH",
-  /** PI - Functions that return a constant value */
-  PI: "PI",
-  /**
-   * VNODE - Non-pure functions below (> 1000)
-   * ------------------------
-   * Internal functions
-   */
-  VNODE: "VNODE",
-  /** NOW - Non-deterministic functions */
-  NOW: "NOW",
-  /** UDF - User defined functions */
-  UDF: "UDF",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type ExprNode_Type = typeof ExprNode_Type[keyof typeof ExprNode_Type];
-
-export function exprNode_TypeFromJSON(object: any): ExprNode_Type {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return ExprNode_Type.UNSPECIFIED;
-    case 1:
-    case "INPUT_REF":
-      return ExprNode_Type.INPUT_REF;
-    case 2:
-    case "CONSTANT_VALUE":
-      return ExprNode_Type.CONSTANT_VALUE;
-    case 3:
-    case "ADD":
-      return ExprNode_Type.ADD;
-    case 4:
-    case "SUBTRACT":
-      return ExprNode_Type.SUBTRACT;
-    case 5:
-    case "MULTIPLY":
-      return ExprNode_Type.MULTIPLY;
-    case 6:
-    case "DIVIDE":
-      return ExprNode_Type.DIVIDE;
-    case 7:
-    case "MODULUS":
-      return ExprNode_Type.MODULUS;
-    case 8:
-    case "EQUAL":
-      return ExprNode_Type.EQUAL;
-    case 9:
-    case "NOT_EQUAL":
-      return ExprNode_Type.NOT_EQUAL;
-    case 10:
-    case "LESS_THAN":
-      return ExprNode_Type.LESS_THAN;
-    case 11:
-    case "LESS_THAN_OR_EQUAL":
-      return ExprNode_Type.LESS_THAN_OR_EQUAL;
-    case 12:
-    case "GREATER_THAN":
-      return ExprNode_Type.GREATER_THAN;
-    case 13:
-    case "GREATER_THAN_OR_EQUAL":
-      return ExprNode_Type.GREATER_THAN_OR_EQUAL;
-    case 21:
-    case "AND":
-      return ExprNode_Type.AND;
-    case 22:
-    case "OR":
-      return ExprNode_Type.OR;
-    case 23:
-    case "NOT":
-      return ExprNode_Type.NOT;
-    case 24:
-    case "IN":
-      return ExprNode_Type.IN;
-    case 25:
-    case "SOME":
-      return ExprNode_Type.SOME;
-    case 26:
-    case "ALL":
-      return ExprNode_Type.ALL;
-    case 31:
-    case "BITWISE_AND":
-      return ExprNode_Type.BITWISE_AND;
-    case 32:
-    case "BITWISE_OR":
-      return ExprNode_Type.BITWISE_OR;
-    case 33:
-    case "BITWISE_XOR":
-      return ExprNode_Type.BITWISE_XOR;
-    case 34:
-    case "BITWISE_NOT":
-      return ExprNode_Type.BITWISE_NOT;
-    case 35:
-    case "BITWISE_SHIFT_LEFT":
-      return ExprNode_Type.BITWISE_SHIFT_LEFT;
-    case 36:
-    case "BITWISE_SHIFT_RIGHT":
-      return ExprNode_Type.BITWISE_SHIFT_RIGHT;
-    case 101:
-    case "EXTRACT":
-      return ExprNode_Type.EXTRACT;
-    case 103:
-    case "TUMBLE_START":
-      return ExprNode_Type.TUMBLE_START;
-    case 104:
-    case "TO_TIMESTAMP":
-      return ExprNode_Type.TO_TIMESTAMP;
-    case 105:
-    case "AT_TIME_ZONE":
-      return ExprNode_Type.AT_TIME_ZONE;
-    case 106:
-    case "DATE_TRUNC":
-      return ExprNode_Type.DATE_TRUNC;
-    case 107:
-    case "TO_TIMESTAMP1":
-      return ExprNode_Type.TO_TIMESTAMP1;
-    case 108:
-    case "CAST_WITH_TIME_ZONE":
-      return ExprNode_Type.CAST_WITH_TIME_ZONE;
-    case 201:
-    case "CAST":
-      return ExprNode_Type.CAST;
-    case 202:
-    case "SUBSTR":
-      return ExprNode_Type.SUBSTR;
-    case 203:
-    case "LENGTH":
-      return ExprNode_Type.LENGTH;
-    case 204:
-    case "LIKE":
-      return ExprNode_Type.LIKE;
-    case 205:
-    case "UPPER":
-      return ExprNode_Type.UPPER;
-    case 206:
-    case "LOWER":
-      return ExprNode_Type.LOWER;
-    case 207:
-    case "TRIM":
-      return ExprNode_Type.TRIM;
-    case 208:
-    case "REPLACE":
-      return ExprNode_Type.REPLACE;
-    case 209:
-    case "POSITION":
-      return ExprNode_Type.POSITION;
-    case 210:
-    case "LTRIM":
-      return ExprNode_Type.LTRIM;
-    case 211:
-    case "RTRIM":
-      return ExprNode_Type.RTRIM;
-    case 212:
-    case "CASE":
-      return ExprNode_Type.CASE;
-    case 213:
-    case "ROUND_DIGIT":
-      return ExprNode_Type.ROUND_DIGIT;
-    case 214:
-    case "ROUND":
-      return ExprNode_Type.ROUND;
-    case 215:
-    case "ASCII":
-      return ExprNode_Type.ASCII;
-    case 216:
-    case "TRANSLATE":
-      return ExprNode_Type.TRANSLATE;
-    case 217:
-    case "COALESCE":
-      return ExprNode_Type.COALESCE;
-    case 218:
-    case "CONCAT_WS":
-      return ExprNode_Type.CONCAT_WS;
-    case 219:
-    case "ABS":
-      return ExprNode_Type.ABS;
-    case 220:
-    case "SPLIT_PART":
-      return ExprNode_Type.SPLIT_PART;
-    case 221:
-    case "CEIL":
-      return ExprNode_Type.CEIL;
-    case 222:
-    case "FLOOR":
-      return ExprNode_Type.FLOOR;
-    case 223:
-    case "TO_CHAR":
-      return ExprNode_Type.TO_CHAR;
-    case 224:
-    case "MD5":
-      return ExprNode_Type.MD5;
-    case 225:
-    case "CHAR_LENGTH":
-      return ExprNode_Type.CHAR_LENGTH;
-    case 226:
-    case "REPEAT":
-      return ExprNode_Type.REPEAT;
-    case 227:
-    case "CONCAT_OP":
-      return ExprNode_Type.CONCAT_OP;
-    case 228:
-    case "BOOL_OUT":
-      return ExprNode_Type.BOOL_OUT;
-    case 229:
-    case "OCTET_LENGTH":
-      return ExprNode_Type.OCTET_LENGTH;
-    case 230:
-    case "BIT_LENGTH":
-      return ExprNode_Type.BIT_LENGTH;
-    case 231:
-    case "OVERLAY":
-      return ExprNode_Type.OVERLAY;
-    case 232:
-    case "REGEXP_MATCH":
-      return ExprNode_Type.REGEXP_MATCH;
-    case 233:
-    case "POW":
-      return ExprNode_Type.POW;
-    case 234:
-    case "EXP":
-      return ExprNode_Type.EXP;
-    case 301:
-    case "IS_TRUE":
-      return ExprNode_Type.IS_TRUE;
-    case 302:
-    case "IS_NOT_TRUE":
-      return ExprNode_Type.IS_NOT_TRUE;
-    case 303:
-    case "IS_FALSE":
-      return ExprNode_Type.IS_FALSE;
-    case 304:
-    case "IS_NOT_FALSE":
-      return ExprNode_Type.IS_NOT_FALSE;
-    case 305:
-    case "IS_NULL":
-      return ExprNode_Type.IS_NULL;
-    case 306:
-    case "IS_NOT_NULL":
-      return ExprNode_Type.IS_NOT_NULL;
-    case 307:
-    case "IS_DISTINCT_FROM":
-      return ExprNode_Type.IS_DISTINCT_FROM;
-    case 308:
-    case "IS_NOT_DISTINCT_FROM":
-      return ExprNode_Type.IS_NOT_DISTINCT_FROM;
-    case 401:
-    case "NEG":
-      return ExprNode_Type.NEG;
-    case 501:
-    case "FIELD":
-      return ExprNode_Type.FIELD;
-    case 521:
-    case "ARRAY":
-      return ExprNode_Type.ARRAY;
-    case 522:
-    case "ARRAY_ACCESS":
-      return ExprNode_Type.ARRAY_ACCESS;
-    case 523:
-    case "ROW":
-      return ExprNode_Type.ROW;
-    case 524:
-    case "ARRAY_TO_STRING":
-      return ExprNode_Type.ARRAY_TO_STRING;
-    case 531:
-    case "ARRAY_CAT":
-      return ExprNode_Type.ARRAY_CAT;
-    case 532:
-    case "ARRAY_APPEND":
-      return ExprNode_Type.ARRAY_APPEND;
-    case 533:
-    case "ARRAY_PREPEND":
-      return ExprNode_Type.ARRAY_PREPEND;
-    case 534:
-    case "FORMAT_TYPE":
-      return ExprNode_Type.FORMAT_TYPE;
-    case 535:
-    case "ARRAY_DISTINCT":
-      return ExprNode_Type.ARRAY_DISTINCT;
-    case 600:
-    case "JSONB_ACCESS_INNER":
-      return ExprNode_Type.JSONB_ACCESS_INNER;
-    case 601:
-    case "JSONB_ACCESS_STR":
-      return ExprNode_Type.JSONB_ACCESS_STR;
-    case 602:
-    case "JSONB_TYPEOF":
-      return ExprNode_Type.JSONB_TYPEOF;
-    case 603:
-    case "JSONB_ARRAY_LENGTH":
-      return ExprNode_Type.JSONB_ARRAY_LENGTH;
-    case 610:
-    case "PI":
-      return ExprNode_Type.PI;
-    case 1101:
-    case "VNODE":
-      return ExprNode_Type.VNODE;
-    case 2022:
-    case "NOW":
-      return ExprNode_Type.NOW;
-    case 3000:
-    case "UDF":
-      return ExprNode_Type.UDF;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return ExprNode_Type.UNRECOGNIZED;
-  }
-}
-
-export function exprNode_TypeToJSON(object: ExprNode_Type): string {
-  switch (object) {
-    case ExprNode_Type.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case ExprNode_Type.INPUT_REF:
-      return "INPUT_REF";
-    case ExprNode_Type.CONSTANT_VALUE:
-      return "CONSTANT_VALUE";
-    case ExprNode_Type.ADD:
-      return "ADD";
-    case ExprNode_Type.SUBTRACT:
-      return "SUBTRACT";
-    case ExprNode_Type.MULTIPLY:
-      return "MULTIPLY";
-    case ExprNode_Type.DIVIDE:
-      return "DIVIDE";
-    case ExprNode_Type.MODULUS:
-      return "MODULUS";
-    case ExprNode_Type.EQUAL:
-      return "EQUAL";
-    case ExprNode_Type.NOT_EQUAL:
-      return "NOT_EQUAL";
-    case ExprNode_Type.LESS_THAN:
-      return "LESS_THAN";
-    case ExprNode_Type.LESS_THAN_OR_EQUAL:
-      return "LESS_THAN_OR_EQUAL";
-    case ExprNode_Type.GREATER_THAN:
-      return "GREATER_THAN";
-    case ExprNode_Type.GREATER_THAN_OR_EQUAL:
-      return "GREATER_THAN_OR_EQUAL";
-    case ExprNode_Type.AND:
-      return "AND";
-    case ExprNode_Type.OR:
-      return "OR";
-    case ExprNode_Type.NOT:
-      return "NOT";
-    case ExprNode_Type.IN:
-      return "IN";
-    case ExprNode_Type.SOME:
-      return "SOME";
-    case ExprNode_Type.ALL:
-      return "ALL";
-    case ExprNode_Type.BITWISE_AND:
-      return "BITWISE_AND";
-    case ExprNode_Type.BITWISE_OR:
-      return "BITWISE_OR";
-    case ExprNode_Type.BITWISE_XOR:
-      return "BITWISE_XOR";
-    case ExprNode_Type.BITWISE_NOT:
-      return "BITWISE_NOT";
-    case ExprNode_Type.BITWISE_SHIFT_LEFT:
-      return "BITWISE_SHIFT_LEFT";
-    case ExprNode_Type.BITWISE_SHIFT_RIGHT:
-      return "BITWISE_SHIFT_RIGHT";
-    case ExprNode_Type.EXTRACT:
-      return "EXTRACT";
-    case ExprNode_Type.TUMBLE_START:
-      return "TUMBLE_START";
-    case ExprNode_Type.TO_TIMESTAMP:
-      return "TO_TIMESTAMP";
-    case ExprNode_Type.AT_TIME_ZONE:
-      return "AT_TIME_ZONE";
-    case ExprNode_Type.DATE_TRUNC:
-      return "DATE_TRUNC";
-    case ExprNode_Type.TO_TIMESTAMP1:
-      return "TO_TIMESTAMP1";
-    case ExprNode_Type.CAST_WITH_TIME_ZONE:
-      return "CAST_WITH_TIME_ZONE";
-    case ExprNode_Type.CAST:
-      return "CAST";
-    case ExprNode_Type.SUBSTR:
-      return "SUBSTR";
-    case ExprNode_Type.LENGTH:
-      return "LENGTH";
-    case ExprNode_Type.LIKE:
-      return "LIKE";
-    case ExprNode_Type.UPPER:
-      return "UPPER";
-    case ExprNode_Type.LOWER:
-      return "LOWER";
-    case ExprNode_Type.TRIM:
-      return "TRIM";
-    case ExprNode_Type.REPLACE:
-      return "REPLACE";
-    case ExprNode_Type.POSITION:
-      return "POSITION";
-    case ExprNode_Type.LTRIM:
-      return "LTRIM";
-    case ExprNode_Type.RTRIM:
-      return "RTRIM";
-    case ExprNode_Type.CASE:
-      return "CASE";
-    case ExprNode_Type.ROUND_DIGIT:
-      return "ROUND_DIGIT";
-    case ExprNode_Type.ROUND:
-      return "ROUND";
-    case ExprNode_Type.ASCII:
-      return "ASCII";
-    case ExprNode_Type.TRANSLATE:
-      return "TRANSLATE";
-    case ExprNode_Type.COALESCE:
-      return "COALESCE";
-    case ExprNode_Type.CONCAT_WS:
-      return "CONCAT_WS";
-    case ExprNode_Type.ABS:
-      return "ABS";
-    case ExprNode_Type.SPLIT_PART:
-      return "SPLIT_PART";
-    case ExprNode_Type.CEIL:
-      return "CEIL";
-    case ExprNode_Type.FLOOR:
-      return "FLOOR";
-    case ExprNode_Type.TO_CHAR:
-      return "TO_CHAR";
-    case ExprNode_Type.MD5:
-      return "MD5";
-    case ExprNode_Type.CHAR_LENGTH:
-      return "CHAR_LENGTH";
-    case ExprNode_Type.REPEAT:
-      return "REPEAT";
-    case ExprNode_Type.CONCAT_OP:
-      return "CONCAT_OP";
-    case ExprNode_Type.BOOL_OUT:
-      return "BOOL_OUT";
-    case ExprNode_Type.OCTET_LENGTH:
-      return "OCTET_LENGTH";
-    case ExprNode_Type.BIT_LENGTH:
-      return "BIT_LENGTH";
-    case ExprNode_Type.OVERLAY:
-      return "OVERLAY";
-    case ExprNode_Type.REGEXP_MATCH:
-      return "REGEXP_MATCH";
-    case ExprNode_Type.POW:
-      return "POW";
-    case ExprNode_Type.EXP:
-      return "EXP";
-    case ExprNode_Type.IS_TRUE:
-      return "IS_TRUE";
-    case ExprNode_Type.IS_NOT_TRUE:
-      return "IS_NOT_TRUE";
-    case ExprNode_Type.IS_FALSE:
-      return "IS_FALSE";
-    case ExprNode_Type.IS_NOT_FALSE:
-      return "IS_NOT_FALSE";
-    case ExprNode_Type.IS_NULL:
-      return "IS_NULL";
-    case ExprNode_Type.IS_NOT_NULL:
-      return "IS_NOT_NULL";
-    case ExprNode_Type.IS_DISTINCT_FROM:
-      return "IS_DISTINCT_FROM";
-    case ExprNode_Type.IS_NOT_DISTINCT_FROM:
-      return "IS_NOT_DISTINCT_FROM";
-    case ExprNode_Type.NEG:
-      return "NEG";
-    case ExprNode_Type.FIELD:
-      return "FIELD";
-    case ExprNode_Type.ARRAY:
-      return "ARRAY";
-    case ExprNode_Type.ARRAY_ACCESS:
-      return "ARRAY_ACCESS";
-    case ExprNode_Type.ROW:
-      return "ROW";
-    case ExprNode_Type.ARRAY_TO_STRING:
-      return "ARRAY_TO_STRING";
-    case ExprNode_Type.ARRAY_CAT:
-      return "ARRAY_CAT";
-    case ExprNode_Type.ARRAY_APPEND:
-      return "ARRAY_APPEND";
-    case ExprNode_Type.ARRAY_PREPEND:
-      return "ARRAY_PREPEND";
-    case ExprNode_Type.FORMAT_TYPE:
-      return "FORMAT_TYPE";
-    case ExprNode_Type.ARRAY_DISTINCT:
-      return "ARRAY_DISTINCT";
-    case ExprNode_Type.JSONB_ACCESS_INNER:
-      return "JSONB_ACCESS_INNER";
-    case ExprNode_Type.JSONB_ACCESS_STR:
-      return "JSONB_ACCESS_STR";
-    case ExprNode_Type.JSONB_TYPEOF:
-      return "JSONB_TYPEOF";
-    case ExprNode_Type.JSONB_ARRAY_LENGTH:
-      return "JSONB_ARRAY_LENGTH";
-    case ExprNode_Type.PI:
-      return "PI";
-    case ExprNode_Type.VNODE:
-      return "VNODE";
-    case ExprNode_Type.NOW:
-      return "NOW";
-    case ExprNode_Type.UDF:
-      return "UDF";
-    case ExprNode_Type.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface TableFunction {
-  functionType: TableFunction_Type;
-  args: ExprNode[];
-  returnType:
-    | DataType
-    | undefined;
-  /** optional. only used when the type is UDTF. */
-  udtf: UserDefinedTableFunction | undefined;
-}
-
-export const TableFunction_Type = {
-  UNSPECIFIED: "UNSPECIFIED",
-  GENERATE: "GENERATE",
-  UNNEST: "UNNEST",
-  REGEXP_MATCHES: "REGEXP_MATCHES",
-  RANGE: "RANGE",
-  /** UDTF - User defined table function */
-  UDTF: "UDTF",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type TableFunction_Type = typeof TableFunction_Type[keyof typeof TableFunction_Type];
-
-export function tableFunction_TypeFromJSON(object: any): TableFunction_Type {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return TableFunction_Type.UNSPECIFIED;
-    case 1:
-    case "GENERATE":
-      return TableFunction_Type.GENERATE;
-    case 2:
-    case "UNNEST":
-      return TableFunction_Type.UNNEST;
-    case 3:
-    case "REGEXP_MATCHES":
-      return TableFunction_Type.REGEXP_MATCHES;
-    case 4:
-    case "RANGE":
-      return TableFunction_Type.RANGE;
-    case 100:
-    case "UDTF":
-      return TableFunction_Type.UDTF;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return TableFunction_Type.UNRECOGNIZED;
-  }
-}
-
-export function tableFunction_TypeToJSON(object: TableFunction_Type): string {
-  switch (object) {
-    case TableFunction_Type.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case TableFunction_Type.GENERATE:
-      return "GENERATE";
-    case TableFunction_Type.UNNEST:
-      return "UNNEST";
-    case TableFunction_Type.REGEXP_MATCHES:
-      return "REGEXP_MATCHES";
-    case TableFunction_Type.RANGE:
-      return "RANGE";
-    case TableFunction_Type.UDTF:
-      return "UDTF";
-    case TableFunction_Type.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-/** Reference to an upstream column, containing its index and data type. */
-export interface InputRef {
-  index: number;
-  type: DataType | undefined;
-}
-
-/**
- * The items which can occur in the select list of `ProjectSet` operator.
- *
- * When there are table functions in the SQL query `SELECT ...`, it will be planned as `ProjectSet`.
- * Otherwise it will be planned as `Project`.
- *
- * # Examples
- *
- * ```sql
- * # Project
- * select 1;
- *
- * # ProjectSet
- * select unnest(array[1,2,3]);
- *
- * # ProjectSet (table function & usual expression)
- * select unnest(array[1,2,3]), 1;
- *
- * # ProjectSet (multiple table functions)
- * select unnest(array[1,2,3]), unnest(array[4,5]);
- *
- * # ProjectSet over ProjectSet (table function as parameters of table function)
- * select unnest(regexp_matches(v1, 'a(\d)c(\d)', 'g')) from t;
- *
- * # Project over ProjectSet (table function as parameters of usual function)
- * select unnest(regexp_matches(v1, 'a(\d)c(\d)', 'g')) from t;
- * ```
- */
-export interface ProjectSetSelectItem {
-  selectItem?: { $case: "expr"; expr: ExprNode } | { $case: "tableFunction"; tableFunction: TableFunction };
-}
-
-export interface FunctionCall {
-  children: ExprNode[];
-}
-
-/** Aggregate Function Calls for Aggregation */
-export interface AggCall {
-  type: AggCall_Type;
-  args: InputRef[];
-  returnType: DataType | undefined;
-  distinct: boolean;
-  orderBy: ColumnOrder[];
-  filter: ExprNode | undefined;
-}
-
-export const AggCall_Type = {
-  UNSPECIFIED: "UNSPECIFIED",
-  SUM: "SUM",
-  MIN: "MIN",
-  MAX: "MAX",
-  COUNT: "COUNT",
-  AVG: "AVG",
-  STRING_AGG: "STRING_AGG",
-  APPROX_COUNT_DISTINCT: "APPROX_COUNT_DISTINCT",
-  ARRAY_AGG: "ARRAY_AGG",
-  FIRST_VALUE: "FIRST_VALUE",
-  SUM0: "SUM0",
-  VAR_POP: "VAR_POP",
-  VAR_SAMP: "VAR_SAMP",
-  STDDEV_POP: "STDDEV_POP",
-  STDDEV_SAMP: "STDDEV_SAMP",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type AggCall_Type = typeof AggCall_Type[keyof typeof AggCall_Type];
-
-export function aggCall_TypeFromJSON(object: any): AggCall_Type {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return AggCall_Type.UNSPECIFIED;
-    case 1:
-    case "SUM":
-      return AggCall_Type.SUM;
-    case 2:
-    case "MIN":
-      return AggCall_Type.MIN;
-    case 3:
-    case "MAX":
-      return AggCall_Type.MAX;
-    case 4:
-    case "COUNT":
-      return AggCall_Type.COUNT;
-    case 5:
-    case "AVG":
-      return AggCall_Type.AVG;
-    case 6:
-    case "STRING_AGG":
-      return AggCall_Type.STRING_AGG;
-    case 7:
-    case "APPROX_COUNT_DISTINCT":
-      return AggCall_Type.APPROX_COUNT_DISTINCT;
-    case 8:
-    case "ARRAY_AGG":
-      return AggCall_Type.ARRAY_AGG;
-    case 9:
-    case "FIRST_VALUE":
-      return AggCall_Type.FIRST_VALUE;
-    case 10:
-    case "SUM0":
-      return AggCall_Type.SUM0;
-    case 11:
-    case "VAR_POP":
-      return AggCall_Type.VAR_POP;
-    case 12:
-    case "VAR_SAMP":
-      return AggCall_Type.VAR_SAMP;
-    case 13:
-    case "STDDEV_POP":
-      return AggCall_Type.STDDEV_POP;
-    case 14:
-    case "STDDEV_SAMP":
-      return AggCall_Type.STDDEV_SAMP;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return AggCall_Type.UNRECOGNIZED;
-  }
-}
-
-export function aggCall_TypeToJSON(object: AggCall_Type): string {
-  switch (object) {
-    case AggCall_Type.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case AggCall_Type.SUM:
-      return "SUM";
-    case AggCall_Type.MIN:
-      return "MIN";
-    case AggCall_Type.MAX:
-      return "MAX";
-    case AggCall_Type.COUNT:
-      return "COUNT";
-    case AggCall_Type.AVG:
-      return "AVG";
-    case AggCall_Type.STRING_AGG:
-      return "STRING_AGG";
-    case AggCall_Type.APPROX_COUNT_DISTINCT:
-      return "APPROX_COUNT_DISTINCT";
-    case AggCall_Type.ARRAY_AGG:
-      return "ARRAY_AGG";
-    case AggCall_Type.FIRST_VALUE:
-      return "FIRST_VALUE";
-    case AggCall_Type.SUM0:
-      return "SUM0";
-    case AggCall_Type.VAR_POP:
-      return "VAR_POP";
-    case AggCall_Type.VAR_SAMP:
-      return "VAR_SAMP";
-    case AggCall_Type.STDDEV_POP:
-      return "STDDEV_POP";
-    case AggCall_Type.STDDEV_SAMP:
-      return "STDDEV_SAMP";
-    case AggCall_Type.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface UserDefinedFunction {
-  children: ExprNode[];
-  name: string;
-  argTypes: DataType[];
-  language: string;
-  link: string;
-  identifier: string;
-}
-
-export interface UserDefinedTableFunction {
-  argTypes: DataType[];
-  language: string;
-  link: string;
-  identifier: string;
-}
-
-function createBaseExprNode(): ExprNode {
-  return { exprType: ExprNode_Type.UNSPECIFIED, returnType: undefined, rexNode: undefined };
-}
-
-export const ExprNode = {
-  fromJSON(object: any): ExprNode {
-    return {
-      exprType: isSet(object.exprType) ? exprNode_TypeFromJSON(object.exprType) : ExprNode_Type.UNSPECIFIED,
-      returnType: isSet(object.returnType) ? DataType.fromJSON(object.returnType) : undefined,
-      rexNode: isSet(object.inputRef)
-        ? { $case: "inputRef", inputRef: Number(object.inputRef) }
-        : isSet(object.constant)
-        ? { $case: "constant", constant: Datum.fromJSON(object.constant) }
-        : isSet(object.funcCall)
-        ? { $case: "funcCall", funcCall: FunctionCall.fromJSON(object.funcCall) }
-        : isSet(object.udf)
-        ? { $case: "udf", udf: UserDefinedFunction.fromJSON(object.udf) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: ExprNode): unknown {
-    const obj: any = {};
-    message.exprType !== undefined && (obj.exprType = exprNode_TypeToJSON(message.exprType));
-    message.returnType !== undefined &&
-      (obj.returnType = message.returnType ? DataType.toJSON(message.returnType) : undefined);
-    message.rexNode?.$case === "inputRef" && (obj.inputRef = Math.round(message.rexNode?.inputRef));
-    message.rexNode?.$case === "constant" &&
-      (obj.constant = message.rexNode?.constant ? Datum.toJSON(message.rexNode?.constant) : undefined);
-    message.rexNode?.$case === "funcCall" &&
-      (obj.funcCall = message.rexNode?.funcCall ? FunctionCall.toJSON(message.rexNode?.funcCall) : undefined);
-    message.rexNode?.$case === "udf" &&
-      (obj.udf = message.rexNode?.udf ? UserDefinedFunction.toJSON(message.rexNode?.udf) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExprNode>, I>>(object: I): ExprNode {
-    const message = createBaseExprNode();
-    message.exprType = object.exprType ?? ExprNode_Type.UNSPECIFIED;
-    message.returnType = (object.returnType !== undefined && object.returnType !== null)
-      ? DataType.fromPartial(object.returnType)
-      : undefined;
-    if (
-      object.rexNode?.$case === "inputRef" &&
-      object.rexNode?.inputRef !== undefined &&
-      object.rexNode?.inputRef !== null
-    ) {
-      message.rexNode = { $case: "inputRef", inputRef: object.rexNode.inputRef };
-    }
-    if (
-      object.rexNode?.$case === "constant" &&
-      object.rexNode?.constant !== undefined &&
-      object.rexNode?.constant !== null
-    ) {
-      message.rexNode = { $case: "constant", constant: Datum.fromPartial(object.rexNode.constant) };
-    }
-    if (
-      object.rexNode?.$case === "funcCall" &&
-      object.rexNode?.funcCall !== undefined &&
-      object.rexNode?.funcCall !== null
-    ) {
-      message.rexNode = { $case: "funcCall", funcCall: FunctionCall.fromPartial(object.rexNode.funcCall) };
-    }
-    if (object.rexNode?.$case === "udf" && object.rexNode?.udf !== undefined && object.rexNode?.udf !== null) {
-      message.rexNode = { $case: "udf", udf: UserDefinedFunction.fromPartial(object.rexNode.udf) };
-    }
-    return message;
-  },
-};
-
-function createBaseTableFunction(): TableFunction {
-  return { functionType: TableFunction_Type.UNSPECIFIED, args: [], returnType: undefined, udtf: undefined };
-}
-
-export const TableFunction = {
-  fromJSON(object: any): TableFunction {
-    return {
-      functionType: isSet(object.functionType)
-        ? tableFunction_TypeFromJSON(object.functionType)
-        : TableFunction_Type.UNSPECIFIED,
-      args: Array.isArray(object?.args)
-        ? object.args.map((e: any) => ExprNode.fromJSON(e))
-        : [],
-      returnType: isSet(object.returnType) ? DataType.fromJSON(object.returnType) : undefined,
-      udtf: isSet(object.udtf) ? UserDefinedTableFunction.fromJSON(object.udtf) : undefined,
-    };
-  },
-
-  toJSON(message: TableFunction): unknown {
-    const obj: any = {};
-    message.functionType !== undefined && (obj.functionType = tableFunction_TypeToJSON(message.functionType));
-    if (message.args) {
-      obj.args = message.args.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.args = [];
-    }
-    message.returnType !== undefined &&
-      (obj.returnType = message.returnType ? DataType.toJSON(message.returnType) : undefined);
-    message.udtf !== undefined && (obj.udtf = message.udtf ? UserDefinedTableFunction.toJSON(message.udtf) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableFunction>, I>>(object: I): TableFunction {
-    const message = createBaseTableFunction();
-    message.functionType = object.functionType ?? TableFunction_Type.UNSPECIFIED;
-    message.args = object.args?.map((e) => ExprNode.fromPartial(e)) || [];
-    message.returnType = (object.returnType !== undefined && object.returnType !== null)
-      ? DataType.fromPartial(object.returnType)
-      : undefined;
-    message.udtf = (object.udtf !== undefined && object.udtf !== null)
-      ? UserDefinedTableFunction.fromPartial(object.udtf)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseInputRef(): InputRef {
-  return { index: 0, type: undefined };
-}
-
-export const InputRef = {
-  fromJSON(object: any): InputRef {
-    return {
-      index: isSet(object.index) ? Number(object.index) : 0,
-      type: isSet(object.type) ? DataType.fromJSON(object.type) : undefined,
-    };
-  },
-
-  toJSON(message: InputRef): unknown {
-    const obj: any = {};
-    message.index !== undefined && (obj.index = Math.round(message.index));
-    message.type !== undefined && (obj.type = message.type ? DataType.toJSON(message.type) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<InputRef>, I>>(object: I): InputRef {
-    const message = createBaseInputRef();
-    message.index = object.index ?? 0;
-    message.type = (object.type !== undefined && object.type !== null) ? DataType.fromPartial(object.type) : undefined;
-    return message;
-  },
-};
-
-function createBaseProjectSetSelectItem(): ProjectSetSelectItem {
-  return { selectItem: undefined };
-}
-
-export const ProjectSetSelectItem = {
-  fromJSON(object: any): ProjectSetSelectItem {
-    return {
-      selectItem: isSet(object.expr)
-        ? { $case: "expr", expr: ExprNode.fromJSON(object.expr) }
-        : isSet(object.tableFunction)
-        ? { $case: "tableFunction", tableFunction: TableFunction.fromJSON(object.tableFunction) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: ProjectSetSelectItem): unknown {
-    const obj: any = {};
-    message.selectItem?.$case === "expr" &&
-      (obj.expr = message.selectItem?.expr ? ExprNode.toJSON(message.selectItem?.expr) : undefined);
-    message.selectItem?.$case === "tableFunction" && (obj.tableFunction = message.selectItem?.tableFunction
-      ? TableFunction.toJSON(message.selectItem?.tableFunction)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ProjectSetSelectItem>, I>>(object: I): ProjectSetSelectItem {
-    const message = createBaseProjectSetSelectItem();
-    if (
-      object.selectItem?.$case === "expr" && object.selectItem?.expr !== undefined && object.selectItem?.expr !== null
-    ) {
-      message.selectItem = { $case: "expr", expr: ExprNode.fromPartial(object.selectItem.expr) };
-    }
-    if (
-      object.selectItem?.$case === "tableFunction" &&
-      object.selectItem?.tableFunction !== undefined &&
-      object.selectItem?.tableFunction !== null
-    ) {
-      message.selectItem = {
-        $case: "tableFunction",
-        tableFunction: TableFunction.fromPartial(object.selectItem.tableFunction),
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseFunctionCall(): FunctionCall {
-  return { children: [] };
-}
-
-export const FunctionCall = {
-  fromJSON(object: any): FunctionCall {
-    return { children: Array.isArray(object?.children) ? object.children.map((e: any) => ExprNode.fromJSON(e)) : [] };
-  },
-
-  toJSON(message: FunctionCall): unknown {
-    const obj: any = {};
-    if (message.children) {
-      obj.children = message.children.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.children = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<FunctionCall>, I>>(object: I): FunctionCall {
-    const message = createBaseFunctionCall();
-    message.children = object.children?.map((e) => ExprNode.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseAggCall(): AggCall {
-  return {
-    type: AggCall_Type.UNSPECIFIED,
-    args: [],
-    returnType: undefined,
-    distinct: false,
-    orderBy: [],
-    filter: undefined,
-  };
-}
-
-export const AggCall = {
-  fromJSON(object: any): AggCall {
-    return {
-      type: isSet(object.type) ? aggCall_TypeFromJSON(object.type) : AggCall_Type.UNSPECIFIED,
-      args: Array.isArray(object?.args) ? object.args.map((e: any) => InputRef.fromJSON(e)) : [],
-      returnType: isSet(object.returnType) ? DataType.fromJSON(object.returnType) : undefined,
-      distinct: isSet(object.distinct) ? Boolean(object.distinct) : false,
-      orderBy: Array.isArray(object?.orderBy) ? object.orderBy.map((e: any) => ColumnOrder.fromJSON(e)) : [],
-      filter: isSet(object.filter) ? ExprNode.fromJSON(object.filter) : undefined,
-    };
-  },
-
-  toJSON(message: AggCall): unknown {
-    const obj: any = {};
-    message.type !== undefined && (obj.type = aggCall_TypeToJSON(message.type));
-    if (message.args) {
-      obj.args = message.args.map((e) => e ? InputRef.toJSON(e) : undefined);
-    } else {
-      obj.args = [];
-    }
-    message.returnType !== undefined &&
-      (obj.returnType = message.returnType ? DataType.toJSON(message.returnType) : undefined);
-    message.distinct !== undefined && (obj.distinct = message.distinct);
-    if (message.orderBy) {
-      obj.orderBy = message.orderBy.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.orderBy = [];
-    }
-    message.filter !== undefined && (obj.filter = message.filter ? ExprNode.toJSON(message.filter) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AggCall>, I>>(object: I): AggCall {
-    const message = createBaseAggCall();
-    message.type = object.type ?? AggCall_Type.UNSPECIFIED;
-    message.args = object.args?.map((e) => InputRef.fromPartial(e)) || [];
-    message.returnType = (object.returnType !== undefined && object.returnType !== null)
-      ? DataType.fromPartial(object.returnType)
-      : undefined;
-    message.distinct = object.distinct ?? false;
-    message.orderBy = object.orderBy?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.filter = (object.filter !== undefined && object.filter !== null)
-      ? ExprNode.fromPartial(object.filter)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseUserDefinedFunction(): UserDefinedFunction {
-  return { children: [], name: "", argTypes: [], language: "", link: "", identifier: "" };
-}
-
-export const UserDefinedFunction = {
-  fromJSON(object: any): UserDefinedFunction {
-    return {
-      children: Array.isArray(object?.children) ? object.children.map((e: any) => ExprNode.fromJSON(e)) : [],
-      name: isSet(object.name) ? String(object.name) : "",
-      argTypes: Array.isArray(object?.argTypes) ? object.argTypes.map((e: any) => DataType.fromJSON(e)) : [],
-      language: isSet(object.language) ? String(object.language) : "",
-      link: isSet(object.link) ? String(object.link) : "",
-      identifier: isSet(object.identifier) ? String(object.identifier) : "",
-    };
-  },
-
-  toJSON(message: UserDefinedFunction): unknown {
-    const obj: any = {};
-    if (message.children) {
-      obj.children = message.children.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.children = [];
-    }
-    message.name !== undefined && (obj.name = message.name);
-    if (message.argTypes) {
-      obj.argTypes = message.argTypes.map((e) => e ? DataType.toJSON(e) : undefined);
-    } else {
-      obj.argTypes = [];
-    }
-    message.language !== undefined && (obj.language = message.language);
-    message.link !== undefined && (obj.link = message.link);
-    message.identifier !== undefined && (obj.identifier = message.identifier);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UserDefinedFunction>, I>>(object: I): UserDefinedFunction {
-    const message = createBaseUserDefinedFunction();
-    message.children = object.children?.map((e) => ExprNode.fromPartial(e)) || [];
-    message.name = object.name ?? "";
-    message.argTypes = object.argTypes?.map((e) => DataType.fromPartial(e)) || [];
-    message.language = object.language ?? "";
-    message.link = object.link ?? "";
-    message.identifier = object.identifier ?? "";
-    return message;
-  },
-};
-
-function createBaseUserDefinedTableFunction(): UserDefinedTableFunction {
-  return { argTypes: [], language: "", link: "", identifier: "" };
-}
-
-export const UserDefinedTableFunction = {
-  fromJSON(object: any): UserDefinedTableFunction {
-    return {
-      argTypes: Array.isArray(object?.argTypes) ? object.argTypes.map((e: any) => DataType.fromJSON(e)) : [],
-      language: isSet(object.language) ? String(object.language) : "",
-      link: isSet(object.link) ? String(object.link) : "",
-      identifier: isSet(object.identifier) ? String(object.identifier) : "",
-    };
-  },
-
-  toJSON(message: UserDefinedTableFunction): unknown {
-    const obj: any = {};
-    if (message.argTypes) {
-      obj.argTypes = message.argTypes.map((e) => e ? DataType.toJSON(e) : undefined);
-    } else {
-      obj.argTypes = [];
-    }
-    message.language !== undefined && (obj.language = message.language);
-    message.link !== undefined && (obj.link = message.link);
-    message.identifier !== undefined && (obj.identifier = message.identifier);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UserDefinedTableFunction>, I>>(object: I): UserDefinedTableFunction {
-    const message = createBaseUserDefinedTableFunction();
-    message.argTypes = object.argTypes?.map((e) => DataType.fromPartial(e)) || [];
-    message.language = object.language ?? "";
-    message.link = object.link ?? "";
-    message.identifier = object.identifier ?? "";
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/health.ts b/dashboard/proto/gen/health.ts
deleted file mode 100644
index c77e2b8bebe9e..0000000000000
--- a/dashboard/proto/gen/health.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/* eslint-disable */
-
-export const protobufPackage = "health";
-
-export interface HealthCheckRequest {
-  service: string;
-}
-
-export interface HealthCheckResponse {
-  status: HealthCheckResponse_ServingStatus;
-}
-
-export const HealthCheckResponse_ServingStatus = {
-  UNKNOWN: "UNKNOWN",
-  SERVING: "SERVING",
-  NOT_SERVING: "NOT_SERVING",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type HealthCheckResponse_ServingStatus =
-  typeof HealthCheckResponse_ServingStatus[keyof typeof HealthCheckResponse_ServingStatus];
-
-export function healthCheckResponse_ServingStatusFromJSON(object: any): HealthCheckResponse_ServingStatus {
-  switch (object) {
-    case 0:
-    case "UNKNOWN":
-      return HealthCheckResponse_ServingStatus.UNKNOWN;
-    case 1:
-    case "SERVING":
-      return HealthCheckResponse_ServingStatus.SERVING;
-    case 2:
-    case "NOT_SERVING":
-      return HealthCheckResponse_ServingStatus.NOT_SERVING;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return HealthCheckResponse_ServingStatus.UNRECOGNIZED;
-  }
-}
-
-export function healthCheckResponse_ServingStatusToJSON(object: HealthCheckResponse_ServingStatus): string {
-  switch (object) {
-    case HealthCheckResponse_ServingStatus.UNKNOWN:
-      return "UNKNOWN";
-    case HealthCheckResponse_ServingStatus.SERVING:
-      return "SERVING";
-    case HealthCheckResponse_ServingStatus.NOT_SERVING:
-      return "NOT_SERVING";
-    case HealthCheckResponse_ServingStatus.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-function createBaseHealthCheckRequest(): HealthCheckRequest {
-  return { service: "" };
-}
-
-export const HealthCheckRequest = {
-  fromJSON(object: any): HealthCheckRequest {
-    return { service: isSet(object.service) ? String(object.service) : "" };
-  },
-
-  toJSON(message: HealthCheckRequest): unknown {
-    const obj: any = {};
-    message.service !== undefined && (obj.service = message.service);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(object: I): HealthCheckRequest {
-    const message = createBaseHealthCheckRequest();
-    message.service = object.service ?? "";
-    return message;
-  },
-};
-
-function createBaseHealthCheckResponse(): HealthCheckResponse {
-  return { status: HealthCheckResponse_ServingStatus.UNKNOWN };
-}
-
-export const HealthCheckResponse = {
-  fromJSON(object: any): HealthCheckResponse {
-    return {
-      status: isSet(object.status)
-        ? healthCheckResponse_ServingStatusFromJSON(object.status)
-        : HealthCheckResponse_ServingStatus.UNKNOWN,
-    };
-  },
-
-  toJSON(message: HealthCheckResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(object: I): HealthCheckResponse {
-    const message = createBaseHealthCheckResponse();
-    message.status = object.status ?? HealthCheckResponse_ServingStatus.UNKNOWN;
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/hummock.ts b/dashboard/proto/gen/hummock.ts
deleted file mode 100644
index 48e6aee33faae..0000000000000
--- a/dashboard/proto/gen/hummock.ts
+++ /dev/null
@@ -1,4726 +0,0 @@
-/* eslint-disable */
-import { Table } from "./catalog";
-import { Status, WorkerNode } from "./common";
-import { CompactorRuntimeConfig } from "./compactor";
-
-export const protobufPackage = "hummock";
-
-export const LevelType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  NONOVERLAPPING: "NONOVERLAPPING",
-  OVERLAPPING: "OVERLAPPING",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type LevelType = typeof LevelType[keyof typeof LevelType];
-
-export function levelTypeFromJSON(object: any): LevelType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return LevelType.UNSPECIFIED;
-    case 1:
-    case "NONOVERLAPPING":
-      return LevelType.NONOVERLAPPING;
-    case 2:
-    case "OVERLAPPING":
-      return LevelType.OVERLAPPING;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return LevelType.UNRECOGNIZED;
-  }
-}
-
-export function levelTypeToJSON(object: LevelType): string {
-  switch (object) {
-    case LevelType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case LevelType.NONOVERLAPPING:
-      return "NONOVERLAPPING";
-    case LevelType.OVERLAPPING:
-      return "OVERLAPPING";
-    case LevelType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface SstableInfo {
-  objectId: number;
-  sstId: number;
-  keyRange: KeyRange | undefined;
-  fileSize: number;
-  tableIds: number[];
-  metaOffset: number;
-  staleKeyCount: number;
-  totalKeyCount: number;
-  minEpoch: number;
-  maxEpoch: number;
-  uncompressedFileSize: number;
-}
-
-export interface OverlappingLevel {
-  subLevels: Level[];
-  totalFileSize: number;
-  uncompressedFileSize: number;
-}
-
-export interface Level {
-  levelIdx: number;
-  levelType: LevelType;
-  tableInfos: SstableInfo[];
-  totalFileSize: number;
-  subLevelId: number;
-  uncompressedFileSize: number;
-}
-
-export interface InputLevel {
-  levelIdx: number;
-  levelType: LevelType;
-  tableInfos: SstableInfo[];
-}
-
-export interface IntraLevelDelta {
-  levelIdx: number;
-  l0SubLevelId: number;
-  removedTableIds: number[];
-  insertedTableInfos: SstableInfo[];
-}
-
-export interface GroupConstruct {
-  groupConfig:
-    | CompactionConfig
-    | undefined;
-  /** If `parent_group_id` is not 0, it means `parent_group_id` splits into `parent_group_id` and this group, so this group is not empty initially. */
-  parentGroupId: number;
-  tableIds: number[];
-  groupId: number;
-  newSstStartId: number;
-}
-
-export interface GroupMetaChange {
-  tableIdsAdd: number[];
-  tableIdsRemove: number[];
-}
-
-export interface GroupDestroy {
-}
-
-export interface GroupDelta {
-  deltaType?:
-    | { $case: "intraLevel"; intraLevel: IntraLevelDelta }
-    | { $case: "groupConstruct"; groupConstruct: GroupConstruct }
-    | { $case: "groupDestroy"; groupDestroy: GroupDestroy }
-    | { $case: "groupMetaChange"; groupMetaChange: GroupMetaChange };
-}
-
-export interface UncommittedEpoch {
-  epoch: number;
-  tables: SstableInfo[];
-}
-
-export interface HummockVersion {
-  id: number;
-  /** Levels of each compaction group */
-  levels: { [key: number]: HummockVersion_Levels };
-  maxCommittedEpoch: number;
-  /**
-   * Snapshots with epoch less than the safe epoch have been GCed.
-   * Reads against such an epoch will fail.
-   */
-  safeEpoch: number;
-}
-
-export interface HummockVersion_Levels {
-  levels: Level[];
-  l0: OverlappingLevel | undefined;
-  groupId: number;
-  parentGroupId: number;
-  memberTableIds: number[];
-}
-
-export interface HummockVersion_LevelsEntry {
-  key: number;
-  value: HummockVersion_Levels | undefined;
-}
-
-export interface HummockVersionDelta {
-  id: number;
-  prevId: number;
-  /** Levels of each compaction group */
-  groupDeltas: { [key: number]: HummockVersionDelta_GroupDeltas };
-  maxCommittedEpoch: number;
-  /**
-   * Snapshots with epoch less than the safe epoch have been GCed.
-   * Reads against such an epoch will fail.
-   */
-  safeEpoch: number;
-  trivialMove: boolean;
-  gcObjectIds: number[];
-}
-
-export interface HummockVersionDelta_GroupDeltas {
-  groupDeltas: GroupDelta[];
-}
-
-export interface HummockVersionDelta_GroupDeltasEntry {
-  key: number;
-  value: HummockVersionDelta_GroupDeltas | undefined;
-}
-
-export interface HummockVersionDeltas {
-  versionDeltas: HummockVersionDelta[];
-}
-
-/** We will have two epoch after decouple */
-export interface HummockSnapshot {
-  /** Epoch with checkpoint, we will read durable data with it. */
-  committedEpoch: number;
-  /** Epoch without checkpoint, we will read real-time data with it. But it may be rolled back. */
-  currentEpoch: number;
-}
-
-export interface VersionUpdatePayload {
-  payload?: { $case: "versionDeltas"; versionDeltas: HummockVersionDeltas } | {
-    $case: "pinnedVersion";
-    pinnedVersion: HummockVersion;
-  };
-}
-
-export interface UnpinVersionBeforeRequest {
-  contextId: number;
-  unpinVersionBefore: number;
-}
-
-export interface UnpinVersionBeforeResponse {
-  status: Status | undefined;
-}
-
-export interface GetCurrentVersionRequest {
-}
-
-export interface GetCurrentVersionResponse {
-  status: Status | undefined;
-  currentVersion: HummockVersion | undefined;
-}
-
-export interface UnpinVersionRequest {
-  contextId: number;
-}
-
-export interface UnpinVersionResponse {
-  status: Status | undefined;
-}
-
-export interface PinSnapshotRequest {
-  contextId: number;
-}
-
-export interface PinSpecificSnapshotRequest {
-  contextId: number;
-  epoch: number;
-}
-
-export interface GetAssignedCompactTaskNumRequest {
-}
-
-export interface GetAssignedCompactTaskNumResponse {
-  numTasks: number;
-}
-
-export interface PinSnapshotResponse {
-  status: Status | undefined;
-  snapshot: HummockSnapshot | undefined;
-}
-
-export interface GetEpochRequest {
-}
-
-export interface GetEpochResponse {
-  status: Status | undefined;
-  snapshot: HummockSnapshot | undefined;
-}
-
-export interface UnpinSnapshotRequest {
-  contextId: number;
-}
-
-export interface UnpinSnapshotResponse {
-  status: Status | undefined;
-}
-
-export interface UnpinSnapshotBeforeRequest {
-  contextId: number;
-  minSnapshot: HummockSnapshot | undefined;
-}
-
-export interface UnpinSnapshotBeforeResponse {
-  status: Status | undefined;
-}
-
-/**
- * When `right_exclusive=false`, it represents [left, right], of which both boundary are open. When `right_exclusive=true`,
- * it represents [left, right), of which right is exclusive.
- */
-export interface KeyRange {
-  left: Uint8Array;
-  right: Uint8Array;
-  rightExclusive: boolean;
-}
-
-export interface TableOption {
-  retentionSeconds: number;
-}
-
-export interface CompactTask {
-  /** SSTs to be compacted, which will be removed from LSM after compaction */
-  inputSsts: InputLevel[];
-  /**
-   * In ideal case, the compaction will generate `splits.len()` tables which have key range
-   * corresponding to that in [`splits`], respectively
-   */
-  splits: KeyRange[];
-  /** low watermark in 'ts-aware compaction' */
-  watermark: number;
-  /** compaction output, which will be added to [`target_level`] of LSM after compaction */
-  sortedOutputSsts: SstableInfo[];
-  /** task id assigned by hummock storage service */
-  taskId: number;
-  /** compaction output will be added to [`target_level`] of LSM after compaction */
-  targetLevel: number;
-  gcDeleteKeys: boolean;
-  taskStatus: CompactTask_TaskStatus;
-  /** compaction group the task belongs to */
-  compactionGroupId: number;
-  /** existing_table_ids for compaction drop key */
-  existingTableIds: number[];
-  compressionAlgorithm: number;
-  targetFileSize: number;
-  compactionFilterMask: number;
-  tableOptions: { [key: number]: TableOption };
-  currentEpochTime: number;
-  targetSubLevelId: number;
-  /** Identifies whether the task is space_reclaim, if the compact_task_type increases, it will be refactored to enum */
-  taskType: CompactTask_TaskType;
-  splitByStateTable: boolean;
-}
-
-export const CompactTask_TaskStatus = {
-  UNSPECIFIED: "UNSPECIFIED",
-  PENDING: "PENDING",
-  SUCCESS: "SUCCESS",
-  HEARTBEAT_CANCELED: "HEARTBEAT_CANCELED",
-  NO_AVAIL_CANCELED: "NO_AVAIL_CANCELED",
-  ASSIGN_FAIL_CANCELED: "ASSIGN_FAIL_CANCELED",
-  SEND_FAIL_CANCELED: "SEND_FAIL_CANCELED",
-  MANUAL_CANCELED: "MANUAL_CANCELED",
-  INVALID_GROUP_CANCELED: "INVALID_GROUP_CANCELED",
-  EXECUTE_FAILED: "EXECUTE_FAILED",
-  JOIN_HANDLE_FAILED: "JOIN_HANDLE_FAILED",
-  TRACK_SST_OBJECT_ID_FAILED: "TRACK_SST_OBJECT_ID_FAILED",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type CompactTask_TaskStatus = typeof CompactTask_TaskStatus[keyof typeof CompactTask_TaskStatus];
-
-export function compactTask_TaskStatusFromJSON(object: any): CompactTask_TaskStatus {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return CompactTask_TaskStatus.UNSPECIFIED;
-    case 1:
-    case "PENDING":
-      return CompactTask_TaskStatus.PENDING;
-    case 2:
-    case "SUCCESS":
-      return CompactTask_TaskStatus.SUCCESS;
-    case 3:
-    case "HEARTBEAT_CANCELED":
-      return CompactTask_TaskStatus.HEARTBEAT_CANCELED;
-    case 4:
-    case "NO_AVAIL_CANCELED":
-      return CompactTask_TaskStatus.NO_AVAIL_CANCELED;
-    case 5:
-    case "ASSIGN_FAIL_CANCELED":
-      return CompactTask_TaskStatus.ASSIGN_FAIL_CANCELED;
-    case 6:
-    case "SEND_FAIL_CANCELED":
-      return CompactTask_TaskStatus.SEND_FAIL_CANCELED;
-    case 7:
-    case "MANUAL_CANCELED":
-      return CompactTask_TaskStatus.MANUAL_CANCELED;
-    case 8:
-    case "INVALID_GROUP_CANCELED":
-      return CompactTask_TaskStatus.INVALID_GROUP_CANCELED;
-    case 9:
-    case "EXECUTE_FAILED":
-      return CompactTask_TaskStatus.EXECUTE_FAILED;
-    case 10:
-    case "JOIN_HANDLE_FAILED":
-      return CompactTask_TaskStatus.JOIN_HANDLE_FAILED;
-    case 11:
-    case "TRACK_SST_OBJECT_ID_FAILED":
-      return CompactTask_TaskStatus.TRACK_SST_OBJECT_ID_FAILED;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return CompactTask_TaskStatus.UNRECOGNIZED;
-  }
-}
-
-export function compactTask_TaskStatusToJSON(object: CompactTask_TaskStatus): string {
-  switch (object) {
-    case CompactTask_TaskStatus.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case CompactTask_TaskStatus.PENDING:
-      return "PENDING";
-    case CompactTask_TaskStatus.SUCCESS:
-      return "SUCCESS";
-    case CompactTask_TaskStatus.HEARTBEAT_CANCELED:
-      return "HEARTBEAT_CANCELED";
-    case CompactTask_TaskStatus.NO_AVAIL_CANCELED:
-      return "NO_AVAIL_CANCELED";
-    case CompactTask_TaskStatus.ASSIGN_FAIL_CANCELED:
-      return "ASSIGN_FAIL_CANCELED";
-    case CompactTask_TaskStatus.SEND_FAIL_CANCELED:
-      return "SEND_FAIL_CANCELED";
-    case CompactTask_TaskStatus.MANUAL_CANCELED:
-      return "MANUAL_CANCELED";
-    case CompactTask_TaskStatus.INVALID_GROUP_CANCELED:
-      return "INVALID_GROUP_CANCELED";
-    case CompactTask_TaskStatus.EXECUTE_FAILED:
-      return "EXECUTE_FAILED";
-    case CompactTask_TaskStatus.JOIN_HANDLE_FAILED:
-      return "JOIN_HANDLE_FAILED";
-    case CompactTask_TaskStatus.TRACK_SST_OBJECT_ID_FAILED:
-      return "TRACK_SST_OBJECT_ID_FAILED";
-    case CompactTask_TaskStatus.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const CompactTask_TaskType = {
-  TYPE_UNSPECIFIED: "TYPE_UNSPECIFIED",
-  DYNAMIC: "DYNAMIC",
-  SPACE_RECLAIM: "SPACE_RECLAIM",
-  MANUAL: "MANUAL",
-  SHARED_BUFFER: "SHARED_BUFFER",
-  TTL: "TTL",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type CompactTask_TaskType = typeof CompactTask_TaskType[keyof typeof CompactTask_TaskType];
-
-export function compactTask_TaskTypeFromJSON(object: any): CompactTask_TaskType {
-  switch (object) {
-    case 0:
-    case "TYPE_UNSPECIFIED":
-      return CompactTask_TaskType.TYPE_UNSPECIFIED;
-    case 1:
-    case "DYNAMIC":
-      return CompactTask_TaskType.DYNAMIC;
-    case 2:
-    case "SPACE_RECLAIM":
-      return CompactTask_TaskType.SPACE_RECLAIM;
-    case 3:
-    case "MANUAL":
-      return CompactTask_TaskType.MANUAL;
-    case 4:
-    case "SHARED_BUFFER":
-      return CompactTask_TaskType.SHARED_BUFFER;
-    case 5:
-    case "TTL":
-      return CompactTask_TaskType.TTL;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return CompactTask_TaskType.UNRECOGNIZED;
-  }
-}
-
-export function compactTask_TaskTypeToJSON(object: CompactTask_TaskType): string {
-  switch (object) {
-    case CompactTask_TaskType.TYPE_UNSPECIFIED:
-      return "TYPE_UNSPECIFIED";
-    case CompactTask_TaskType.DYNAMIC:
-      return "DYNAMIC";
-    case CompactTask_TaskType.SPACE_RECLAIM:
-      return "SPACE_RECLAIM";
-    case CompactTask_TaskType.MANUAL:
-      return "MANUAL";
-    case CompactTask_TaskType.SHARED_BUFFER:
-      return "SHARED_BUFFER";
-    case CompactTask_TaskType.TTL:
-      return "TTL";
-    case CompactTask_TaskType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface CompactTask_TableOptionsEntry {
-  key: number;
-  value: TableOption | undefined;
-}
-
-export interface LevelHandler {
-  level: number;
-  tasks: LevelHandler_RunningCompactTask[];
-}
-
-export interface LevelHandler_RunningCompactTask {
-  taskId: number;
-  ssts: number[];
-  totalFileSize: number;
-  targetLevel: number;
-}
-
-export interface CompactStatus {
-  compactionGroupId: number;
-  levelHandlers: LevelHandler[];
-}
-
-/** Config info of compaction group. */
-export interface CompactionGroup {
-  id: number;
-  compactionConfig: CompactionConfig | undefined;
-}
-
-/**
- * Complete info of compaction group.
- * The info is the aggregate of `HummockVersion` and `CompactionGroupConfig`
- */
-export interface CompactionGroupInfo {
-  id: number;
-  parentId: number;
-  memberTableIds: number[];
-  compactionConfig: CompactionConfig | undefined;
-}
-
-export interface CompactTaskAssignment {
-  compactTask: CompactTask | undefined;
-  contextId: number;
-}
-
-export interface GetCompactionTasksRequest {
-}
-
-export interface GetCompactionTasksResponse {
-  status: Status | undefined;
-  compactTask: CompactTask | undefined;
-}
-
-export interface ReportCompactionTasksRequest {
-  contextId: number;
-  compactTask: CompactTask | undefined;
-  tableStatsChange: { [key: number]: TableStats };
-}
-
-export interface ReportCompactionTasksRequest_TableStatsChangeEntry {
-  key: number;
-  value: TableStats | undefined;
-}
-
-export interface ReportCompactionTasksResponse {
-  status: Status | undefined;
-}
-
-export interface HummockPinnedVersion {
-  contextId: number;
-  minPinnedId: number;
-}
-
-export interface HummockPinnedSnapshot {
-  contextId: number;
-  minimalPinnedSnapshot: number;
-}
-
-export interface GetNewSstIdsRequest {
-  number: number;
-}
-
-export interface GetNewSstIdsResponse {
-  status:
-    | Status
-    | undefined;
-  /** inclusive */
-  startId: number;
-  /** exclusive */
-  endId: number;
-}
-
-/**
- * This is a heartbeat message. Task will be considered dead if
- * `CompactTaskProgress` is not received for a timeout
- * or `num_ssts_sealed`/`num_ssts_uploaded` do not increase for a timeout.
- */
-export interface CompactTaskProgress {
-  taskId: number;
-  numSstsSealed: number;
-  numSstsUploaded: number;
-}
-
-export interface ReportCompactionTaskProgressRequest {
-  contextId: number;
-  progress: CompactTaskProgress[];
-}
-
-export interface ReportCompactionTaskProgressResponse {
-  status: Status | undefined;
-}
-
-export interface SubscribeCompactTasksRequest {
-  contextId: number;
-  maxConcurrentTaskNumber: number;
-}
-
-export interface ValidationTask {
-  sstInfos: SstableInfo[];
-  sstIdToWorkerId: { [key: number]: number };
-  epoch: number;
-}
-
-export interface ValidationTask_SstIdToWorkerIdEntry {
-  key: number;
-  value: number;
-}
-
-export interface SubscribeCompactTasksResponse {
-  task?:
-    | { $case: "compactTask"; compactTask: CompactTask }
-    | { $case: "vacuumTask"; vacuumTask: VacuumTask }
-    | { $case: "fullScanTask"; fullScanTask: FullScanTask }
-    | { $case: "validationTask"; validationTask: ValidationTask }
-    | { $case: "cancelCompactTask"; cancelCompactTask: CancelCompactTask };
-}
-
-/** Delete SSTs in object store */
-export interface VacuumTask {
-  sstableObjectIds: number[];
-}
-
-/** Scan object store to get candidate orphan SSTs. */
-export interface FullScanTask {
-  sstRetentionTimeSec: number;
-}
-
-/** Cancel compact task */
-export interface CancelCompactTask {
-  contextId: number;
-  taskId: number;
-}
-
-export interface ReportVacuumTaskRequest {
-  vacuumTask: VacuumTask | undefined;
-}
-
-export interface ReportVacuumTaskResponse {
-  status: Status | undefined;
-}
-
-export interface TriggerManualCompactionRequest {
-  compactionGroupId: number;
-  keyRange: KeyRange | undefined;
-  tableId: number;
-  level: number;
-  sstIds: number[];
-}
-
-export interface TriggerManualCompactionResponse {
-  status: Status | undefined;
-}
-
-export interface ReportFullScanTaskRequest {
-  objectIds: number[];
-}
-
-export interface ReportFullScanTaskResponse {
-  status: Status | undefined;
-}
-
-export interface TriggerFullGCRequest {
-  sstRetentionTimeSec: number;
-}
-
-export interface TriggerFullGCResponse {
-  status: Status | undefined;
-}
-
-export interface ListVersionDeltasRequest {
-  startId: number;
-  numLimit: number;
-  committedEpochLimit: number;
-}
-
-export interface ListVersionDeltasResponse {
-  versionDeltas: HummockVersionDeltas | undefined;
-}
-
-export interface PinnedVersionsSummary {
-  pinnedVersions: HummockPinnedVersion[];
-  workers: { [key: number]: WorkerNode };
-}
-
-export interface PinnedVersionsSummary_WorkersEntry {
-  key: number;
-  value: WorkerNode | undefined;
-}
-
-export interface PinnedSnapshotsSummary {
-  pinnedSnapshots: HummockPinnedSnapshot[];
-  workers: { [key: number]: WorkerNode };
-}
-
-export interface PinnedSnapshotsSummary_WorkersEntry {
-  key: number;
-  value: WorkerNode | undefined;
-}
-
-export interface RiseCtlGetPinnedVersionsSummaryRequest {
-}
-
-export interface RiseCtlGetPinnedVersionsSummaryResponse {
-  summary: PinnedVersionsSummary | undefined;
-}
-
-export interface RiseCtlGetPinnedSnapshotsSummaryRequest {
-}
-
-export interface RiseCtlGetPinnedSnapshotsSummaryResponse {
-  summary: PinnedSnapshotsSummary | undefined;
-}
-
-export interface InitMetadataForReplayRequest {
-  tables: Table[];
-  compactionGroups: CompactionGroupInfo[];
-}
-
-export interface InitMetadataForReplayResponse {
-}
-
-export interface ReplayVersionDeltaRequest {
-  versionDelta: HummockVersionDelta | undefined;
-}
-
-export interface ReplayVersionDeltaResponse {
-  version: HummockVersion | undefined;
-  modifiedCompactionGroups: number[];
-}
-
-export interface TriggerCompactionDeterministicRequest {
-  versionId: number;
-  compactionGroups: number[];
-}
-
-export interface TriggerCompactionDeterministicResponse {
-}
-
-export interface DisableCommitEpochRequest {
-}
-
-export interface DisableCommitEpochResponse {
-  currentVersion: HummockVersion | undefined;
-}
-
-export interface RiseCtlListCompactionGroupRequest {
-}
-
-export interface RiseCtlListCompactionGroupResponse {
-  status: Status | undefined;
-  compactionGroups: CompactionGroupInfo[];
-}
-
-export interface RiseCtlUpdateCompactionConfigRequest {
-  compactionGroupIds: number[];
-  configs: RiseCtlUpdateCompactionConfigRequest_MutableConfig[];
-}
-
-export interface RiseCtlUpdateCompactionConfigRequest_MutableConfig {
-  mutableConfig?:
-    | { $case: "maxBytesForLevelBase"; maxBytesForLevelBase: number }
-    | { $case: "maxBytesForLevelMultiplier"; maxBytesForLevelMultiplier: number }
-    | { $case: "maxCompactionBytes"; maxCompactionBytes: number }
-    | { $case: "subLevelMaxCompactionBytes"; subLevelMaxCompactionBytes: number }
-    | { $case: "level0TierCompactFileNumber"; level0TierCompactFileNumber: number }
-    | { $case: "targetFileSizeBase"; targetFileSizeBase: number }
-    | { $case: "compactionFilterMask"; compactionFilterMask: number }
-    | { $case: "maxSubCompaction"; maxSubCompaction: number }
-    | { $case: "level0StopWriteThresholdSubLevelNumber"; level0StopWriteThresholdSubLevelNumber: number };
-}
-
-export interface RiseCtlUpdateCompactionConfigResponse {
-  status: Status | undefined;
-}
-
-export interface SetCompactorRuntimeConfigRequest {
-  contextId: number;
-  config: CompactorRuntimeConfig | undefined;
-}
-
-export interface SetCompactorRuntimeConfigResponse {
-}
-
-export interface PinVersionRequest {
-  contextId: number;
-}
-
-export interface PinVersionResponse {
-  pinnedVersion: HummockVersion | undefined;
-}
-
-export interface SplitCompactionGroupRequest {
-  groupId: number;
-  tableIds: number[];
-}
-
-export interface SplitCompactionGroupResponse {
-  newGroupId: number;
-}
-
-export interface CompactionConfig {
-  maxBytesForLevelBase: number;
-  maxLevel: number;
-  maxBytesForLevelMultiplier: number;
-  maxCompactionBytes: number;
-  subLevelMaxCompactionBytes: number;
-  level0TierCompactFileNumber: number;
-  compactionMode: CompactionConfig_CompactionMode;
-  compressionAlgorithm: string[];
-  targetFileSizeBase: number;
-  compactionFilterMask: number;
-  maxSubCompaction: number;
-  maxSpaceReclaimBytes: number;
-  splitByStateTable: boolean;
-  /** soft limit for max number of sub level number */
-  level0StopWriteThresholdSubLevelNumber: number;
-  level0MaxCompactFileNumber: number;
-}
-
-export const CompactionConfig_CompactionMode = {
-  UNSPECIFIED: "UNSPECIFIED",
-  RANGE: "RANGE",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type CompactionConfig_CompactionMode =
-  typeof CompactionConfig_CompactionMode[keyof typeof CompactionConfig_CompactionMode];
-
-export function compactionConfig_CompactionModeFromJSON(object: any): CompactionConfig_CompactionMode {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return CompactionConfig_CompactionMode.UNSPECIFIED;
-    case 1:
-    case "RANGE":
-      return CompactionConfig_CompactionMode.RANGE;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return CompactionConfig_CompactionMode.UNRECOGNIZED;
-  }
-}
-
-export function compactionConfig_CompactionModeToJSON(object: CompactionConfig_CompactionMode): string {
-  switch (object) {
-    case CompactionConfig_CompactionMode.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case CompactionConfig_CompactionMode.RANGE:
-      return "RANGE";
-    case CompactionConfig_CompactionMode.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface TableStats {
-  totalKeySize: number;
-  totalValueSize: number;
-  totalKeyCount: number;
-}
-
-export interface HummockVersionStats {
-  hummockVersionId: number;
-  tableStats: { [key: number]: TableStats };
-}
-
-export interface HummockVersionStats_TableStatsEntry {
-  key: number;
-  value: TableStats | undefined;
-}
-
-export interface WriteLimits {
-  /** < compaction group id, write limit info > */
-  writeLimits: { [key: number]: WriteLimits_WriteLimit };
-}
-
-export interface WriteLimits_WriteLimit {
-  tableIds: number[];
-  reason: string;
-}
-
-export interface WriteLimits_WriteLimitsEntry {
-  key: number;
-  value: WriteLimits_WriteLimit | undefined;
-}
-
-function createBaseSstableInfo(): SstableInfo {
-  return {
-    objectId: 0,
-    sstId: 0,
-    keyRange: undefined,
-    fileSize: 0,
-    tableIds: [],
-    metaOffset: 0,
-    staleKeyCount: 0,
-    totalKeyCount: 0,
-    minEpoch: 0,
-    maxEpoch: 0,
-    uncompressedFileSize: 0,
-  };
-}
-
-export const SstableInfo = {
-  fromJSON(object: any): SstableInfo {
-    return {
-      objectId: isSet(object.objectId) ? Number(object.objectId) : 0,
-      sstId: isSet(object.sstId) ? Number(object.sstId) : 0,
-      keyRange: isSet(object.keyRange) ? KeyRange.fromJSON(object.keyRange) : undefined,
-      fileSize: isSet(object.fileSize) ? Number(object.fileSize) : 0,
-      tableIds: Array.isArray(object?.tableIds) ? object.tableIds.map((e: any) => Number(e)) : [],
-      metaOffset: isSet(object.metaOffset) ? Number(object.metaOffset) : 0,
-      staleKeyCount: isSet(object.staleKeyCount) ? Number(object.staleKeyCount) : 0,
-      totalKeyCount: isSet(object.totalKeyCount) ? Number(object.totalKeyCount) : 0,
-      minEpoch: isSet(object.minEpoch) ? Number(object.minEpoch) : 0,
-      maxEpoch: isSet(object.maxEpoch) ? Number(object.maxEpoch) : 0,
-      uncompressedFileSize: isSet(object.uncompressedFileSize) ? Number(object.uncompressedFileSize) : 0,
-    };
-  },
-
-  toJSON(message: SstableInfo): unknown {
-    const obj: any = {};
-    message.objectId !== undefined && (obj.objectId = Math.round(message.objectId));
-    message.sstId !== undefined && (obj.sstId = Math.round(message.sstId));
-    message.keyRange !== undefined && (obj.keyRange = message.keyRange ? KeyRange.toJSON(message.keyRange) : undefined);
-    message.fileSize !== undefined && (obj.fileSize = Math.round(message.fileSize));
-    if (message.tableIds) {
-      obj.tableIds = message.tableIds.map((e) => Math.round(e));
-    } else {
-      obj.tableIds = [];
-    }
-    message.metaOffset !== undefined && (obj.metaOffset = Math.round(message.metaOffset));
-    message.staleKeyCount !== undefined && (obj.staleKeyCount = Math.round(message.staleKeyCount));
-    message.totalKeyCount !== undefined && (obj.totalKeyCount = Math.round(message.totalKeyCount));
-    message.minEpoch !== undefined && (obj.minEpoch = Math.round(message.minEpoch));
-    message.maxEpoch !== undefined && (obj.maxEpoch = Math.round(message.maxEpoch));
-    message.uncompressedFileSize !== undefined && (obj.uncompressedFileSize = Math.round(message.uncompressedFileSize));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SstableInfo>, I>>(object: I): SstableInfo {
-    const message = createBaseSstableInfo();
-    message.objectId = object.objectId ?? 0;
-    message.sstId = object.sstId ?? 0;
-    message.keyRange = (object.keyRange !== undefined && object.keyRange !== null)
-      ? KeyRange.fromPartial(object.keyRange)
-      : undefined;
-    message.fileSize = object.fileSize ?? 0;
-    message.tableIds = object.tableIds?.map((e) => e) || [];
-    message.metaOffset = object.metaOffset ?? 0;
-    message.staleKeyCount = object.staleKeyCount ?? 0;
-    message.totalKeyCount = object.totalKeyCount ?? 0;
-    message.minEpoch = object.minEpoch ?? 0;
-    message.maxEpoch = object.maxEpoch ?? 0;
-    message.uncompressedFileSize = object.uncompressedFileSize ?? 0;
-    return message;
-  },
-};
-
-function createBaseOverlappingLevel(): OverlappingLevel {
-  return { subLevels: [], totalFileSize: 0, uncompressedFileSize: 0 };
-}
-
-export const OverlappingLevel = {
-  fromJSON(object: any): OverlappingLevel {
-    return {
-      subLevels: Array.isArray(object?.subLevels) ? object.subLevels.map((e: any) => Level.fromJSON(e)) : [],
-      totalFileSize: isSet(object.totalFileSize) ? Number(object.totalFileSize) : 0,
-      uncompressedFileSize: isSet(object.uncompressedFileSize) ? Number(object.uncompressedFileSize) : 0,
-    };
-  },
-
-  toJSON(message: OverlappingLevel): unknown {
-    const obj: any = {};
-    if (message.subLevels) {
-      obj.subLevels = message.subLevels.map((e) => e ? Level.toJSON(e) : undefined);
-    } else {
-      obj.subLevels = [];
-    }
-    message.totalFileSize !== undefined && (obj.totalFileSize = Math.round(message.totalFileSize));
-    message.uncompressedFileSize !== undefined && (obj.uncompressedFileSize = Math.round(message.uncompressedFileSize));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<OverlappingLevel>, I>>(object: I): OverlappingLevel {
-    const message = createBaseOverlappingLevel();
-    message.subLevels = object.subLevels?.map((e) => Level.fromPartial(e)) || [];
-    message.totalFileSize = object.totalFileSize ?? 0;
-    message.uncompressedFileSize = object.uncompressedFileSize ?? 0;
-    return message;
-  },
-};
-
-function createBaseLevel(): Level {
-  return {
-    levelIdx: 0,
-    levelType: LevelType.UNSPECIFIED,
-    tableInfos: [],
-    totalFileSize: 0,
-    subLevelId: 0,
-    uncompressedFileSize: 0,
-  };
-}
-
-export const Level = {
-  fromJSON(object: any): Level {
-    return {
-      levelIdx: isSet(object.levelIdx) ? Number(object.levelIdx) : 0,
-      levelType: isSet(object.levelType) ? levelTypeFromJSON(object.levelType) : LevelType.UNSPECIFIED,
-      tableInfos: Array.isArray(object?.tableInfos) ? object.tableInfos.map((e: any) => SstableInfo.fromJSON(e)) : [],
-      totalFileSize: isSet(object.totalFileSize) ? Number(object.totalFileSize) : 0,
-      subLevelId: isSet(object.subLevelId) ? Number(object.subLevelId) : 0,
-      uncompressedFileSize: isSet(object.uncompressedFileSize) ? Number(object.uncompressedFileSize) : 0,
-    };
-  },
-
-  toJSON(message: Level): unknown {
-    const obj: any = {};
-    message.levelIdx !== undefined && (obj.levelIdx = Math.round(message.levelIdx));
-    message.levelType !== undefined && (obj.levelType = levelTypeToJSON(message.levelType));
-    if (message.tableInfos) {
-      obj.tableInfos = message.tableInfos.map((e) => e ? SstableInfo.toJSON(e) : undefined);
-    } else {
-      obj.tableInfos = [];
-    }
-    message.totalFileSize !== undefined && (obj.totalFileSize = Math.round(message.totalFileSize));
-    message.subLevelId !== undefined && (obj.subLevelId = Math.round(message.subLevelId));
-    message.uncompressedFileSize !== undefined && (obj.uncompressedFileSize = Math.round(message.uncompressedFileSize));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Level>, I>>(object: I): Level {
-    const message = createBaseLevel();
-    message.levelIdx = object.levelIdx ?? 0;
-    message.levelType = object.levelType ?? LevelType.UNSPECIFIED;
-    message.tableInfos = object.tableInfos?.map((e) => SstableInfo.fromPartial(e)) || [];
-    message.totalFileSize = object.totalFileSize ?? 0;
-    message.subLevelId = object.subLevelId ?? 0;
-    message.uncompressedFileSize = object.uncompressedFileSize ?? 0;
-    return message;
-  },
-};
-
-function createBaseInputLevel(): InputLevel {
-  return { levelIdx: 0, levelType: LevelType.UNSPECIFIED, tableInfos: [] };
-}
-
-export const InputLevel = {
-  fromJSON(object: any): InputLevel {
-    return {
-      levelIdx: isSet(object.levelIdx) ? Number(object.levelIdx) : 0,
-      levelType: isSet(object.levelType) ? levelTypeFromJSON(object.levelType) : LevelType.UNSPECIFIED,
-      tableInfos: Array.isArray(object?.tableInfos) ? object.tableInfos.map((e: any) => SstableInfo.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: InputLevel): unknown {
-    const obj: any = {};
-    message.levelIdx !== undefined && (obj.levelIdx = Math.round(message.levelIdx));
-    message.levelType !== undefined && (obj.levelType = levelTypeToJSON(message.levelType));
-    if (message.tableInfos) {
-      obj.tableInfos = message.tableInfos.map((e) => e ? SstableInfo.toJSON(e) : undefined);
-    } else {
-      obj.tableInfos = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<InputLevel>, I>>(object: I): InputLevel {
-    const message = createBaseInputLevel();
-    message.levelIdx = object.levelIdx ?? 0;
-    message.levelType = object.levelType ?? LevelType.UNSPECIFIED;
-    message.tableInfos = object.tableInfos?.map((e) => SstableInfo.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseIntraLevelDelta(): IntraLevelDelta {
-  return { levelIdx: 0, l0SubLevelId: 0, removedTableIds: [], insertedTableInfos: [] };
-}
-
-export const IntraLevelDelta = {
-  fromJSON(object: any): IntraLevelDelta {
-    return {
-      levelIdx: isSet(object.levelIdx) ? Number(object.levelIdx) : 0,
-      l0SubLevelId: isSet(object.l0SubLevelId) ? Number(object.l0SubLevelId) : 0,
-      removedTableIds: Array.isArray(object?.removedTableIds) ? object.removedTableIds.map((e: any) => Number(e)) : [],
-      insertedTableInfos: Array.isArray(object?.insertedTableInfos)
-        ? object.insertedTableInfos.map((e: any) => SstableInfo.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: IntraLevelDelta): unknown {
-    const obj: any = {};
-    message.levelIdx !== undefined && (obj.levelIdx = Math.round(message.levelIdx));
-    message.l0SubLevelId !== undefined && (obj.l0SubLevelId = Math.round(message.l0SubLevelId));
-    if (message.removedTableIds) {
-      obj.removedTableIds = message.removedTableIds.map((e) => Math.round(e));
-    } else {
-      obj.removedTableIds = [];
-    }
-    if (message.insertedTableInfos) {
-      obj.insertedTableInfos = message.insertedTableInfos.map((e) => e ? SstableInfo.toJSON(e) : undefined);
-    } else {
-      obj.insertedTableInfos = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<IntraLevelDelta>, I>>(object: I): IntraLevelDelta {
-    const message = createBaseIntraLevelDelta();
-    message.levelIdx = object.levelIdx ?? 0;
-    message.l0SubLevelId = object.l0SubLevelId ?? 0;
-    message.removedTableIds = object.removedTableIds?.map((e) => e) || [];
-    message.insertedTableInfos = object.insertedTableInfos?.map((e) => SstableInfo.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseGroupConstruct(): GroupConstruct {
-  return { groupConfig: undefined, parentGroupId: 0, tableIds: [], groupId: 0, newSstStartId: 0 };
-}
-
-export const GroupConstruct = {
-  fromJSON(object: any): GroupConstruct {
-    return {
-      groupConfig: isSet(object.groupConfig) ? CompactionConfig.fromJSON(object.groupConfig) : undefined,
-      parentGroupId: isSet(object.parentGroupId) ? Number(object.parentGroupId) : 0,
-      tableIds: Array.isArray(object?.tableIds) ? object.tableIds.map((e: any) => Number(e)) : [],
-      groupId: isSet(object.groupId) ? Number(object.groupId) : 0,
-      newSstStartId: isSet(object.newSstStartId) ? Number(object.newSstStartId) : 0,
-    };
-  },
-
-  toJSON(message: GroupConstruct): unknown {
-    const obj: any = {};
-    message.groupConfig !== undefined &&
-      (obj.groupConfig = message.groupConfig ? CompactionConfig.toJSON(message.groupConfig) : undefined);
-    message.parentGroupId !== undefined && (obj.parentGroupId = Math.round(message.parentGroupId));
-    if (message.tableIds) {
-      obj.tableIds = message.tableIds.map((e) => Math.round(e));
-    } else {
-      obj.tableIds = [];
-    }
-    message.groupId !== undefined && (obj.groupId = Math.round(message.groupId));
-    message.newSstStartId !== undefined && (obj.newSstStartId = Math.round(message.newSstStartId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GroupConstruct>, I>>(object: I): GroupConstruct {
-    const message = createBaseGroupConstruct();
-    message.groupConfig = (object.groupConfig !== undefined && object.groupConfig !== null)
-      ? CompactionConfig.fromPartial(object.groupConfig)
-      : undefined;
-    message.parentGroupId = object.parentGroupId ?? 0;
-    message.tableIds = object.tableIds?.map((e) => e) || [];
-    message.groupId = object.groupId ?? 0;
-    message.newSstStartId = object.newSstStartId ?? 0;
-    return message;
-  },
-};
-
-function createBaseGroupMetaChange(): GroupMetaChange {
-  return { tableIdsAdd: [], tableIdsRemove: [] };
-}
-
-export const GroupMetaChange = {
-  fromJSON(object: any): GroupMetaChange {
-    return {
-      tableIdsAdd: Array.isArray(object?.tableIdsAdd) ? object.tableIdsAdd.map((e: any) => Number(e)) : [],
-      tableIdsRemove: Array.isArray(object?.tableIdsRemove) ? object.tableIdsRemove.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: GroupMetaChange): unknown {
-    const obj: any = {};
-    if (message.tableIdsAdd) {
-      obj.tableIdsAdd = message.tableIdsAdd.map((e) => Math.round(e));
-    } else {
-      obj.tableIdsAdd = [];
-    }
-    if (message.tableIdsRemove) {
-      obj.tableIdsRemove = message.tableIdsRemove.map((e) => Math.round(e));
-    } else {
-      obj.tableIdsRemove = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GroupMetaChange>, I>>(object: I): GroupMetaChange {
-    const message = createBaseGroupMetaChange();
-    message.tableIdsAdd = object.tableIdsAdd?.map((e) => e) || [];
-    message.tableIdsRemove = object.tableIdsRemove?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseGroupDestroy(): GroupDestroy {
-  return {};
-}
-
-export const GroupDestroy = {
-  fromJSON(_: any): GroupDestroy {
-    return {};
-  },
-
-  toJSON(_: GroupDestroy): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GroupDestroy>, I>>(_: I): GroupDestroy {
-    const message = createBaseGroupDestroy();
-    return message;
-  },
-};
-
-function createBaseGroupDelta(): GroupDelta {
-  return { deltaType: undefined };
-}
-
-export const GroupDelta = {
-  fromJSON(object: any): GroupDelta {
-    return {
-      deltaType: isSet(object.intraLevel)
-        ? { $case: "intraLevel", intraLevel: IntraLevelDelta.fromJSON(object.intraLevel) }
-        : isSet(object.groupConstruct)
-        ? { $case: "groupConstruct", groupConstruct: GroupConstruct.fromJSON(object.groupConstruct) }
-        : isSet(object.groupDestroy)
-        ? { $case: "groupDestroy", groupDestroy: GroupDestroy.fromJSON(object.groupDestroy) }
-        : isSet(object.groupMetaChange)
-        ? { $case: "groupMetaChange", groupMetaChange: GroupMetaChange.fromJSON(object.groupMetaChange) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: GroupDelta): unknown {
-    const obj: any = {};
-    message.deltaType?.$case === "intraLevel" && (obj.intraLevel = message.deltaType?.intraLevel
-      ? IntraLevelDelta.toJSON(message.deltaType?.intraLevel)
-      : undefined);
-    message.deltaType?.$case === "groupConstruct" && (obj.groupConstruct = message.deltaType?.groupConstruct
-      ? GroupConstruct.toJSON(message.deltaType?.groupConstruct)
-      : undefined);
-    message.deltaType?.$case === "groupDestroy" && (obj.groupDestroy = message.deltaType?.groupDestroy
-      ? GroupDestroy.toJSON(message.deltaType?.groupDestroy)
-      : undefined);
-    message.deltaType?.$case === "groupMetaChange" && (obj.groupMetaChange = message.deltaType?.groupMetaChange
-      ? GroupMetaChange.toJSON(message.deltaType?.groupMetaChange)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GroupDelta>, I>>(object: I): GroupDelta {
-    const message = createBaseGroupDelta();
-    if (
-      object.deltaType?.$case === "intraLevel" &&
-      object.deltaType?.intraLevel !== undefined &&
-      object.deltaType?.intraLevel !== null
-    ) {
-      message.deltaType = { $case: "intraLevel", intraLevel: IntraLevelDelta.fromPartial(object.deltaType.intraLevel) };
-    }
-    if (
-      object.deltaType?.$case === "groupConstruct" &&
-      object.deltaType?.groupConstruct !== undefined &&
-      object.deltaType?.groupConstruct !== null
-    ) {
-      message.deltaType = {
-        $case: "groupConstruct",
-        groupConstruct: GroupConstruct.fromPartial(object.deltaType.groupConstruct),
-      };
-    }
-    if (
-      object.deltaType?.$case === "groupDestroy" &&
-      object.deltaType?.groupDestroy !== undefined &&
-      object.deltaType?.groupDestroy !== null
-    ) {
-      message.deltaType = {
-        $case: "groupDestroy",
-        groupDestroy: GroupDestroy.fromPartial(object.deltaType.groupDestroy),
-      };
-    }
-    if (
-      object.deltaType?.$case === "groupMetaChange" &&
-      object.deltaType?.groupMetaChange !== undefined &&
-      object.deltaType?.groupMetaChange !== null
-    ) {
-      message.deltaType = {
-        $case: "groupMetaChange",
-        groupMetaChange: GroupMetaChange.fromPartial(object.deltaType.groupMetaChange),
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseUncommittedEpoch(): UncommittedEpoch {
-  return { epoch: 0, tables: [] };
-}
-
-export const UncommittedEpoch = {
-  fromJSON(object: any): UncommittedEpoch {
-    return {
-      epoch: isSet(object.epoch) ? Number(object.epoch) : 0,
-      tables: Array.isArray(object?.tables) ? object.tables.map((e: any) => SstableInfo.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: UncommittedEpoch): unknown {
-    const obj: any = {};
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    if (message.tables) {
-      obj.tables = message.tables.map((e) => e ? SstableInfo.toJSON(e) : undefined);
-    } else {
-      obj.tables = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UncommittedEpoch>, I>>(object: I): UncommittedEpoch {
-    const message = createBaseUncommittedEpoch();
-    message.epoch = object.epoch ?? 0;
-    message.tables = object.tables?.map((e) => SstableInfo.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseHummockVersion(): HummockVersion {
-  return { id: 0, levels: {}, maxCommittedEpoch: 0, safeEpoch: 0 };
-}
-
-export const HummockVersion = {
-  fromJSON(object: any): HummockVersion {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      levels: isObject(object.levels)
-        ? Object.entries(object.levels).reduce<{ [key: number]: HummockVersion_Levels }>((acc, [key, value]) => {
-          acc[Number(key)] = HummockVersion_Levels.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-      maxCommittedEpoch: isSet(object.maxCommittedEpoch) ? Number(object.maxCommittedEpoch) : 0,
-      safeEpoch: isSet(object.safeEpoch) ? Number(object.safeEpoch) : 0,
-    };
-  },
-
-  toJSON(message: HummockVersion): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    obj.levels = {};
-    if (message.levels) {
-      Object.entries(message.levels).forEach(([k, v]) => {
-        obj.levels[k] = HummockVersion_Levels.toJSON(v);
-      });
-    }
-    message.maxCommittedEpoch !== undefined && (obj.maxCommittedEpoch = Math.round(message.maxCommittedEpoch));
-    message.safeEpoch !== undefined && (obj.safeEpoch = Math.round(message.safeEpoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockVersion>, I>>(object: I): HummockVersion {
-    const message = createBaseHummockVersion();
-    message.id = object.id ?? 0;
-    message.levels = Object.entries(object.levels ?? {}).reduce<{ [key: number]: HummockVersion_Levels }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = HummockVersion_Levels.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.maxCommittedEpoch = object.maxCommittedEpoch ?? 0;
-    message.safeEpoch = object.safeEpoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseHummockVersion_Levels(): HummockVersion_Levels {
-  return { levels: [], l0: undefined, groupId: 0, parentGroupId: 0, memberTableIds: [] };
-}
-
-export const HummockVersion_Levels = {
-  fromJSON(object: any): HummockVersion_Levels {
-    return {
-      levels: Array.isArray(object?.levels) ? object.levels.map((e: any) => Level.fromJSON(e)) : [],
-      l0: isSet(object.l0) ? OverlappingLevel.fromJSON(object.l0) : undefined,
-      groupId: isSet(object.groupId) ? Number(object.groupId) : 0,
-      parentGroupId: isSet(object.parentGroupId) ? Number(object.parentGroupId) : 0,
-      memberTableIds: Array.isArray(object?.memberTableIds) ? object.memberTableIds.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: HummockVersion_Levels): unknown {
-    const obj: any = {};
-    if (message.levels) {
-      obj.levels = message.levels.map((e) => e ? Level.toJSON(e) : undefined);
-    } else {
-      obj.levels = [];
-    }
-    message.l0 !== undefined && (obj.l0 = message.l0 ? OverlappingLevel.toJSON(message.l0) : undefined);
-    message.groupId !== undefined && (obj.groupId = Math.round(message.groupId));
-    message.parentGroupId !== undefined && (obj.parentGroupId = Math.round(message.parentGroupId));
-    if (message.memberTableIds) {
-      obj.memberTableIds = message.memberTableIds.map((e) => Math.round(e));
-    } else {
-      obj.memberTableIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockVersion_Levels>, I>>(object: I): HummockVersion_Levels {
-    const message = createBaseHummockVersion_Levels();
-    message.levels = object.levels?.map((e) => Level.fromPartial(e)) || [];
-    message.l0 = (object.l0 !== undefined && object.l0 !== null) ? OverlappingLevel.fromPartial(object.l0) : undefined;
-    message.groupId = object.groupId ?? 0;
-    message.parentGroupId = object.parentGroupId ?? 0;
-    message.memberTableIds = object.memberTableIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseHummockVersion_LevelsEntry(): HummockVersion_LevelsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const HummockVersion_LevelsEntry = {
-  fromJSON(object: any): HummockVersion_LevelsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? HummockVersion_Levels.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: HummockVersion_LevelsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined &&
-      (obj.value = message.value ? HummockVersion_Levels.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockVersion_LevelsEntry>, I>>(object: I): HummockVersion_LevelsEntry {
-    const message = createBaseHummockVersion_LevelsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? HummockVersion_Levels.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseHummockVersionDelta(): HummockVersionDelta {
-  return { id: 0, prevId: 0, groupDeltas: {}, maxCommittedEpoch: 0, safeEpoch: 0, trivialMove: false, gcObjectIds: [] };
-}
-
-export const HummockVersionDelta = {
-  fromJSON(object: any): HummockVersionDelta {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      prevId: isSet(object.prevId) ? Number(object.prevId) : 0,
-      groupDeltas: isObject(object.groupDeltas)
-        ? Object.entries(object.groupDeltas).reduce<{ [key: number]: HummockVersionDelta_GroupDeltas }>(
-          (acc, [key, value]) => {
-            acc[Number(key)] = HummockVersionDelta_GroupDeltas.fromJSON(value);
-            return acc;
-          },
-          {},
-        )
-        : {},
-      maxCommittedEpoch: isSet(object.maxCommittedEpoch) ? Number(object.maxCommittedEpoch) : 0,
-      safeEpoch: isSet(object.safeEpoch) ? Number(object.safeEpoch) : 0,
-      trivialMove: isSet(object.trivialMove) ? Boolean(object.trivialMove) : false,
-      gcObjectIds: Array.isArray(object?.gcObjectIds)
-        ? object.gcObjectIds.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: HummockVersionDelta): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.prevId !== undefined && (obj.prevId = Math.round(message.prevId));
-    obj.groupDeltas = {};
-    if (message.groupDeltas) {
-      Object.entries(message.groupDeltas).forEach(([k, v]) => {
-        obj.groupDeltas[k] = HummockVersionDelta_GroupDeltas.toJSON(v);
-      });
-    }
-    message.maxCommittedEpoch !== undefined && (obj.maxCommittedEpoch = Math.round(message.maxCommittedEpoch));
-    message.safeEpoch !== undefined && (obj.safeEpoch = Math.round(message.safeEpoch));
-    message.trivialMove !== undefined && (obj.trivialMove = message.trivialMove);
-    if (message.gcObjectIds) {
-      obj.gcObjectIds = message.gcObjectIds.map((e) => Math.round(e));
-    } else {
-      obj.gcObjectIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockVersionDelta>, I>>(object: I): HummockVersionDelta {
-    const message = createBaseHummockVersionDelta();
-    message.id = object.id ?? 0;
-    message.prevId = object.prevId ?? 0;
-    message.groupDeltas = Object.entries(object.groupDeltas ?? {}).reduce<
-      { [key: number]: HummockVersionDelta_GroupDeltas }
-    >((acc, [key, value]) => {
-      if (value !== undefined) {
-        acc[Number(key)] = HummockVersionDelta_GroupDeltas.fromPartial(value);
-      }
-      return acc;
-    }, {});
-    message.maxCommittedEpoch = object.maxCommittedEpoch ?? 0;
-    message.safeEpoch = object.safeEpoch ?? 0;
-    message.trivialMove = object.trivialMove ?? false;
-    message.gcObjectIds = object.gcObjectIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseHummockVersionDelta_GroupDeltas(): HummockVersionDelta_GroupDeltas {
-  return { groupDeltas: [] };
-}
-
-export const HummockVersionDelta_GroupDeltas = {
-  fromJSON(object: any): HummockVersionDelta_GroupDeltas {
-    return {
-      groupDeltas: Array.isArray(object?.groupDeltas) ? object.groupDeltas.map((e: any) => GroupDelta.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: HummockVersionDelta_GroupDeltas): unknown {
-    const obj: any = {};
-    if (message.groupDeltas) {
-      obj.groupDeltas = message.groupDeltas.map((e) => e ? GroupDelta.toJSON(e) : undefined);
-    } else {
-      obj.groupDeltas = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockVersionDelta_GroupDeltas>, I>>(
-    object: I,
-  ): HummockVersionDelta_GroupDeltas {
-    const message = createBaseHummockVersionDelta_GroupDeltas();
-    message.groupDeltas = object.groupDeltas?.map((e) => GroupDelta.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseHummockVersionDelta_GroupDeltasEntry(): HummockVersionDelta_GroupDeltasEntry {
-  return { key: 0, value: undefined };
-}
-
-export const HummockVersionDelta_GroupDeltasEntry = {
-  fromJSON(object: any): HummockVersionDelta_GroupDeltasEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? HummockVersionDelta_GroupDeltas.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: HummockVersionDelta_GroupDeltasEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined &&
-      (obj.value = message.value ? HummockVersionDelta_GroupDeltas.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockVersionDelta_GroupDeltasEntry>, I>>(
-    object: I,
-  ): HummockVersionDelta_GroupDeltasEntry {
-    const message = createBaseHummockVersionDelta_GroupDeltasEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? HummockVersionDelta_GroupDeltas.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseHummockVersionDeltas(): HummockVersionDeltas {
-  return { versionDeltas: [] };
-}
-
-export const HummockVersionDeltas = {
-  fromJSON(object: any): HummockVersionDeltas {
-    return {
-      versionDeltas: Array.isArray(object?.versionDeltas)
-        ? object.versionDeltas.map((e: any) => HummockVersionDelta.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: HummockVersionDeltas): unknown {
-    const obj: any = {};
-    if (message.versionDeltas) {
-      obj.versionDeltas = message.versionDeltas.map((e) => e ? HummockVersionDelta.toJSON(e) : undefined);
-    } else {
-      obj.versionDeltas = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockVersionDeltas>, I>>(object: I): HummockVersionDeltas {
-    const message = createBaseHummockVersionDeltas();
-    message.versionDeltas = object.versionDeltas?.map((e) => HummockVersionDelta.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseHummockSnapshot(): HummockSnapshot {
-  return { committedEpoch: 0, currentEpoch: 0 };
-}
-
-export const HummockSnapshot = {
-  fromJSON(object: any): HummockSnapshot {
-    return {
-      committedEpoch: isSet(object.committedEpoch) ? Number(object.committedEpoch) : 0,
-      currentEpoch: isSet(object.currentEpoch) ? Number(object.currentEpoch) : 0,
-    };
-  },
-
-  toJSON(message: HummockSnapshot): unknown {
-    const obj: any = {};
-    message.committedEpoch !== undefined && (obj.committedEpoch = Math.round(message.committedEpoch));
-    message.currentEpoch !== undefined && (obj.currentEpoch = Math.round(message.currentEpoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockSnapshot>, I>>(object: I): HummockSnapshot {
-    const message = createBaseHummockSnapshot();
-    message.committedEpoch = object.committedEpoch ?? 0;
-    message.currentEpoch = object.currentEpoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseVersionUpdatePayload(): VersionUpdatePayload {
-  return { payload: undefined };
-}
-
-export const VersionUpdatePayload = {
-  fromJSON(object: any): VersionUpdatePayload {
-    return {
-      payload: isSet(object.versionDeltas)
-        ? { $case: "versionDeltas", versionDeltas: HummockVersionDeltas.fromJSON(object.versionDeltas) }
-        : isSet(object.pinnedVersion)
-        ? { $case: "pinnedVersion", pinnedVersion: HummockVersion.fromJSON(object.pinnedVersion) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: VersionUpdatePayload): unknown {
-    const obj: any = {};
-    message.payload?.$case === "versionDeltas" && (obj.versionDeltas = message.payload?.versionDeltas
-      ? HummockVersionDeltas.toJSON(message.payload?.versionDeltas)
-      : undefined);
-    message.payload?.$case === "pinnedVersion" && (obj.pinnedVersion = message.payload?.pinnedVersion
-      ? HummockVersion.toJSON(message.payload?.pinnedVersion)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<VersionUpdatePayload>, I>>(object: I): VersionUpdatePayload {
-    const message = createBaseVersionUpdatePayload();
-    if (
-      object.payload?.$case === "versionDeltas" &&
-      object.payload?.versionDeltas !== undefined &&
-      object.payload?.versionDeltas !== null
-    ) {
-      message.payload = {
-        $case: "versionDeltas",
-        versionDeltas: HummockVersionDeltas.fromPartial(object.payload.versionDeltas),
-      };
-    }
-    if (
-      object.payload?.$case === "pinnedVersion" &&
-      object.payload?.pinnedVersion !== undefined &&
-      object.payload?.pinnedVersion !== null
-    ) {
-      message.payload = {
-        $case: "pinnedVersion",
-        pinnedVersion: HummockVersion.fromPartial(object.payload.pinnedVersion),
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseUnpinVersionBeforeRequest(): UnpinVersionBeforeRequest {
-  return { contextId: 0, unpinVersionBefore: 0 };
-}
-
-export const UnpinVersionBeforeRequest = {
-  fromJSON(object: any): UnpinVersionBeforeRequest {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      unpinVersionBefore: isSet(object.unpinVersionBefore) ? Number(object.unpinVersionBefore) : 0,
-    };
-  },
-
-  toJSON(message: UnpinVersionBeforeRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    message.unpinVersionBefore !== undefined && (obj.unpinVersionBefore = Math.round(message.unpinVersionBefore));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnpinVersionBeforeRequest>, I>>(object: I): UnpinVersionBeforeRequest {
-    const message = createBaseUnpinVersionBeforeRequest();
-    message.contextId = object.contextId ?? 0;
-    message.unpinVersionBefore = object.unpinVersionBefore ?? 0;
-    return message;
-  },
-};
-
-function createBaseUnpinVersionBeforeResponse(): UnpinVersionBeforeResponse {
-  return { status: undefined };
-}
-
-export const UnpinVersionBeforeResponse = {
-  fromJSON(object: any): UnpinVersionBeforeResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: UnpinVersionBeforeResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnpinVersionBeforeResponse>, I>>(object: I): UnpinVersionBeforeResponse {
-    const message = createBaseUnpinVersionBeforeResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseGetCurrentVersionRequest(): GetCurrentVersionRequest {
-  return {};
-}
-
-export const GetCurrentVersionRequest = {
-  fromJSON(_: any): GetCurrentVersionRequest {
-    return {};
-  },
-
-  toJSON(_: GetCurrentVersionRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetCurrentVersionRequest>, I>>(_: I): GetCurrentVersionRequest {
-    const message = createBaseGetCurrentVersionRequest();
-    return message;
-  },
-};
-
-function createBaseGetCurrentVersionResponse(): GetCurrentVersionResponse {
-  return { status: undefined, currentVersion: undefined };
-}
-
-export const GetCurrentVersionResponse = {
-  fromJSON(object: any): GetCurrentVersionResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      currentVersion: isSet(object.currentVersion) ? HummockVersion.fromJSON(object.currentVersion) : undefined,
-    };
-  },
-
-  toJSON(message: GetCurrentVersionResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.currentVersion !== undefined &&
-      (obj.currentVersion = message.currentVersion ? HummockVersion.toJSON(message.currentVersion) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetCurrentVersionResponse>, I>>(object: I): GetCurrentVersionResponse {
-    const message = createBaseGetCurrentVersionResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.currentVersion = (object.currentVersion !== undefined && object.currentVersion !== null)
-      ? HummockVersion.fromPartial(object.currentVersion)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseUnpinVersionRequest(): UnpinVersionRequest {
-  return { contextId: 0 };
-}
-
-export const UnpinVersionRequest = {
-  fromJSON(object: any): UnpinVersionRequest {
-    return { contextId: isSet(object.contextId) ? Number(object.contextId) : 0 };
-  },
-
-  toJSON(message: UnpinVersionRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnpinVersionRequest>, I>>(object: I): UnpinVersionRequest {
-    const message = createBaseUnpinVersionRequest();
-    message.contextId = object.contextId ?? 0;
-    return message;
-  },
-};
-
-function createBaseUnpinVersionResponse(): UnpinVersionResponse {
-  return { status: undefined };
-}
-
-export const UnpinVersionResponse = {
-  fromJSON(object: any): UnpinVersionResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: UnpinVersionResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnpinVersionResponse>, I>>(object: I): UnpinVersionResponse {
-    const message = createBaseUnpinVersionResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBasePinSnapshotRequest(): PinSnapshotRequest {
-  return { contextId: 0 };
-}
-
-export const PinSnapshotRequest = {
-  fromJSON(object: any): PinSnapshotRequest {
-    return { contextId: isSet(object.contextId) ? Number(object.contextId) : 0 };
-  },
-
-  toJSON(message: PinSnapshotRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PinSnapshotRequest>, I>>(object: I): PinSnapshotRequest {
-    const message = createBasePinSnapshotRequest();
-    message.contextId = object.contextId ?? 0;
-    return message;
-  },
-};
-
-function createBasePinSpecificSnapshotRequest(): PinSpecificSnapshotRequest {
-  return { contextId: 0, epoch: 0 };
-}
-
-export const PinSpecificSnapshotRequest = {
-  fromJSON(object: any): PinSpecificSnapshotRequest {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      epoch: isSet(object.epoch) ? Number(object.epoch) : 0,
-    };
-  },
-
-  toJSON(message: PinSpecificSnapshotRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PinSpecificSnapshotRequest>, I>>(object: I): PinSpecificSnapshotRequest {
-    const message = createBasePinSpecificSnapshotRequest();
-    message.contextId = object.contextId ?? 0;
-    message.epoch = object.epoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseGetAssignedCompactTaskNumRequest(): GetAssignedCompactTaskNumRequest {
-  return {};
-}
-
-export const GetAssignedCompactTaskNumRequest = {
-  fromJSON(_: any): GetAssignedCompactTaskNumRequest {
-    return {};
-  },
-
-  toJSON(_: GetAssignedCompactTaskNumRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetAssignedCompactTaskNumRequest>, I>>(
-    _: I,
-  ): GetAssignedCompactTaskNumRequest {
-    const message = createBaseGetAssignedCompactTaskNumRequest();
-    return message;
-  },
-};
-
-function createBaseGetAssignedCompactTaskNumResponse(): GetAssignedCompactTaskNumResponse {
-  return { numTasks: 0 };
-}
-
-export const GetAssignedCompactTaskNumResponse = {
-  fromJSON(object: any): GetAssignedCompactTaskNumResponse {
-    return { numTasks: isSet(object.numTasks) ? Number(object.numTasks) : 0 };
-  },
-
-  toJSON(message: GetAssignedCompactTaskNumResponse): unknown {
-    const obj: any = {};
-    message.numTasks !== undefined && (obj.numTasks = Math.round(message.numTasks));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetAssignedCompactTaskNumResponse>, I>>(
-    object: I,
-  ): GetAssignedCompactTaskNumResponse {
-    const message = createBaseGetAssignedCompactTaskNumResponse();
-    message.numTasks = object.numTasks ?? 0;
-    return message;
-  },
-};
-
-function createBasePinSnapshotResponse(): PinSnapshotResponse {
-  return { status: undefined, snapshot: undefined };
-}
-
-export const PinSnapshotResponse = {
-  fromJSON(object: any): PinSnapshotResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      snapshot: isSet(object.snapshot) ? HummockSnapshot.fromJSON(object.snapshot) : undefined,
-    };
-  },
-
-  toJSON(message: PinSnapshotResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.snapshot !== undefined &&
-      (obj.snapshot = message.snapshot ? HummockSnapshot.toJSON(message.snapshot) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PinSnapshotResponse>, I>>(object: I): PinSnapshotResponse {
-    const message = createBasePinSnapshotResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.snapshot = (object.snapshot !== undefined && object.snapshot !== null)
-      ? HummockSnapshot.fromPartial(object.snapshot)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseGetEpochRequest(): GetEpochRequest {
-  return {};
-}
-
-export const GetEpochRequest = {
-  fromJSON(_: any): GetEpochRequest {
-    return {};
-  },
-
-  toJSON(_: GetEpochRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetEpochRequest>, I>>(_: I): GetEpochRequest {
-    const message = createBaseGetEpochRequest();
-    return message;
-  },
-};
-
-function createBaseGetEpochResponse(): GetEpochResponse {
-  return { status: undefined, snapshot: undefined };
-}
-
-export const GetEpochResponse = {
-  fromJSON(object: any): GetEpochResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      snapshot: isSet(object.snapshot) ? HummockSnapshot.fromJSON(object.snapshot) : undefined,
-    };
-  },
-
-  toJSON(message: GetEpochResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.snapshot !== undefined &&
-      (obj.snapshot = message.snapshot ? HummockSnapshot.toJSON(message.snapshot) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetEpochResponse>, I>>(object: I): GetEpochResponse {
-    const message = createBaseGetEpochResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.snapshot = (object.snapshot !== undefined && object.snapshot !== null)
-      ? HummockSnapshot.fromPartial(object.snapshot)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseUnpinSnapshotRequest(): UnpinSnapshotRequest {
-  return { contextId: 0 };
-}
-
-export const UnpinSnapshotRequest = {
-  fromJSON(object: any): UnpinSnapshotRequest {
-    return { contextId: isSet(object.contextId) ? Number(object.contextId) : 0 };
-  },
-
-  toJSON(message: UnpinSnapshotRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnpinSnapshotRequest>, I>>(object: I): UnpinSnapshotRequest {
-    const message = createBaseUnpinSnapshotRequest();
-    message.contextId = object.contextId ?? 0;
-    return message;
-  },
-};
-
-function createBaseUnpinSnapshotResponse(): UnpinSnapshotResponse {
-  return { status: undefined };
-}
-
-export const UnpinSnapshotResponse = {
-  fromJSON(object: any): UnpinSnapshotResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: UnpinSnapshotResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnpinSnapshotResponse>, I>>(object: I): UnpinSnapshotResponse {
-    const message = createBaseUnpinSnapshotResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseUnpinSnapshotBeforeRequest(): UnpinSnapshotBeforeRequest {
-  return { contextId: 0, minSnapshot: undefined };
-}
-
-export const UnpinSnapshotBeforeRequest = {
-  fromJSON(object: any): UnpinSnapshotBeforeRequest {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      minSnapshot: isSet(object.minSnapshot) ? HummockSnapshot.fromJSON(object.minSnapshot) : undefined,
-    };
-  },
-
-  toJSON(message: UnpinSnapshotBeforeRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    message.minSnapshot !== undefined &&
-      (obj.minSnapshot = message.minSnapshot ? HummockSnapshot.toJSON(message.minSnapshot) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnpinSnapshotBeforeRequest>, I>>(object: I): UnpinSnapshotBeforeRequest {
-    const message = createBaseUnpinSnapshotBeforeRequest();
-    message.contextId = object.contextId ?? 0;
-    message.minSnapshot = (object.minSnapshot !== undefined && object.minSnapshot !== null)
-      ? HummockSnapshot.fromPartial(object.minSnapshot)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseUnpinSnapshotBeforeResponse(): UnpinSnapshotBeforeResponse {
-  return { status: undefined };
-}
-
-export const UnpinSnapshotBeforeResponse = {
-  fromJSON(object: any): UnpinSnapshotBeforeResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: UnpinSnapshotBeforeResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnpinSnapshotBeforeResponse>, I>>(object: I): UnpinSnapshotBeforeResponse {
-    const message = createBaseUnpinSnapshotBeforeResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseKeyRange(): KeyRange {
-  return { left: new Uint8Array(), right: new Uint8Array(), rightExclusive: false };
-}
-
-export const KeyRange = {
-  fromJSON(object: any): KeyRange {
-    return {
-      left: isSet(object.left) ? bytesFromBase64(object.left) : new Uint8Array(),
-      right: isSet(object.right) ? bytesFromBase64(object.right) : new Uint8Array(),
-      rightExclusive: isSet(object.rightExclusive) ? Boolean(object.rightExclusive) : false,
-    };
-  },
-
-  toJSON(message: KeyRange): unknown {
-    const obj: any = {};
-    message.left !== undefined &&
-      (obj.left = base64FromBytes(message.left !== undefined ? message.left : new Uint8Array()));
-    message.right !== undefined &&
-      (obj.right = base64FromBytes(message.right !== undefined ? message.right : new Uint8Array()));
-    message.rightExclusive !== undefined && (obj.rightExclusive = message.rightExclusive);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<KeyRange>, I>>(object: I): KeyRange {
-    const message = createBaseKeyRange();
-    message.left = object.left ?? new Uint8Array();
-    message.right = object.right ?? new Uint8Array();
-    message.rightExclusive = object.rightExclusive ?? false;
-    return message;
-  },
-};
-
-function createBaseTableOption(): TableOption {
-  return { retentionSeconds: 0 };
-}
-
-export const TableOption = {
-  fromJSON(object: any): TableOption {
-    return { retentionSeconds: isSet(object.retentionSeconds) ? Number(object.retentionSeconds) : 0 };
-  },
-
-  toJSON(message: TableOption): unknown {
-    const obj: any = {};
-    message.retentionSeconds !== undefined && (obj.retentionSeconds = Math.round(message.retentionSeconds));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableOption>, I>>(object: I): TableOption {
-    const message = createBaseTableOption();
-    message.retentionSeconds = object.retentionSeconds ?? 0;
-    return message;
-  },
-};
-
-function createBaseCompactTask(): CompactTask {
-  return {
-    inputSsts: [],
-    splits: [],
-    watermark: 0,
-    sortedOutputSsts: [],
-    taskId: 0,
-    targetLevel: 0,
-    gcDeleteKeys: false,
-    taskStatus: CompactTask_TaskStatus.UNSPECIFIED,
-    compactionGroupId: 0,
-    existingTableIds: [],
-    compressionAlgorithm: 0,
-    targetFileSize: 0,
-    compactionFilterMask: 0,
-    tableOptions: {},
-    currentEpochTime: 0,
-    targetSubLevelId: 0,
-    taskType: CompactTask_TaskType.TYPE_UNSPECIFIED,
-    splitByStateTable: false,
-  };
-}
-
-export const CompactTask = {
-  fromJSON(object: any): CompactTask {
-    return {
-      inputSsts: Array.isArray(object?.inputSsts) ? object.inputSsts.map((e: any) => InputLevel.fromJSON(e)) : [],
-      splits: Array.isArray(object?.splits) ? object.splits.map((e: any) => KeyRange.fromJSON(e)) : [],
-      watermark: isSet(object.watermark) ? Number(object.watermark) : 0,
-      sortedOutputSsts: Array.isArray(object?.sortedOutputSsts)
-        ? object.sortedOutputSsts.map((e: any) => SstableInfo.fromJSON(e))
-        : [],
-      taskId: isSet(object.taskId) ? Number(object.taskId) : 0,
-      targetLevel: isSet(object.targetLevel) ? Number(object.targetLevel) : 0,
-      gcDeleteKeys: isSet(object.gcDeleteKeys) ? Boolean(object.gcDeleteKeys) : false,
-      taskStatus: isSet(object.taskStatus)
-        ? compactTask_TaskStatusFromJSON(object.taskStatus)
-        : CompactTask_TaskStatus.UNSPECIFIED,
-      compactionGroupId: isSet(object.compactionGroupId) ? Number(object.compactionGroupId) : 0,
-      existingTableIds: Array.isArray(object?.existingTableIds)
-        ? object.existingTableIds.map((e: any) => Number(e))
-        : [],
-      compressionAlgorithm: isSet(object.compressionAlgorithm) ? Number(object.compressionAlgorithm) : 0,
-      targetFileSize: isSet(object.targetFileSize) ? Number(object.targetFileSize) : 0,
-      compactionFilterMask: isSet(object.compactionFilterMask) ? Number(object.compactionFilterMask) : 0,
-      tableOptions: isObject(object.tableOptions)
-        ? Object.entries(object.tableOptions).reduce<{ [key: number]: TableOption }>((acc, [key, value]) => {
-          acc[Number(key)] = TableOption.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-      currentEpochTime: isSet(object.currentEpochTime) ? Number(object.currentEpochTime) : 0,
-      targetSubLevelId: isSet(object.targetSubLevelId) ? Number(object.targetSubLevelId) : 0,
-      taskType: isSet(object.taskType)
-        ? compactTask_TaskTypeFromJSON(object.taskType)
-        : CompactTask_TaskType.TYPE_UNSPECIFIED,
-      splitByStateTable: isSet(object.splitByStateTable) ? Boolean(object.splitByStateTable) : false,
-    };
-  },
-
-  toJSON(message: CompactTask): unknown {
-    const obj: any = {};
-    if (message.inputSsts) {
-      obj.inputSsts = message.inputSsts.map((e) => e ? InputLevel.toJSON(e) : undefined);
-    } else {
-      obj.inputSsts = [];
-    }
-    if (message.splits) {
-      obj.splits = message.splits.map((e) => e ? KeyRange.toJSON(e) : undefined);
-    } else {
-      obj.splits = [];
-    }
-    message.watermark !== undefined && (obj.watermark = Math.round(message.watermark));
-    if (message.sortedOutputSsts) {
-      obj.sortedOutputSsts = message.sortedOutputSsts.map((e) => e ? SstableInfo.toJSON(e) : undefined);
-    } else {
-      obj.sortedOutputSsts = [];
-    }
-    message.taskId !== undefined && (obj.taskId = Math.round(message.taskId));
-    message.targetLevel !== undefined && (obj.targetLevel = Math.round(message.targetLevel));
-    message.gcDeleteKeys !== undefined && (obj.gcDeleteKeys = message.gcDeleteKeys);
-    message.taskStatus !== undefined && (obj.taskStatus = compactTask_TaskStatusToJSON(message.taskStatus));
-    message.compactionGroupId !== undefined && (obj.compactionGroupId = Math.round(message.compactionGroupId));
-    if (message.existingTableIds) {
-      obj.existingTableIds = message.existingTableIds.map((e) => Math.round(e));
-    } else {
-      obj.existingTableIds = [];
-    }
-    message.compressionAlgorithm !== undefined && (obj.compressionAlgorithm = Math.round(message.compressionAlgorithm));
-    message.targetFileSize !== undefined && (obj.targetFileSize = Math.round(message.targetFileSize));
-    message.compactionFilterMask !== undefined && (obj.compactionFilterMask = Math.round(message.compactionFilterMask));
-    obj.tableOptions = {};
-    if (message.tableOptions) {
-      Object.entries(message.tableOptions).forEach(([k, v]) => {
-        obj.tableOptions[k] = TableOption.toJSON(v);
-      });
-    }
-    message.currentEpochTime !== undefined && (obj.currentEpochTime = Math.round(message.currentEpochTime));
-    message.targetSubLevelId !== undefined && (obj.targetSubLevelId = Math.round(message.targetSubLevelId));
-    message.taskType !== undefined && (obj.taskType = compactTask_TaskTypeToJSON(message.taskType));
-    message.splitByStateTable !== undefined && (obj.splitByStateTable = message.splitByStateTable);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CompactTask>, I>>(object: I): CompactTask {
-    const message = createBaseCompactTask();
-    message.inputSsts = object.inputSsts?.map((e) => InputLevel.fromPartial(e)) || [];
-    message.splits = object.splits?.map((e) => KeyRange.fromPartial(e)) || [];
-    message.watermark = object.watermark ?? 0;
-    message.sortedOutputSsts = object.sortedOutputSsts?.map((e) => SstableInfo.fromPartial(e)) || [];
-    message.taskId = object.taskId ?? 0;
-    message.targetLevel = object.targetLevel ?? 0;
-    message.gcDeleteKeys = object.gcDeleteKeys ?? false;
-    message.taskStatus = object.taskStatus ?? CompactTask_TaskStatus.UNSPECIFIED;
-    message.compactionGroupId = object.compactionGroupId ?? 0;
-    message.existingTableIds = object.existingTableIds?.map((e) => e) || [];
-    message.compressionAlgorithm = object.compressionAlgorithm ?? 0;
-    message.targetFileSize = object.targetFileSize ?? 0;
-    message.compactionFilterMask = object.compactionFilterMask ?? 0;
-    message.tableOptions = Object.entries(object.tableOptions ?? {}).reduce<{ [key: number]: TableOption }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = TableOption.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.currentEpochTime = object.currentEpochTime ?? 0;
-    message.targetSubLevelId = object.targetSubLevelId ?? 0;
-    message.taskType = object.taskType ?? CompactTask_TaskType.TYPE_UNSPECIFIED;
-    message.splitByStateTable = object.splitByStateTable ?? false;
-    return message;
-  },
-};
-
-function createBaseCompactTask_TableOptionsEntry(): CompactTask_TableOptionsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const CompactTask_TableOptionsEntry = {
-  fromJSON(object: any): CompactTask_TableOptionsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? TableOption.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: CompactTask_TableOptionsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? TableOption.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CompactTask_TableOptionsEntry>, I>>(
-    object: I,
-  ): CompactTask_TableOptionsEntry {
-    const message = createBaseCompactTask_TableOptionsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? TableOption.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseLevelHandler(): LevelHandler {
-  return { level: 0, tasks: [] };
-}
-
-export const LevelHandler = {
-  fromJSON(object: any): LevelHandler {
-    return {
-      level: isSet(object.level) ? Number(object.level) : 0,
-      tasks: Array.isArray(object?.tasks)
-        ? object.tasks.map((e: any) => LevelHandler_RunningCompactTask.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: LevelHandler): unknown {
-    const obj: any = {};
-    message.level !== undefined && (obj.level = Math.round(message.level));
-    if (message.tasks) {
-      obj.tasks = message.tasks.map((e) => e ? LevelHandler_RunningCompactTask.toJSON(e) : undefined);
-    } else {
-      obj.tasks = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<LevelHandler>, I>>(object: I): LevelHandler {
-    const message = createBaseLevelHandler();
-    message.level = object.level ?? 0;
-    message.tasks = object.tasks?.map((e) => LevelHandler_RunningCompactTask.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseLevelHandler_RunningCompactTask(): LevelHandler_RunningCompactTask {
-  return { taskId: 0, ssts: [], totalFileSize: 0, targetLevel: 0 };
-}
-
-export const LevelHandler_RunningCompactTask = {
-  fromJSON(object: any): LevelHandler_RunningCompactTask {
-    return {
-      taskId: isSet(object.taskId) ? Number(object.taskId) : 0,
-      ssts: Array.isArray(object?.ssts) ? object.ssts.map((e: any) => Number(e)) : [],
-      totalFileSize: isSet(object.totalFileSize) ? Number(object.totalFileSize) : 0,
-      targetLevel: isSet(object.targetLevel) ? Number(object.targetLevel) : 0,
-    };
-  },
-
-  toJSON(message: LevelHandler_RunningCompactTask): unknown {
-    const obj: any = {};
-    message.taskId !== undefined && (obj.taskId = Math.round(message.taskId));
-    if (message.ssts) {
-      obj.ssts = message.ssts.map((e) => Math.round(e));
-    } else {
-      obj.ssts = [];
-    }
-    message.totalFileSize !== undefined && (obj.totalFileSize = Math.round(message.totalFileSize));
-    message.targetLevel !== undefined && (obj.targetLevel = Math.round(message.targetLevel));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<LevelHandler_RunningCompactTask>, I>>(
-    object: I,
-  ): LevelHandler_RunningCompactTask {
-    const message = createBaseLevelHandler_RunningCompactTask();
-    message.taskId = object.taskId ?? 0;
-    message.ssts = object.ssts?.map((e) => e) || [];
-    message.totalFileSize = object.totalFileSize ?? 0;
-    message.targetLevel = object.targetLevel ?? 0;
-    return message;
-  },
-};
-
-function createBaseCompactStatus(): CompactStatus {
-  return { compactionGroupId: 0, levelHandlers: [] };
-}
-
-export const CompactStatus = {
-  fromJSON(object: any): CompactStatus {
-    return {
-      compactionGroupId: isSet(object.compactionGroupId) ? Number(object.compactionGroupId) : 0,
-      levelHandlers: Array.isArray(object?.levelHandlers)
-        ? object.levelHandlers.map((e: any) => LevelHandler.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: CompactStatus): unknown {
-    const obj: any = {};
-    message.compactionGroupId !== undefined && (obj.compactionGroupId = Math.round(message.compactionGroupId));
-    if (message.levelHandlers) {
-      obj.levelHandlers = message.levelHandlers.map((e) => e ? LevelHandler.toJSON(e) : undefined);
-    } else {
-      obj.levelHandlers = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CompactStatus>, I>>(object: I): CompactStatus {
-    const message = createBaseCompactStatus();
-    message.compactionGroupId = object.compactionGroupId ?? 0;
-    message.levelHandlers = object.levelHandlers?.map((e) => LevelHandler.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseCompactionGroup(): CompactionGroup {
-  return { id: 0, compactionConfig: undefined };
-}
-
-export const CompactionGroup = {
-  fromJSON(object: any): CompactionGroup {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      compactionConfig: isSet(object.compactionConfig) ? CompactionConfig.fromJSON(object.compactionConfig) : undefined,
-    };
-  },
-
-  toJSON(message: CompactionGroup): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.compactionConfig !== undefined &&
-      (obj.compactionConfig = message.compactionConfig ? CompactionConfig.toJSON(message.compactionConfig) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CompactionGroup>, I>>(object: I): CompactionGroup {
-    const message = createBaseCompactionGroup();
-    message.id = object.id ?? 0;
-    message.compactionConfig = (object.compactionConfig !== undefined && object.compactionConfig !== null)
-      ? CompactionConfig.fromPartial(object.compactionConfig)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCompactionGroupInfo(): CompactionGroupInfo {
-  return { id: 0, parentId: 0, memberTableIds: [], compactionConfig: undefined };
-}
-
-export const CompactionGroupInfo = {
-  fromJSON(object: any): CompactionGroupInfo {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      parentId: isSet(object.parentId) ? Number(object.parentId) : 0,
-      memberTableIds: Array.isArray(object?.memberTableIds) ? object.memberTableIds.map((e: any) => Number(e)) : [],
-      compactionConfig: isSet(object.compactionConfig) ? CompactionConfig.fromJSON(object.compactionConfig) : undefined,
-    };
-  },
-
-  toJSON(message: CompactionGroupInfo): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.parentId !== undefined && (obj.parentId = Math.round(message.parentId));
-    if (message.memberTableIds) {
-      obj.memberTableIds = message.memberTableIds.map((e) => Math.round(e));
-    } else {
-      obj.memberTableIds = [];
-    }
-    message.compactionConfig !== undefined &&
-      (obj.compactionConfig = message.compactionConfig ? CompactionConfig.toJSON(message.compactionConfig) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CompactionGroupInfo>, I>>(object: I): CompactionGroupInfo {
-    const message = createBaseCompactionGroupInfo();
-    message.id = object.id ?? 0;
-    message.parentId = object.parentId ?? 0;
-    message.memberTableIds = object.memberTableIds?.map((e) => e) || [];
-    message.compactionConfig = (object.compactionConfig !== undefined && object.compactionConfig !== null)
-      ? CompactionConfig.fromPartial(object.compactionConfig)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCompactTaskAssignment(): CompactTaskAssignment {
-  return { compactTask: undefined, contextId: 0 };
-}
-
-export const CompactTaskAssignment = {
-  fromJSON(object: any): CompactTaskAssignment {
-    return {
-      compactTask: isSet(object.compactTask) ? CompactTask.fromJSON(object.compactTask) : undefined,
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-    };
-  },
-
-  toJSON(message: CompactTaskAssignment): unknown {
-    const obj: any = {};
-    message.compactTask !== undefined &&
-      (obj.compactTask = message.compactTask ? CompactTask.toJSON(message.compactTask) : undefined);
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CompactTaskAssignment>, I>>(object: I): CompactTaskAssignment {
-    const message = createBaseCompactTaskAssignment();
-    message.compactTask = (object.compactTask !== undefined && object.compactTask !== null)
-      ? CompactTask.fromPartial(object.compactTask)
-      : undefined;
-    message.contextId = object.contextId ?? 0;
-    return message;
-  },
-};
-
-function createBaseGetCompactionTasksRequest(): GetCompactionTasksRequest {
-  return {};
-}
-
-export const GetCompactionTasksRequest = {
-  fromJSON(_: any): GetCompactionTasksRequest {
-    return {};
-  },
-
-  toJSON(_: GetCompactionTasksRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetCompactionTasksRequest>, I>>(_: I): GetCompactionTasksRequest {
-    const message = createBaseGetCompactionTasksRequest();
-    return message;
-  },
-};
-
-function createBaseGetCompactionTasksResponse(): GetCompactionTasksResponse {
-  return { status: undefined, compactTask: undefined };
-}
-
-export const GetCompactionTasksResponse = {
-  fromJSON(object: any): GetCompactionTasksResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      compactTask: isSet(object.compactTask) ? CompactTask.fromJSON(object.compactTask) : undefined,
-    };
-  },
-
-  toJSON(message: GetCompactionTasksResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.compactTask !== undefined &&
-      (obj.compactTask = message.compactTask ? CompactTask.toJSON(message.compactTask) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetCompactionTasksResponse>, I>>(object: I): GetCompactionTasksResponse {
-    const message = createBaseGetCompactionTasksResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.compactTask = (object.compactTask !== undefined && object.compactTask !== null)
-      ? CompactTask.fromPartial(object.compactTask)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseReportCompactionTasksRequest(): ReportCompactionTasksRequest {
-  return { contextId: 0, compactTask: undefined, tableStatsChange: {} };
-}
-
-export const ReportCompactionTasksRequest = {
-  fromJSON(object: any): ReportCompactionTasksRequest {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      compactTask: isSet(object.compactTask) ? CompactTask.fromJSON(object.compactTask) : undefined,
-      tableStatsChange: isObject(object.tableStatsChange)
-        ? Object.entries(object.tableStatsChange).reduce<{ [key: number]: TableStats }>((acc, [key, value]) => {
-          acc[Number(key)] = TableStats.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: ReportCompactionTasksRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    message.compactTask !== undefined &&
-      (obj.compactTask = message.compactTask ? CompactTask.toJSON(message.compactTask) : undefined);
-    obj.tableStatsChange = {};
-    if (message.tableStatsChange) {
-      Object.entries(message.tableStatsChange).forEach(([k, v]) => {
-        obj.tableStatsChange[k] = TableStats.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReportCompactionTasksRequest>, I>>(object: I): ReportCompactionTasksRequest {
-    const message = createBaseReportCompactionTasksRequest();
-    message.contextId = object.contextId ?? 0;
-    message.compactTask = (object.compactTask !== undefined && object.compactTask !== null)
-      ? CompactTask.fromPartial(object.compactTask)
-      : undefined;
-    message.tableStatsChange = Object.entries(object.tableStatsChange ?? {}).reduce<{ [key: number]: TableStats }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = TableStats.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseReportCompactionTasksRequest_TableStatsChangeEntry(): ReportCompactionTasksRequest_TableStatsChangeEntry {
-  return { key: 0, value: undefined };
-}
-
-export const ReportCompactionTasksRequest_TableStatsChangeEntry = {
-  fromJSON(object: any): ReportCompactionTasksRequest_TableStatsChangeEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? TableStats.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: ReportCompactionTasksRequest_TableStatsChangeEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? TableStats.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReportCompactionTasksRequest_TableStatsChangeEntry>, I>>(
-    object: I,
-  ): ReportCompactionTasksRequest_TableStatsChangeEntry {
-    const message = createBaseReportCompactionTasksRequest_TableStatsChangeEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? TableStats.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseReportCompactionTasksResponse(): ReportCompactionTasksResponse {
-  return { status: undefined };
-}
-
-export const ReportCompactionTasksResponse = {
-  fromJSON(object: any): ReportCompactionTasksResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: ReportCompactionTasksResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReportCompactionTasksResponse>, I>>(
-    object: I,
-  ): ReportCompactionTasksResponse {
-    const message = createBaseReportCompactionTasksResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseHummockPinnedVersion(): HummockPinnedVersion {
-  return { contextId: 0, minPinnedId: 0 };
-}
-
-export const HummockPinnedVersion = {
-  fromJSON(object: any): HummockPinnedVersion {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      minPinnedId: isSet(object.minPinnedId) ? Number(object.minPinnedId) : 0,
-    };
-  },
-
-  toJSON(message: HummockPinnedVersion): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    message.minPinnedId !== undefined && (obj.minPinnedId = Math.round(message.minPinnedId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockPinnedVersion>, I>>(object: I): HummockPinnedVersion {
-    const message = createBaseHummockPinnedVersion();
-    message.contextId = object.contextId ?? 0;
-    message.minPinnedId = object.minPinnedId ?? 0;
-    return message;
-  },
-};
-
-function createBaseHummockPinnedSnapshot(): HummockPinnedSnapshot {
-  return { contextId: 0, minimalPinnedSnapshot: 0 };
-}
-
-export const HummockPinnedSnapshot = {
-  fromJSON(object: any): HummockPinnedSnapshot {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      minimalPinnedSnapshot: isSet(object.minimalPinnedSnapshot) ? Number(object.minimalPinnedSnapshot) : 0,
-    };
-  },
-
-  toJSON(message: HummockPinnedSnapshot): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    message.minimalPinnedSnapshot !== undefined &&
-      (obj.minimalPinnedSnapshot = Math.round(message.minimalPinnedSnapshot));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockPinnedSnapshot>, I>>(object: I): HummockPinnedSnapshot {
-    const message = createBaseHummockPinnedSnapshot();
-    message.contextId = object.contextId ?? 0;
-    message.minimalPinnedSnapshot = object.minimalPinnedSnapshot ?? 0;
-    return message;
-  },
-};
-
-function createBaseGetNewSstIdsRequest(): GetNewSstIdsRequest {
-  return { number: 0 };
-}
-
-export const GetNewSstIdsRequest = {
-  fromJSON(object: any): GetNewSstIdsRequest {
-    return { number: isSet(object.number) ? Number(object.number) : 0 };
-  },
-
-  toJSON(message: GetNewSstIdsRequest): unknown {
-    const obj: any = {};
-    message.number !== undefined && (obj.number = Math.round(message.number));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetNewSstIdsRequest>, I>>(object: I): GetNewSstIdsRequest {
-    const message = createBaseGetNewSstIdsRequest();
-    message.number = object.number ?? 0;
-    return message;
-  },
-};
-
-function createBaseGetNewSstIdsResponse(): GetNewSstIdsResponse {
-  return { status: undefined, startId: 0, endId: 0 };
-}
-
-export const GetNewSstIdsResponse = {
-  fromJSON(object: any): GetNewSstIdsResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      startId: isSet(object.startId) ? Number(object.startId) : 0,
-      endId: isSet(object.endId) ? Number(object.endId) : 0,
-    };
-  },
-
-  toJSON(message: GetNewSstIdsResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.startId !== undefined && (obj.startId = Math.round(message.startId));
-    message.endId !== undefined && (obj.endId = Math.round(message.endId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetNewSstIdsResponse>, I>>(object: I): GetNewSstIdsResponse {
-    const message = createBaseGetNewSstIdsResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.startId = object.startId ?? 0;
-    message.endId = object.endId ?? 0;
-    return message;
-  },
-};
-
-function createBaseCompactTaskProgress(): CompactTaskProgress {
-  return { taskId: 0, numSstsSealed: 0, numSstsUploaded: 0 };
-}
-
-export const CompactTaskProgress = {
-  fromJSON(object: any): CompactTaskProgress {
-    return {
-      taskId: isSet(object.taskId) ? Number(object.taskId) : 0,
-      numSstsSealed: isSet(object.numSstsSealed) ? Number(object.numSstsSealed) : 0,
-      numSstsUploaded: isSet(object.numSstsUploaded) ? Number(object.numSstsUploaded) : 0,
-    };
-  },
-
-  toJSON(message: CompactTaskProgress): unknown {
-    const obj: any = {};
-    message.taskId !== undefined && (obj.taskId = Math.round(message.taskId));
-    message.numSstsSealed !== undefined && (obj.numSstsSealed = Math.round(message.numSstsSealed));
-    message.numSstsUploaded !== undefined && (obj.numSstsUploaded = Math.round(message.numSstsUploaded));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CompactTaskProgress>, I>>(object: I): CompactTaskProgress {
-    const message = createBaseCompactTaskProgress();
-    message.taskId = object.taskId ?? 0;
-    message.numSstsSealed = object.numSstsSealed ?? 0;
-    message.numSstsUploaded = object.numSstsUploaded ?? 0;
-    return message;
-  },
-};
-
-function createBaseReportCompactionTaskProgressRequest(): ReportCompactionTaskProgressRequest {
-  return { contextId: 0, progress: [] };
-}
-
-export const ReportCompactionTaskProgressRequest = {
-  fromJSON(object: any): ReportCompactionTaskProgressRequest {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      progress: Array.isArray(object?.progress) ? object.progress.map((e: any) => CompactTaskProgress.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: ReportCompactionTaskProgressRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    if (message.progress) {
-      obj.progress = message.progress.map((e) => e ? CompactTaskProgress.toJSON(e) : undefined);
-    } else {
-      obj.progress = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReportCompactionTaskProgressRequest>, I>>(
-    object: I,
-  ): ReportCompactionTaskProgressRequest {
-    const message = createBaseReportCompactionTaskProgressRequest();
-    message.contextId = object.contextId ?? 0;
-    message.progress = object.progress?.map((e) => CompactTaskProgress.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseReportCompactionTaskProgressResponse(): ReportCompactionTaskProgressResponse {
-  return { status: undefined };
-}
-
-export const ReportCompactionTaskProgressResponse = {
-  fromJSON(object: any): ReportCompactionTaskProgressResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: ReportCompactionTaskProgressResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReportCompactionTaskProgressResponse>, I>>(
-    object: I,
-  ): ReportCompactionTaskProgressResponse {
-    const message = createBaseReportCompactionTaskProgressResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSubscribeCompactTasksRequest(): SubscribeCompactTasksRequest {
-  return { contextId: 0, maxConcurrentTaskNumber: 0 };
-}
-
-export const SubscribeCompactTasksRequest = {
-  fromJSON(object: any): SubscribeCompactTasksRequest {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      maxConcurrentTaskNumber: isSet(object.maxConcurrentTaskNumber) ? Number(object.maxConcurrentTaskNumber) : 0,
-    };
-  },
-
-  toJSON(message: SubscribeCompactTasksRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    message.maxConcurrentTaskNumber !== undefined &&
-      (obj.maxConcurrentTaskNumber = Math.round(message.maxConcurrentTaskNumber));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SubscribeCompactTasksRequest>, I>>(object: I): SubscribeCompactTasksRequest {
-    const message = createBaseSubscribeCompactTasksRequest();
-    message.contextId = object.contextId ?? 0;
-    message.maxConcurrentTaskNumber = object.maxConcurrentTaskNumber ?? 0;
-    return message;
-  },
-};
-
-function createBaseValidationTask(): ValidationTask {
-  return { sstInfos: [], sstIdToWorkerId: {}, epoch: 0 };
-}
-
-export const ValidationTask = {
-  fromJSON(object: any): ValidationTask {
-    return {
-      sstInfos: Array.isArray(object?.sstInfos) ? object.sstInfos.map((e: any) => SstableInfo.fromJSON(e)) : [],
-      sstIdToWorkerId: isObject(object.sstIdToWorkerId)
-        ? Object.entries(object.sstIdToWorkerId).reduce<{ [key: number]: number }>((acc, [key, value]) => {
-          acc[Number(key)] = Number(value);
-          return acc;
-        }, {})
-        : {},
-      epoch: isSet(object.epoch) ? Number(object.epoch) : 0,
-    };
-  },
-
-  toJSON(message: ValidationTask): unknown {
-    const obj: any = {};
-    if (message.sstInfos) {
-      obj.sstInfos = message.sstInfos.map((e) => e ? SstableInfo.toJSON(e) : undefined);
-    } else {
-      obj.sstInfos = [];
-    }
-    obj.sstIdToWorkerId = {};
-    if (message.sstIdToWorkerId) {
-      Object.entries(message.sstIdToWorkerId).forEach(([k, v]) => {
-        obj.sstIdToWorkerId[k] = Math.round(v);
-      });
-    }
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ValidationTask>, I>>(object: I): ValidationTask {
-    const message = createBaseValidationTask();
-    message.sstInfos = object.sstInfos?.map((e) => SstableInfo.fromPartial(e)) || [];
-    message.sstIdToWorkerId = Object.entries(object.sstIdToWorkerId ?? {}).reduce<{ [key: number]: number }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = Number(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.epoch = object.epoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseValidationTask_SstIdToWorkerIdEntry(): ValidationTask_SstIdToWorkerIdEntry {
-  return { key: 0, value: 0 };
-}
-
-export const ValidationTask_SstIdToWorkerIdEntry = {
-  fromJSON(object: any): ValidationTask_SstIdToWorkerIdEntry {
-    return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? Number(object.value) : 0 };
-  },
-
-  toJSON(message: ValidationTask_SstIdToWorkerIdEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = Math.round(message.value));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ValidationTask_SstIdToWorkerIdEntry>, I>>(
-    object: I,
-  ): ValidationTask_SstIdToWorkerIdEntry {
-    const message = createBaseValidationTask_SstIdToWorkerIdEntry();
-    message.key = object.key ?? 0;
-    message.value = object.value ?? 0;
-    return message;
-  },
-};
-
-function createBaseSubscribeCompactTasksResponse(): SubscribeCompactTasksResponse {
-  return { task: undefined };
-}
-
-export const SubscribeCompactTasksResponse = {
-  fromJSON(object: any): SubscribeCompactTasksResponse {
-    return {
-      task: isSet(object.compactTask)
-        ? { $case: "compactTask", compactTask: CompactTask.fromJSON(object.compactTask) }
-        : isSet(object.vacuumTask)
-        ? { $case: "vacuumTask", vacuumTask: VacuumTask.fromJSON(object.vacuumTask) }
-        : isSet(object.fullScanTask)
-        ? { $case: "fullScanTask", fullScanTask: FullScanTask.fromJSON(object.fullScanTask) }
-        : isSet(object.validationTask)
-        ? { $case: "validationTask", validationTask: ValidationTask.fromJSON(object.validationTask) }
-        : isSet(object.cancelCompactTask)
-        ? { $case: "cancelCompactTask", cancelCompactTask: CancelCompactTask.fromJSON(object.cancelCompactTask) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: SubscribeCompactTasksResponse): unknown {
-    const obj: any = {};
-    message.task?.$case === "compactTask" &&
-      (obj.compactTask = message.task?.compactTask ? CompactTask.toJSON(message.task?.compactTask) : undefined);
-    message.task?.$case === "vacuumTask" &&
-      (obj.vacuumTask = message.task?.vacuumTask ? VacuumTask.toJSON(message.task?.vacuumTask) : undefined);
-    message.task?.$case === "fullScanTask" &&
-      (obj.fullScanTask = message.task?.fullScanTask ? FullScanTask.toJSON(message.task?.fullScanTask) : undefined);
-    message.task?.$case === "validationTask" && (obj.validationTask = message.task?.validationTask
-      ? ValidationTask.toJSON(message.task?.validationTask)
-      : undefined);
-    message.task?.$case === "cancelCompactTask" && (obj.cancelCompactTask = message.task?.cancelCompactTask
-      ? CancelCompactTask.toJSON(message.task?.cancelCompactTask)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SubscribeCompactTasksResponse>, I>>(
-    object: I,
-  ): SubscribeCompactTasksResponse {
-    const message = createBaseSubscribeCompactTasksResponse();
-    if (
-      object.task?.$case === "compactTask" &&
-      object.task?.compactTask !== undefined &&
-      object.task?.compactTask !== null
-    ) {
-      message.task = { $case: "compactTask", compactTask: CompactTask.fromPartial(object.task.compactTask) };
-    }
-    if (
-      object.task?.$case === "vacuumTask" && object.task?.vacuumTask !== undefined && object.task?.vacuumTask !== null
-    ) {
-      message.task = { $case: "vacuumTask", vacuumTask: VacuumTask.fromPartial(object.task.vacuumTask) };
-    }
-    if (
-      object.task?.$case === "fullScanTask" &&
-      object.task?.fullScanTask !== undefined &&
-      object.task?.fullScanTask !== null
-    ) {
-      message.task = { $case: "fullScanTask", fullScanTask: FullScanTask.fromPartial(object.task.fullScanTask) };
-    }
-    if (
-      object.task?.$case === "validationTask" &&
-      object.task?.validationTask !== undefined &&
-      object.task?.validationTask !== null
-    ) {
-      message.task = {
-        $case: "validationTask",
-        validationTask: ValidationTask.fromPartial(object.task.validationTask),
-      };
-    }
-    if (
-      object.task?.$case === "cancelCompactTask" &&
-      object.task?.cancelCompactTask !== undefined &&
-      object.task?.cancelCompactTask !== null
-    ) {
-      message.task = {
-        $case: "cancelCompactTask",
-        cancelCompactTask: CancelCompactTask.fromPartial(object.task.cancelCompactTask),
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseVacuumTask(): VacuumTask {
-  return { sstableObjectIds: [] };
-}
-
-export const VacuumTask = {
-  fromJSON(object: any): VacuumTask {
-    return {
-      sstableObjectIds: Array.isArray(object?.sstableObjectIds)
-        ? object.sstableObjectIds.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: VacuumTask): unknown {
-    const obj: any = {};
-    if (message.sstableObjectIds) {
-      obj.sstableObjectIds = message.sstableObjectIds.map((e) => Math.round(e));
-    } else {
-      obj.sstableObjectIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<VacuumTask>, I>>(object: I): VacuumTask {
-    const message = createBaseVacuumTask();
-    message.sstableObjectIds = object.sstableObjectIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseFullScanTask(): FullScanTask {
-  return { sstRetentionTimeSec: 0 };
-}
-
-export const FullScanTask = {
-  fromJSON(object: any): FullScanTask {
-    return { sstRetentionTimeSec: isSet(object.sstRetentionTimeSec) ? Number(object.sstRetentionTimeSec) : 0 };
-  },
-
-  toJSON(message: FullScanTask): unknown {
-    const obj: any = {};
-    message.sstRetentionTimeSec !== undefined && (obj.sstRetentionTimeSec = Math.round(message.sstRetentionTimeSec));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<FullScanTask>, I>>(object: I): FullScanTask {
-    const message = createBaseFullScanTask();
-    message.sstRetentionTimeSec = object.sstRetentionTimeSec ?? 0;
-    return message;
-  },
-};
-
-function createBaseCancelCompactTask(): CancelCompactTask {
-  return { contextId: 0, taskId: 0 };
-}
-
-export const CancelCompactTask = {
-  fromJSON(object: any): CancelCompactTask {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      taskId: isSet(object.taskId) ? Number(object.taskId) : 0,
-    };
-  },
-
-  toJSON(message: CancelCompactTask): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    message.taskId !== undefined && (obj.taskId = Math.round(message.taskId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CancelCompactTask>, I>>(object: I): CancelCompactTask {
-    const message = createBaseCancelCompactTask();
-    message.contextId = object.contextId ?? 0;
-    message.taskId = object.taskId ?? 0;
-    return message;
-  },
-};
-
-function createBaseReportVacuumTaskRequest(): ReportVacuumTaskRequest {
-  return { vacuumTask: undefined };
-}
-
-export const ReportVacuumTaskRequest = {
-  fromJSON(object: any): ReportVacuumTaskRequest {
-    return { vacuumTask: isSet(object.vacuumTask) ? VacuumTask.fromJSON(object.vacuumTask) : undefined };
-  },
-
-  toJSON(message: ReportVacuumTaskRequest): unknown {
-    const obj: any = {};
-    message.vacuumTask !== undefined &&
-      (obj.vacuumTask = message.vacuumTask ? VacuumTask.toJSON(message.vacuumTask) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReportVacuumTaskRequest>, I>>(object: I): ReportVacuumTaskRequest {
-    const message = createBaseReportVacuumTaskRequest();
-    message.vacuumTask = (object.vacuumTask !== undefined && object.vacuumTask !== null)
-      ? VacuumTask.fromPartial(object.vacuumTask)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseReportVacuumTaskResponse(): ReportVacuumTaskResponse {
-  return { status: undefined };
-}
-
-export const ReportVacuumTaskResponse = {
-  fromJSON(object: any): ReportVacuumTaskResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: ReportVacuumTaskResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReportVacuumTaskResponse>, I>>(object: I): ReportVacuumTaskResponse {
-    const message = createBaseReportVacuumTaskResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseTriggerManualCompactionRequest(): TriggerManualCompactionRequest {
-  return { compactionGroupId: 0, keyRange: undefined, tableId: 0, level: 0, sstIds: [] };
-}
-
-export const TriggerManualCompactionRequest = {
-  fromJSON(object: any): TriggerManualCompactionRequest {
-    return {
-      compactionGroupId: isSet(object.compactionGroupId) ? Number(object.compactionGroupId) : 0,
-      keyRange: isSet(object.keyRange) ? KeyRange.fromJSON(object.keyRange) : undefined,
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      level: isSet(object.level) ? Number(object.level) : 0,
-      sstIds: Array.isArray(object?.sstIds) ? object.sstIds.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: TriggerManualCompactionRequest): unknown {
-    const obj: any = {};
-    message.compactionGroupId !== undefined && (obj.compactionGroupId = Math.round(message.compactionGroupId));
-    message.keyRange !== undefined && (obj.keyRange = message.keyRange ? KeyRange.toJSON(message.keyRange) : undefined);
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    message.level !== undefined && (obj.level = Math.round(message.level));
-    if (message.sstIds) {
-      obj.sstIds = message.sstIds.map((e) => Math.round(e));
-    } else {
-      obj.sstIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TriggerManualCompactionRequest>, I>>(
-    object: I,
-  ): TriggerManualCompactionRequest {
-    const message = createBaseTriggerManualCompactionRequest();
-    message.compactionGroupId = object.compactionGroupId ?? 0;
-    message.keyRange = (object.keyRange !== undefined && object.keyRange !== null)
-      ? KeyRange.fromPartial(object.keyRange)
-      : undefined;
-    message.tableId = object.tableId ?? 0;
-    message.level = object.level ?? 0;
-    message.sstIds = object.sstIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseTriggerManualCompactionResponse(): TriggerManualCompactionResponse {
-  return { status: undefined };
-}
-
-export const TriggerManualCompactionResponse = {
-  fromJSON(object: any): TriggerManualCompactionResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: TriggerManualCompactionResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TriggerManualCompactionResponse>, I>>(
-    object: I,
-  ): TriggerManualCompactionResponse {
-    const message = createBaseTriggerManualCompactionResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseReportFullScanTaskRequest(): ReportFullScanTaskRequest {
-  return { objectIds: [] };
-}
-
-export const ReportFullScanTaskRequest = {
-  fromJSON(object: any): ReportFullScanTaskRequest {
-    return { objectIds: Array.isArray(object?.objectIds) ? object.objectIds.map((e: any) => Number(e)) : [] };
-  },
-
-  toJSON(message: ReportFullScanTaskRequest): unknown {
-    const obj: any = {};
-    if (message.objectIds) {
-      obj.objectIds = message.objectIds.map((e) => Math.round(e));
-    } else {
-      obj.objectIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReportFullScanTaskRequest>, I>>(object: I): ReportFullScanTaskRequest {
-    const message = createBaseReportFullScanTaskRequest();
-    message.objectIds = object.objectIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseReportFullScanTaskResponse(): ReportFullScanTaskResponse {
-  return { status: undefined };
-}
-
-export const ReportFullScanTaskResponse = {
-  fromJSON(object: any): ReportFullScanTaskResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: ReportFullScanTaskResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReportFullScanTaskResponse>, I>>(object: I): ReportFullScanTaskResponse {
-    const message = createBaseReportFullScanTaskResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseTriggerFullGCRequest(): TriggerFullGCRequest {
-  return { sstRetentionTimeSec: 0 };
-}
-
-export const TriggerFullGCRequest = {
-  fromJSON(object: any): TriggerFullGCRequest {
-    return { sstRetentionTimeSec: isSet(object.sstRetentionTimeSec) ? Number(object.sstRetentionTimeSec) : 0 };
-  },
-
-  toJSON(message: TriggerFullGCRequest): unknown {
-    const obj: any = {};
-    message.sstRetentionTimeSec !== undefined && (obj.sstRetentionTimeSec = Math.round(message.sstRetentionTimeSec));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TriggerFullGCRequest>, I>>(object: I): TriggerFullGCRequest {
-    const message = createBaseTriggerFullGCRequest();
-    message.sstRetentionTimeSec = object.sstRetentionTimeSec ?? 0;
-    return message;
-  },
-};
-
-function createBaseTriggerFullGCResponse(): TriggerFullGCResponse {
-  return { status: undefined };
-}
-
-export const TriggerFullGCResponse = {
-  fromJSON(object: any): TriggerFullGCResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: TriggerFullGCResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TriggerFullGCResponse>, I>>(object: I): TriggerFullGCResponse {
-    const message = createBaseTriggerFullGCResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseListVersionDeltasRequest(): ListVersionDeltasRequest {
-  return { startId: 0, numLimit: 0, committedEpochLimit: 0 };
-}
-
-export const ListVersionDeltasRequest = {
-  fromJSON(object: any): ListVersionDeltasRequest {
-    return {
-      startId: isSet(object.startId) ? Number(object.startId) : 0,
-      numLimit: isSet(object.numLimit) ? Number(object.numLimit) : 0,
-      committedEpochLimit: isSet(object.committedEpochLimit) ? Number(object.committedEpochLimit) : 0,
-    };
-  },
-
-  toJSON(message: ListVersionDeltasRequest): unknown {
-    const obj: any = {};
-    message.startId !== undefined && (obj.startId = Math.round(message.startId));
-    message.numLimit !== undefined && (obj.numLimit = Math.round(message.numLimit));
-    message.committedEpochLimit !== undefined && (obj.committedEpochLimit = Math.round(message.committedEpochLimit));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListVersionDeltasRequest>, I>>(object: I): ListVersionDeltasRequest {
-    const message = createBaseListVersionDeltasRequest();
-    message.startId = object.startId ?? 0;
-    message.numLimit = object.numLimit ?? 0;
-    message.committedEpochLimit = object.committedEpochLimit ?? 0;
-    return message;
-  },
-};
-
-function createBaseListVersionDeltasResponse(): ListVersionDeltasResponse {
-  return { versionDeltas: undefined };
-}
-
-export const ListVersionDeltasResponse = {
-  fromJSON(object: any): ListVersionDeltasResponse {
-    return {
-      versionDeltas: isSet(object.versionDeltas) ? HummockVersionDeltas.fromJSON(object.versionDeltas) : undefined,
-    };
-  },
-
-  toJSON(message: ListVersionDeltasResponse): unknown {
-    const obj: any = {};
-    message.versionDeltas !== undefined &&
-      (obj.versionDeltas = message.versionDeltas ? HummockVersionDeltas.toJSON(message.versionDeltas) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListVersionDeltasResponse>, I>>(object: I): ListVersionDeltasResponse {
-    const message = createBaseListVersionDeltasResponse();
-    message.versionDeltas = (object.versionDeltas !== undefined && object.versionDeltas !== null)
-      ? HummockVersionDeltas.fromPartial(object.versionDeltas)
-      : undefined;
-    return message;
-  },
-};
-
-function createBasePinnedVersionsSummary(): PinnedVersionsSummary {
-  return { pinnedVersions: [], workers: {} };
-}
-
-export const PinnedVersionsSummary = {
-  fromJSON(object: any): PinnedVersionsSummary {
-    return {
-      pinnedVersions: Array.isArray(object?.pinnedVersions)
-        ? object.pinnedVersions.map((e: any) => HummockPinnedVersion.fromJSON(e))
-        : [],
-      workers: isObject(object.workers)
-        ? Object.entries(object.workers).reduce<{ [key: number]: WorkerNode }>((acc, [key, value]) => {
-          acc[Number(key)] = WorkerNode.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: PinnedVersionsSummary): unknown {
-    const obj: any = {};
-    if (message.pinnedVersions) {
-      obj.pinnedVersions = message.pinnedVersions.map((e) => e ? HummockPinnedVersion.toJSON(e) : undefined);
-    } else {
-      obj.pinnedVersions = [];
-    }
-    obj.workers = {};
-    if (message.workers) {
-      Object.entries(message.workers).forEach(([k, v]) => {
-        obj.workers[k] = WorkerNode.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PinnedVersionsSummary>, I>>(object: I): PinnedVersionsSummary {
-    const message = createBasePinnedVersionsSummary();
-    message.pinnedVersions = object.pinnedVersions?.map((e) => HummockPinnedVersion.fromPartial(e)) || [];
-    message.workers = Object.entries(object.workers ?? {}).reduce<{ [key: number]: WorkerNode }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = WorkerNode.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBasePinnedVersionsSummary_WorkersEntry(): PinnedVersionsSummary_WorkersEntry {
-  return { key: 0, value: undefined };
-}
-
-export const PinnedVersionsSummary_WorkersEntry = {
-  fromJSON(object: any): PinnedVersionsSummary_WorkersEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? WorkerNode.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: PinnedVersionsSummary_WorkersEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? WorkerNode.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PinnedVersionsSummary_WorkersEntry>, I>>(
-    object: I,
-  ): PinnedVersionsSummary_WorkersEntry {
-    const message = createBasePinnedVersionsSummary_WorkersEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? WorkerNode.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBasePinnedSnapshotsSummary(): PinnedSnapshotsSummary {
-  return { pinnedSnapshots: [], workers: {} };
-}
-
-export const PinnedSnapshotsSummary = {
-  fromJSON(object: any): PinnedSnapshotsSummary {
-    return {
-      pinnedSnapshots: Array.isArray(object?.pinnedSnapshots)
-        ? object.pinnedSnapshots.map((e: any) => HummockPinnedSnapshot.fromJSON(e))
-        : [],
-      workers: isObject(object.workers)
-        ? Object.entries(object.workers).reduce<{ [key: number]: WorkerNode }>((acc, [key, value]) => {
-          acc[Number(key)] = WorkerNode.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: PinnedSnapshotsSummary): unknown {
-    const obj: any = {};
-    if (message.pinnedSnapshots) {
-      obj.pinnedSnapshots = message.pinnedSnapshots.map((e) => e ? HummockPinnedSnapshot.toJSON(e) : undefined);
-    } else {
-      obj.pinnedSnapshots = [];
-    }
-    obj.workers = {};
-    if (message.workers) {
-      Object.entries(message.workers).forEach(([k, v]) => {
-        obj.workers[k] = WorkerNode.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PinnedSnapshotsSummary>, I>>(object: I): PinnedSnapshotsSummary {
-    const message = createBasePinnedSnapshotsSummary();
-    message.pinnedSnapshots = object.pinnedSnapshots?.map((e) => HummockPinnedSnapshot.fromPartial(e)) || [];
-    message.workers = Object.entries(object.workers ?? {}).reduce<{ [key: number]: WorkerNode }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = WorkerNode.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBasePinnedSnapshotsSummary_WorkersEntry(): PinnedSnapshotsSummary_WorkersEntry {
-  return { key: 0, value: undefined };
-}
-
-export const PinnedSnapshotsSummary_WorkersEntry = {
-  fromJSON(object: any): PinnedSnapshotsSummary_WorkersEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? WorkerNode.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: PinnedSnapshotsSummary_WorkersEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? WorkerNode.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PinnedSnapshotsSummary_WorkersEntry>, I>>(
-    object: I,
-  ): PinnedSnapshotsSummary_WorkersEntry {
-    const message = createBasePinnedSnapshotsSummary_WorkersEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? WorkerNode.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseRiseCtlGetPinnedVersionsSummaryRequest(): RiseCtlGetPinnedVersionsSummaryRequest {
-  return {};
-}
-
-export const RiseCtlGetPinnedVersionsSummaryRequest = {
-  fromJSON(_: any): RiseCtlGetPinnedVersionsSummaryRequest {
-    return {};
-  },
-
-  toJSON(_: RiseCtlGetPinnedVersionsSummaryRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RiseCtlGetPinnedVersionsSummaryRequest>, I>>(
-    _: I,
-  ): RiseCtlGetPinnedVersionsSummaryRequest {
-    const message = createBaseRiseCtlGetPinnedVersionsSummaryRequest();
-    return message;
-  },
-};
-
-function createBaseRiseCtlGetPinnedVersionsSummaryResponse(): RiseCtlGetPinnedVersionsSummaryResponse {
-  return { summary: undefined };
-}
-
-export const RiseCtlGetPinnedVersionsSummaryResponse = {
-  fromJSON(object: any): RiseCtlGetPinnedVersionsSummaryResponse {
-    return { summary: isSet(object.summary) ? PinnedVersionsSummary.fromJSON(object.summary) : undefined };
-  },
-
-  toJSON(message: RiseCtlGetPinnedVersionsSummaryResponse): unknown {
-    const obj: any = {};
-    message.summary !== undefined &&
-      (obj.summary = message.summary ? PinnedVersionsSummary.toJSON(message.summary) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RiseCtlGetPinnedVersionsSummaryResponse>, I>>(
-    object: I,
-  ): RiseCtlGetPinnedVersionsSummaryResponse {
-    const message = createBaseRiseCtlGetPinnedVersionsSummaryResponse();
-    message.summary = (object.summary !== undefined && object.summary !== null)
-      ? PinnedVersionsSummary.fromPartial(object.summary)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseRiseCtlGetPinnedSnapshotsSummaryRequest(): RiseCtlGetPinnedSnapshotsSummaryRequest {
-  return {};
-}
-
-export const RiseCtlGetPinnedSnapshotsSummaryRequest = {
-  fromJSON(_: any): RiseCtlGetPinnedSnapshotsSummaryRequest {
-    return {};
-  },
-
-  toJSON(_: RiseCtlGetPinnedSnapshotsSummaryRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RiseCtlGetPinnedSnapshotsSummaryRequest>, I>>(
-    _: I,
-  ): RiseCtlGetPinnedSnapshotsSummaryRequest {
-    const message = createBaseRiseCtlGetPinnedSnapshotsSummaryRequest();
-    return message;
-  },
-};
-
-function createBaseRiseCtlGetPinnedSnapshotsSummaryResponse(): RiseCtlGetPinnedSnapshotsSummaryResponse {
-  return { summary: undefined };
-}
-
-export const RiseCtlGetPinnedSnapshotsSummaryResponse = {
-  fromJSON(object: any): RiseCtlGetPinnedSnapshotsSummaryResponse {
-    return { summary: isSet(object.summary) ? PinnedSnapshotsSummary.fromJSON(object.summary) : undefined };
-  },
-
-  toJSON(message: RiseCtlGetPinnedSnapshotsSummaryResponse): unknown {
-    const obj: any = {};
-    message.summary !== undefined &&
-      (obj.summary = message.summary ? PinnedSnapshotsSummary.toJSON(message.summary) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RiseCtlGetPinnedSnapshotsSummaryResponse>, I>>(
-    object: I,
-  ): RiseCtlGetPinnedSnapshotsSummaryResponse {
-    const message = createBaseRiseCtlGetPinnedSnapshotsSummaryResponse();
-    message.summary = (object.summary !== undefined && object.summary !== null)
-      ? PinnedSnapshotsSummary.fromPartial(object.summary)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseInitMetadataForReplayRequest(): InitMetadataForReplayRequest {
-  return { tables: [], compactionGroups: [] };
-}
-
-export const InitMetadataForReplayRequest = {
-  fromJSON(object: any): InitMetadataForReplayRequest {
-    return {
-      tables: Array.isArray(object?.tables) ? object.tables.map((e: any) => Table.fromJSON(e)) : [],
-      compactionGroups: Array.isArray(object?.compactionGroups)
-        ? object.compactionGroups.map((e: any) => CompactionGroupInfo.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: InitMetadataForReplayRequest): unknown {
-    const obj: any = {};
-    if (message.tables) {
-      obj.tables = message.tables.map((e) => e ? Table.toJSON(e) : undefined);
-    } else {
-      obj.tables = [];
-    }
-    if (message.compactionGroups) {
-      obj.compactionGroups = message.compactionGroups.map((e) => e ? CompactionGroupInfo.toJSON(e) : undefined);
-    } else {
-      obj.compactionGroups = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<InitMetadataForReplayRequest>, I>>(object: I): InitMetadataForReplayRequest {
-    const message = createBaseInitMetadataForReplayRequest();
-    message.tables = object.tables?.map((e) => Table.fromPartial(e)) || [];
-    message.compactionGroups = object.compactionGroups?.map((e) => CompactionGroupInfo.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseInitMetadataForReplayResponse(): InitMetadataForReplayResponse {
-  return {};
-}
-
-export const InitMetadataForReplayResponse = {
-  fromJSON(_: any): InitMetadataForReplayResponse {
-    return {};
-  },
-
-  toJSON(_: InitMetadataForReplayResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<InitMetadataForReplayResponse>, I>>(_: I): InitMetadataForReplayResponse {
-    const message = createBaseInitMetadataForReplayResponse();
-    return message;
-  },
-};
-
-function createBaseReplayVersionDeltaRequest(): ReplayVersionDeltaRequest {
-  return { versionDelta: undefined };
-}
-
-export const ReplayVersionDeltaRequest = {
-  fromJSON(object: any): ReplayVersionDeltaRequest {
-    return { versionDelta: isSet(object.versionDelta) ? HummockVersionDelta.fromJSON(object.versionDelta) : undefined };
-  },
-
-  toJSON(message: ReplayVersionDeltaRequest): unknown {
-    const obj: any = {};
-    message.versionDelta !== undefined &&
-      (obj.versionDelta = message.versionDelta ? HummockVersionDelta.toJSON(message.versionDelta) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReplayVersionDeltaRequest>, I>>(object: I): ReplayVersionDeltaRequest {
-    const message = createBaseReplayVersionDeltaRequest();
-    message.versionDelta = (object.versionDelta !== undefined && object.versionDelta !== null)
-      ? HummockVersionDelta.fromPartial(object.versionDelta)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseReplayVersionDeltaResponse(): ReplayVersionDeltaResponse {
-  return { version: undefined, modifiedCompactionGroups: [] };
-}
-
-export const ReplayVersionDeltaResponse = {
-  fromJSON(object: any): ReplayVersionDeltaResponse {
-    return {
-      version: isSet(object.version) ? HummockVersion.fromJSON(object.version) : undefined,
-      modifiedCompactionGroups: Array.isArray(object?.modifiedCompactionGroups)
-        ? object.modifiedCompactionGroups.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: ReplayVersionDeltaResponse): unknown {
-    const obj: any = {};
-    message.version !== undefined &&
-      (obj.version = message.version ? HummockVersion.toJSON(message.version) : undefined);
-    if (message.modifiedCompactionGroups) {
-      obj.modifiedCompactionGroups = message.modifiedCompactionGroups.map((e) => Math.round(e));
-    } else {
-      obj.modifiedCompactionGroups = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReplayVersionDeltaResponse>, I>>(object: I): ReplayVersionDeltaResponse {
-    const message = createBaseReplayVersionDeltaResponse();
-    message.version = (object.version !== undefined && object.version !== null)
-      ? HummockVersion.fromPartial(object.version)
-      : undefined;
-    message.modifiedCompactionGroups = object.modifiedCompactionGroups?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseTriggerCompactionDeterministicRequest(): TriggerCompactionDeterministicRequest {
-  return { versionId: 0, compactionGroups: [] };
-}
-
-export const TriggerCompactionDeterministicRequest = {
-  fromJSON(object: any): TriggerCompactionDeterministicRequest {
-    return {
-      versionId: isSet(object.versionId) ? Number(object.versionId) : 0,
-      compactionGroups: Array.isArray(object?.compactionGroups)
-        ? object.compactionGroups.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: TriggerCompactionDeterministicRequest): unknown {
-    const obj: any = {};
-    message.versionId !== undefined && (obj.versionId = Math.round(message.versionId));
-    if (message.compactionGroups) {
-      obj.compactionGroups = message.compactionGroups.map((e) => Math.round(e));
-    } else {
-      obj.compactionGroups = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TriggerCompactionDeterministicRequest>, I>>(
-    object: I,
-  ): TriggerCompactionDeterministicRequest {
-    const message = createBaseTriggerCompactionDeterministicRequest();
-    message.versionId = object.versionId ?? 0;
-    message.compactionGroups = object.compactionGroups?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseTriggerCompactionDeterministicResponse(): TriggerCompactionDeterministicResponse {
-  return {};
-}
-
-export const TriggerCompactionDeterministicResponse = {
-  fromJSON(_: any): TriggerCompactionDeterministicResponse {
-    return {};
-  },
-
-  toJSON(_: TriggerCompactionDeterministicResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TriggerCompactionDeterministicResponse>, I>>(
-    _: I,
-  ): TriggerCompactionDeterministicResponse {
-    const message = createBaseTriggerCompactionDeterministicResponse();
-    return message;
-  },
-};
-
-function createBaseDisableCommitEpochRequest(): DisableCommitEpochRequest {
-  return {};
-}
-
-export const DisableCommitEpochRequest = {
-  fromJSON(_: any): DisableCommitEpochRequest {
-    return {};
-  },
-
-  toJSON(_: DisableCommitEpochRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DisableCommitEpochRequest>, I>>(_: I): DisableCommitEpochRequest {
-    const message = createBaseDisableCommitEpochRequest();
-    return message;
-  },
-};
-
-function createBaseDisableCommitEpochResponse(): DisableCommitEpochResponse {
-  return { currentVersion: undefined };
-}
-
-export const DisableCommitEpochResponse = {
-  fromJSON(object: any): DisableCommitEpochResponse {
-    return {
-      currentVersion: isSet(object.currentVersion) ? HummockVersion.fromJSON(object.currentVersion) : undefined,
-    };
-  },
-
-  toJSON(message: DisableCommitEpochResponse): unknown {
-    const obj: any = {};
-    message.currentVersion !== undefined &&
-      (obj.currentVersion = message.currentVersion ? HummockVersion.toJSON(message.currentVersion) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DisableCommitEpochResponse>, I>>(object: I): DisableCommitEpochResponse {
-    const message = createBaseDisableCommitEpochResponse();
-    message.currentVersion = (object.currentVersion !== undefined && object.currentVersion !== null)
-      ? HummockVersion.fromPartial(object.currentVersion)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseRiseCtlListCompactionGroupRequest(): RiseCtlListCompactionGroupRequest {
-  return {};
-}
-
-export const RiseCtlListCompactionGroupRequest = {
-  fromJSON(_: any): RiseCtlListCompactionGroupRequest {
-    return {};
-  },
-
-  toJSON(_: RiseCtlListCompactionGroupRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RiseCtlListCompactionGroupRequest>, I>>(
-    _: I,
-  ): RiseCtlListCompactionGroupRequest {
-    const message = createBaseRiseCtlListCompactionGroupRequest();
-    return message;
-  },
-};
-
-function createBaseRiseCtlListCompactionGroupResponse(): RiseCtlListCompactionGroupResponse {
-  return { status: undefined, compactionGroups: [] };
-}
-
-export const RiseCtlListCompactionGroupResponse = {
-  fromJSON(object: any): RiseCtlListCompactionGroupResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      compactionGroups: Array.isArray(object?.compactionGroups)
-        ? object.compactionGroups.map((e: any) => CompactionGroupInfo.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: RiseCtlListCompactionGroupResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    if (message.compactionGroups) {
-      obj.compactionGroups = message.compactionGroups.map((e) => e ? CompactionGroupInfo.toJSON(e) : undefined);
-    } else {
-      obj.compactionGroups = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RiseCtlListCompactionGroupResponse>, I>>(
-    object: I,
-  ): RiseCtlListCompactionGroupResponse {
-    const message = createBaseRiseCtlListCompactionGroupResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.compactionGroups = object.compactionGroups?.map((e) => CompactionGroupInfo.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseRiseCtlUpdateCompactionConfigRequest(): RiseCtlUpdateCompactionConfigRequest {
-  return { compactionGroupIds: [], configs: [] };
-}
-
-export const RiseCtlUpdateCompactionConfigRequest = {
-  fromJSON(object: any): RiseCtlUpdateCompactionConfigRequest {
-    return {
-      compactionGroupIds: Array.isArray(object?.compactionGroupIds)
-        ? object.compactionGroupIds.map((e: any) => Number(e))
-        : [],
-      configs: Array.isArray(object?.configs)
-        ? object.configs.map((e: any) => RiseCtlUpdateCompactionConfigRequest_MutableConfig.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: RiseCtlUpdateCompactionConfigRequest): unknown {
-    const obj: any = {};
-    if (message.compactionGroupIds) {
-      obj.compactionGroupIds = message.compactionGroupIds.map((e) => Math.round(e));
-    } else {
-      obj.compactionGroupIds = [];
-    }
-    if (message.configs) {
-      obj.configs = message.configs.map((e) =>
-        e ? RiseCtlUpdateCompactionConfigRequest_MutableConfig.toJSON(e) : undefined
-      );
-    } else {
-      obj.configs = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RiseCtlUpdateCompactionConfigRequest>, I>>(
-    object: I,
-  ): RiseCtlUpdateCompactionConfigRequest {
-    const message = createBaseRiseCtlUpdateCompactionConfigRequest();
-    message.compactionGroupIds = object.compactionGroupIds?.map((e) => e) || [];
-    message.configs = object.configs?.map((e) => RiseCtlUpdateCompactionConfigRequest_MutableConfig.fromPartial(e)) ||
-      [];
-    return message;
-  },
-};
-
-function createBaseRiseCtlUpdateCompactionConfigRequest_MutableConfig(): RiseCtlUpdateCompactionConfigRequest_MutableConfig {
-  return { mutableConfig: undefined };
-}
-
-export const RiseCtlUpdateCompactionConfigRequest_MutableConfig = {
-  fromJSON(object: any): RiseCtlUpdateCompactionConfigRequest_MutableConfig {
-    return {
-      mutableConfig: isSet(object.maxBytesForLevelBase)
-        ? { $case: "maxBytesForLevelBase", maxBytesForLevelBase: Number(object.maxBytesForLevelBase) }
-        : isSet(object.maxBytesForLevelMultiplier)
-        ? { $case: "maxBytesForLevelMultiplier", maxBytesForLevelMultiplier: Number(object.maxBytesForLevelMultiplier) }
-        : isSet(object.maxCompactionBytes)
-        ? { $case: "maxCompactionBytes", maxCompactionBytes: Number(object.maxCompactionBytes) }
-        : isSet(object.subLevelMaxCompactionBytes)
-        ? { $case: "subLevelMaxCompactionBytes", subLevelMaxCompactionBytes: Number(object.subLevelMaxCompactionBytes) }
-        : isSet(object.level0TierCompactFileNumber)
-        ? {
-          $case: "level0TierCompactFileNumber",
-          level0TierCompactFileNumber: Number(object.level0TierCompactFileNumber),
-        }
-        : isSet(object.targetFileSizeBase)
-        ? { $case: "targetFileSizeBase", targetFileSizeBase: Number(object.targetFileSizeBase) }
-        : isSet(object.compactionFilterMask)
-        ? { $case: "compactionFilterMask", compactionFilterMask: Number(object.compactionFilterMask) }
-        : isSet(object.maxSubCompaction)
-        ? { $case: "maxSubCompaction", maxSubCompaction: Number(object.maxSubCompaction) }
-        : isSet(object.level0StopWriteThresholdSubLevelNumber)
-        ? {
-          $case: "level0StopWriteThresholdSubLevelNumber",
-          level0StopWriteThresholdSubLevelNumber: Number(object.level0StopWriteThresholdSubLevelNumber),
-        }
-        : undefined,
-    };
-  },
-
-  toJSON(message: RiseCtlUpdateCompactionConfigRequest_MutableConfig): unknown {
-    const obj: any = {};
-    message.mutableConfig?.$case === "maxBytesForLevelBase" &&
-      (obj.maxBytesForLevelBase = Math.round(message.mutableConfig?.maxBytesForLevelBase));
-    message.mutableConfig?.$case === "maxBytesForLevelMultiplier" &&
-      (obj.maxBytesForLevelMultiplier = Math.round(message.mutableConfig?.maxBytesForLevelMultiplier));
-    message.mutableConfig?.$case === "maxCompactionBytes" &&
-      (obj.maxCompactionBytes = Math.round(message.mutableConfig?.maxCompactionBytes));
-    message.mutableConfig?.$case === "subLevelMaxCompactionBytes" &&
-      (obj.subLevelMaxCompactionBytes = Math.round(message.mutableConfig?.subLevelMaxCompactionBytes));
-    message.mutableConfig?.$case === "level0TierCompactFileNumber" &&
-      (obj.level0TierCompactFileNumber = Math.round(message.mutableConfig?.level0TierCompactFileNumber));
-    message.mutableConfig?.$case === "targetFileSizeBase" &&
-      (obj.targetFileSizeBase = Math.round(message.mutableConfig?.targetFileSizeBase));
-    message.mutableConfig?.$case === "compactionFilterMask" &&
-      (obj.compactionFilterMask = Math.round(message.mutableConfig?.compactionFilterMask));
-    message.mutableConfig?.$case === "maxSubCompaction" &&
-      (obj.maxSubCompaction = Math.round(message.mutableConfig?.maxSubCompaction));
-    message.mutableConfig?.$case === "level0StopWriteThresholdSubLevelNumber" &&
-      (obj.level0StopWriteThresholdSubLevelNumber = Math.round(
-        message.mutableConfig?.level0StopWriteThresholdSubLevelNumber,
-      ));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RiseCtlUpdateCompactionConfigRequest_MutableConfig>, I>>(
-    object: I,
-  ): RiseCtlUpdateCompactionConfigRequest_MutableConfig {
-    const message = createBaseRiseCtlUpdateCompactionConfigRequest_MutableConfig();
-    if (
-      object.mutableConfig?.$case === "maxBytesForLevelBase" &&
-      object.mutableConfig?.maxBytesForLevelBase !== undefined &&
-      object.mutableConfig?.maxBytesForLevelBase !== null
-    ) {
-      message.mutableConfig = {
-        $case: "maxBytesForLevelBase",
-        maxBytesForLevelBase: object.mutableConfig.maxBytesForLevelBase,
-      };
-    }
-    if (
-      object.mutableConfig?.$case === "maxBytesForLevelMultiplier" &&
-      object.mutableConfig?.maxBytesForLevelMultiplier !== undefined &&
-      object.mutableConfig?.maxBytesForLevelMultiplier !== null
-    ) {
-      message.mutableConfig = {
-        $case: "maxBytesForLevelMultiplier",
-        maxBytesForLevelMultiplier: object.mutableConfig.maxBytesForLevelMultiplier,
-      };
-    }
-    if (
-      object.mutableConfig?.$case === "maxCompactionBytes" &&
-      object.mutableConfig?.maxCompactionBytes !== undefined &&
-      object.mutableConfig?.maxCompactionBytes !== null
-    ) {
-      message.mutableConfig = {
-        $case: "maxCompactionBytes",
-        maxCompactionBytes: object.mutableConfig.maxCompactionBytes,
-      };
-    }
-    if (
-      object.mutableConfig?.$case === "subLevelMaxCompactionBytes" &&
-      object.mutableConfig?.subLevelMaxCompactionBytes !== undefined &&
-      object.mutableConfig?.subLevelMaxCompactionBytes !== null
-    ) {
-      message.mutableConfig = {
-        $case: "subLevelMaxCompactionBytes",
-        subLevelMaxCompactionBytes: object.mutableConfig.subLevelMaxCompactionBytes,
-      };
-    }
-    if (
-      object.mutableConfig?.$case === "level0TierCompactFileNumber" &&
-      object.mutableConfig?.level0TierCompactFileNumber !== undefined &&
-      object.mutableConfig?.level0TierCompactFileNumber !== null
-    ) {
-      message.mutableConfig = {
-        $case: "level0TierCompactFileNumber",
-        level0TierCompactFileNumber: object.mutableConfig.level0TierCompactFileNumber,
-      };
-    }
-    if (
-      object.mutableConfig?.$case === "targetFileSizeBase" &&
-      object.mutableConfig?.targetFileSizeBase !== undefined &&
-      object.mutableConfig?.targetFileSizeBase !== null
-    ) {
-      message.mutableConfig = {
-        $case: "targetFileSizeBase",
-        targetFileSizeBase: object.mutableConfig.targetFileSizeBase,
-      };
-    }
-    if (
-      object.mutableConfig?.$case === "compactionFilterMask" &&
-      object.mutableConfig?.compactionFilterMask !== undefined &&
-      object.mutableConfig?.compactionFilterMask !== null
-    ) {
-      message.mutableConfig = {
-        $case: "compactionFilterMask",
-        compactionFilterMask: object.mutableConfig.compactionFilterMask,
-      };
-    }
-    if (
-      object.mutableConfig?.$case === "maxSubCompaction" &&
-      object.mutableConfig?.maxSubCompaction !== undefined &&
-      object.mutableConfig?.maxSubCompaction !== null
-    ) {
-      message.mutableConfig = { $case: "maxSubCompaction", maxSubCompaction: object.mutableConfig.maxSubCompaction };
-    }
-    if (
-      object.mutableConfig?.$case === "level0StopWriteThresholdSubLevelNumber" &&
-      object.mutableConfig?.level0StopWriteThresholdSubLevelNumber !== undefined &&
-      object.mutableConfig?.level0StopWriteThresholdSubLevelNumber !== null
-    ) {
-      message.mutableConfig = {
-        $case: "level0StopWriteThresholdSubLevelNumber",
-        level0StopWriteThresholdSubLevelNumber: object.mutableConfig.level0StopWriteThresholdSubLevelNumber,
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseRiseCtlUpdateCompactionConfigResponse(): RiseCtlUpdateCompactionConfigResponse {
-  return { status: undefined };
-}
-
-export const RiseCtlUpdateCompactionConfigResponse = {
-  fromJSON(object: any): RiseCtlUpdateCompactionConfigResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: RiseCtlUpdateCompactionConfigResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RiseCtlUpdateCompactionConfigResponse>, I>>(
-    object: I,
-  ): RiseCtlUpdateCompactionConfigResponse {
-    const message = createBaseRiseCtlUpdateCompactionConfigResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSetCompactorRuntimeConfigRequest(): SetCompactorRuntimeConfigRequest {
-  return { contextId: 0, config: undefined };
-}
-
-export const SetCompactorRuntimeConfigRequest = {
-  fromJSON(object: any): SetCompactorRuntimeConfigRequest {
-    return {
-      contextId: isSet(object.contextId) ? Number(object.contextId) : 0,
-      config: isSet(object.config) ? CompactorRuntimeConfig.fromJSON(object.config) : undefined,
-    };
-  },
-
-  toJSON(message: SetCompactorRuntimeConfigRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    message.config !== undefined &&
-      (obj.config = message.config ? CompactorRuntimeConfig.toJSON(message.config) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SetCompactorRuntimeConfigRequest>, I>>(
-    object: I,
-  ): SetCompactorRuntimeConfigRequest {
-    const message = createBaseSetCompactorRuntimeConfigRequest();
-    message.contextId = object.contextId ?? 0;
-    message.config = (object.config !== undefined && object.config !== null)
-      ? CompactorRuntimeConfig.fromPartial(object.config)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSetCompactorRuntimeConfigResponse(): SetCompactorRuntimeConfigResponse {
-  return {};
-}
-
-export const SetCompactorRuntimeConfigResponse = {
-  fromJSON(_: any): SetCompactorRuntimeConfigResponse {
-    return {};
-  },
-
-  toJSON(_: SetCompactorRuntimeConfigResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SetCompactorRuntimeConfigResponse>, I>>(
-    _: I,
-  ): SetCompactorRuntimeConfigResponse {
-    const message = createBaseSetCompactorRuntimeConfigResponse();
-    return message;
-  },
-};
-
-function createBasePinVersionRequest(): PinVersionRequest {
-  return { contextId: 0 };
-}
-
-export const PinVersionRequest = {
-  fromJSON(object: any): PinVersionRequest {
-    return { contextId: isSet(object.contextId) ? Number(object.contextId) : 0 };
-  },
-
-  toJSON(message: PinVersionRequest): unknown {
-    const obj: any = {};
-    message.contextId !== undefined && (obj.contextId = Math.round(message.contextId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PinVersionRequest>, I>>(object: I): PinVersionRequest {
-    const message = createBasePinVersionRequest();
-    message.contextId = object.contextId ?? 0;
-    return message;
-  },
-};
-
-function createBasePinVersionResponse(): PinVersionResponse {
-  return { pinnedVersion: undefined };
-}
-
-export const PinVersionResponse = {
-  fromJSON(object: any): PinVersionResponse {
-    return { pinnedVersion: isSet(object.pinnedVersion) ? HummockVersion.fromJSON(object.pinnedVersion) : undefined };
-  },
-
-  toJSON(message: PinVersionResponse): unknown {
-    const obj: any = {};
-    message.pinnedVersion !== undefined &&
-      (obj.pinnedVersion = message.pinnedVersion ? HummockVersion.toJSON(message.pinnedVersion) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PinVersionResponse>, I>>(object: I): PinVersionResponse {
-    const message = createBasePinVersionResponse();
-    message.pinnedVersion = (object.pinnedVersion !== undefined && object.pinnedVersion !== null)
-      ? HummockVersion.fromPartial(object.pinnedVersion)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSplitCompactionGroupRequest(): SplitCompactionGroupRequest {
-  return { groupId: 0, tableIds: [] };
-}
-
-export const SplitCompactionGroupRequest = {
-  fromJSON(object: any): SplitCompactionGroupRequest {
-    return {
-      groupId: isSet(object.groupId) ? Number(object.groupId) : 0,
-      tableIds: Array.isArray(object?.tableIds) ? object.tableIds.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: SplitCompactionGroupRequest): unknown {
-    const obj: any = {};
-    message.groupId !== undefined && (obj.groupId = Math.round(message.groupId));
-    if (message.tableIds) {
-      obj.tableIds = message.tableIds.map((e) => Math.round(e));
-    } else {
-      obj.tableIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SplitCompactionGroupRequest>, I>>(object: I): SplitCompactionGroupRequest {
-    const message = createBaseSplitCompactionGroupRequest();
-    message.groupId = object.groupId ?? 0;
-    message.tableIds = object.tableIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseSplitCompactionGroupResponse(): SplitCompactionGroupResponse {
-  return { newGroupId: 0 };
-}
-
-export const SplitCompactionGroupResponse = {
-  fromJSON(object: any): SplitCompactionGroupResponse {
-    return { newGroupId: isSet(object.newGroupId) ? Number(object.newGroupId) : 0 };
-  },
-
-  toJSON(message: SplitCompactionGroupResponse): unknown {
-    const obj: any = {};
-    message.newGroupId !== undefined && (obj.newGroupId = Math.round(message.newGroupId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SplitCompactionGroupResponse>, I>>(object: I): SplitCompactionGroupResponse {
-    const message = createBaseSplitCompactionGroupResponse();
-    message.newGroupId = object.newGroupId ?? 0;
-    return message;
-  },
-};
-
-function createBaseCompactionConfig(): CompactionConfig {
-  return {
-    maxBytesForLevelBase: 0,
-    maxLevel: 0,
-    maxBytesForLevelMultiplier: 0,
-    maxCompactionBytes: 0,
-    subLevelMaxCompactionBytes: 0,
-    level0TierCompactFileNumber: 0,
-    compactionMode: CompactionConfig_CompactionMode.UNSPECIFIED,
-    compressionAlgorithm: [],
-    targetFileSizeBase: 0,
-    compactionFilterMask: 0,
-    maxSubCompaction: 0,
-    maxSpaceReclaimBytes: 0,
-    splitByStateTable: false,
-    level0StopWriteThresholdSubLevelNumber: 0,
-    level0MaxCompactFileNumber: 0,
-  };
-}
-
-export const CompactionConfig = {
-  fromJSON(object: any): CompactionConfig {
-    return {
-      maxBytesForLevelBase: isSet(object.maxBytesForLevelBase) ? Number(object.maxBytesForLevelBase) : 0,
-      maxLevel: isSet(object.maxLevel) ? Number(object.maxLevel) : 0,
-      maxBytesForLevelMultiplier: isSet(object.maxBytesForLevelMultiplier)
-        ? Number(object.maxBytesForLevelMultiplier)
-        : 0,
-      maxCompactionBytes: isSet(object.maxCompactionBytes) ? Number(object.maxCompactionBytes) : 0,
-      subLevelMaxCompactionBytes: isSet(object.subLevelMaxCompactionBytes)
-        ? Number(object.subLevelMaxCompactionBytes)
-        : 0,
-      level0TierCompactFileNumber: isSet(object.level0TierCompactFileNumber)
-        ? Number(object.level0TierCompactFileNumber)
-        : 0,
-      compactionMode: isSet(object.compactionMode)
-        ? compactionConfig_CompactionModeFromJSON(object.compactionMode)
-        : CompactionConfig_CompactionMode.UNSPECIFIED,
-      compressionAlgorithm: Array.isArray(object?.compressionAlgorithm)
-        ? object.compressionAlgorithm.map((e: any) => String(e))
-        : [],
-      targetFileSizeBase: isSet(object.targetFileSizeBase) ? Number(object.targetFileSizeBase) : 0,
-      compactionFilterMask: isSet(object.compactionFilterMask) ? Number(object.compactionFilterMask) : 0,
-      maxSubCompaction: isSet(object.maxSubCompaction) ? Number(object.maxSubCompaction) : 0,
-      maxSpaceReclaimBytes: isSet(object.maxSpaceReclaimBytes) ? Number(object.maxSpaceReclaimBytes) : 0,
-      splitByStateTable: isSet(object.splitByStateTable) ? Boolean(object.splitByStateTable) : false,
-      level0StopWriteThresholdSubLevelNumber: isSet(object.level0StopWriteThresholdSubLevelNumber)
-        ? Number(object.level0StopWriteThresholdSubLevelNumber)
-        : 0,
-      level0MaxCompactFileNumber: isSet(object.level0MaxCompactFileNumber)
-        ? Number(object.level0MaxCompactFileNumber)
-        : 0,
-    };
-  },
-
-  toJSON(message: CompactionConfig): unknown {
-    const obj: any = {};
-    message.maxBytesForLevelBase !== undefined && (obj.maxBytesForLevelBase = Math.round(message.maxBytesForLevelBase));
-    message.maxLevel !== undefined && (obj.maxLevel = Math.round(message.maxLevel));
-    message.maxBytesForLevelMultiplier !== undefined &&
-      (obj.maxBytesForLevelMultiplier = Math.round(message.maxBytesForLevelMultiplier));
-    message.maxCompactionBytes !== undefined && (obj.maxCompactionBytes = Math.round(message.maxCompactionBytes));
-    message.subLevelMaxCompactionBytes !== undefined &&
-      (obj.subLevelMaxCompactionBytes = Math.round(message.subLevelMaxCompactionBytes));
-    message.level0TierCompactFileNumber !== undefined &&
-      (obj.level0TierCompactFileNumber = Math.round(message.level0TierCompactFileNumber));
-    message.compactionMode !== undefined &&
-      (obj.compactionMode = compactionConfig_CompactionModeToJSON(message.compactionMode));
-    if (message.compressionAlgorithm) {
-      obj.compressionAlgorithm = message.compressionAlgorithm.map((e) => e);
-    } else {
-      obj.compressionAlgorithm = [];
-    }
-    message.targetFileSizeBase !== undefined && (obj.targetFileSizeBase = Math.round(message.targetFileSizeBase));
-    message.compactionFilterMask !== undefined && (obj.compactionFilterMask = Math.round(message.compactionFilterMask));
-    message.maxSubCompaction !== undefined && (obj.maxSubCompaction = Math.round(message.maxSubCompaction));
-    message.maxSpaceReclaimBytes !== undefined && (obj.maxSpaceReclaimBytes = Math.round(message.maxSpaceReclaimBytes));
-    message.splitByStateTable !== undefined && (obj.splitByStateTable = message.splitByStateTable);
-    message.level0StopWriteThresholdSubLevelNumber !== undefined &&
-      (obj.level0StopWriteThresholdSubLevelNumber = Math.round(message.level0StopWriteThresholdSubLevelNumber));
-    message.level0MaxCompactFileNumber !== undefined &&
-      (obj.level0MaxCompactFileNumber = Math.round(message.level0MaxCompactFileNumber));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CompactionConfig>, I>>(object: I): CompactionConfig {
-    const message = createBaseCompactionConfig();
-    message.maxBytesForLevelBase = object.maxBytesForLevelBase ?? 0;
-    message.maxLevel = object.maxLevel ?? 0;
-    message.maxBytesForLevelMultiplier = object.maxBytesForLevelMultiplier ?? 0;
-    message.maxCompactionBytes = object.maxCompactionBytes ?? 0;
-    message.subLevelMaxCompactionBytes = object.subLevelMaxCompactionBytes ?? 0;
-    message.level0TierCompactFileNumber = object.level0TierCompactFileNumber ?? 0;
-    message.compactionMode = object.compactionMode ?? CompactionConfig_CompactionMode.UNSPECIFIED;
-    message.compressionAlgorithm = object.compressionAlgorithm?.map((e) => e) || [];
-    message.targetFileSizeBase = object.targetFileSizeBase ?? 0;
-    message.compactionFilterMask = object.compactionFilterMask ?? 0;
-    message.maxSubCompaction = object.maxSubCompaction ?? 0;
-    message.maxSpaceReclaimBytes = object.maxSpaceReclaimBytes ?? 0;
-    message.splitByStateTable = object.splitByStateTable ?? false;
-    message.level0StopWriteThresholdSubLevelNumber = object.level0StopWriteThresholdSubLevelNumber ?? 0;
-    message.level0MaxCompactFileNumber = object.level0MaxCompactFileNumber ?? 0;
-    return message;
-  },
-};
-
-function createBaseTableStats(): TableStats {
-  return { totalKeySize: 0, totalValueSize: 0, totalKeyCount: 0 };
-}
-
-export const TableStats = {
-  fromJSON(object: any): TableStats {
-    return {
-      totalKeySize: isSet(object.totalKeySize) ? Number(object.totalKeySize) : 0,
-      totalValueSize: isSet(object.totalValueSize) ? Number(object.totalValueSize) : 0,
-      totalKeyCount: isSet(object.totalKeyCount) ? Number(object.totalKeyCount) : 0,
-    };
-  },
-
-  toJSON(message: TableStats): unknown {
-    const obj: any = {};
-    message.totalKeySize !== undefined && (obj.totalKeySize = Math.round(message.totalKeySize));
-    message.totalValueSize !== undefined && (obj.totalValueSize = Math.round(message.totalValueSize));
-    message.totalKeyCount !== undefined && (obj.totalKeyCount = Math.round(message.totalKeyCount));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableStats>, I>>(object: I): TableStats {
-    const message = createBaseTableStats();
-    message.totalKeySize = object.totalKeySize ?? 0;
-    message.totalValueSize = object.totalValueSize ?? 0;
-    message.totalKeyCount = object.totalKeyCount ?? 0;
-    return message;
-  },
-};
-
-function createBaseHummockVersionStats(): HummockVersionStats {
-  return { hummockVersionId: 0, tableStats: {} };
-}
-
-export const HummockVersionStats = {
-  fromJSON(object: any): HummockVersionStats {
-    return {
-      hummockVersionId: isSet(object.hummockVersionId) ? Number(object.hummockVersionId) : 0,
-      tableStats: isObject(object.tableStats)
-        ? Object.entries(object.tableStats).reduce<{ [key: number]: TableStats }>((acc, [key, value]) => {
-          acc[Number(key)] = TableStats.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: HummockVersionStats): unknown {
-    const obj: any = {};
-    message.hummockVersionId !== undefined && (obj.hummockVersionId = Math.round(message.hummockVersionId));
-    obj.tableStats = {};
-    if (message.tableStats) {
-      Object.entries(message.tableStats).forEach(([k, v]) => {
-        obj.tableStats[k] = TableStats.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockVersionStats>, I>>(object: I): HummockVersionStats {
-    const message = createBaseHummockVersionStats();
-    message.hummockVersionId = object.hummockVersionId ?? 0;
-    message.tableStats = Object.entries(object.tableStats ?? {}).reduce<{ [key: number]: TableStats }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = TableStats.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseHummockVersionStats_TableStatsEntry(): HummockVersionStats_TableStatsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const HummockVersionStats_TableStatsEntry = {
-  fromJSON(object: any): HummockVersionStats_TableStatsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? TableStats.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: HummockVersionStats_TableStatsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? TableStats.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HummockVersionStats_TableStatsEntry>, I>>(
-    object: I,
-  ): HummockVersionStats_TableStatsEntry {
-    const message = createBaseHummockVersionStats_TableStatsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? TableStats.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseWriteLimits(): WriteLimits {
-  return { writeLimits: {} };
-}
-
-export const WriteLimits = {
-  fromJSON(object: any): WriteLimits {
-    return {
-      writeLimits: isObject(object.writeLimits)
-        ? Object.entries(object.writeLimits).reduce<{ [key: number]: WriteLimits_WriteLimit }>((acc, [key, value]) => {
-          acc[Number(key)] = WriteLimits_WriteLimit.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: WriteLimits): unknown {
-    const obj: any = {};
-    obj.writeLimits = {};
-    if (message.writeLimits) {
-      Object.entries(message.writeLimits).forEach(([k, v]) => {
-        obj.writeLimits[k] = WriteLimits_WriteLimit.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<WriteLimits>, I>>(object: I): WriteLimits {
-    const message = createBaseWriteLimits();
-    message.writeLimits = Object.entries(object.writeLimits ?? {}).reduce<{ [key: number]: WriteLimits_WriteLimit }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = WriteLimits_WriteLimit.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseWriteLimits_WriteLimit(): WriteLimits_WriteLimit {
-  return { tableIds: [], reason: "" };
-}
-
-export const WriteLimits_WriteLimit = {
-  fromJSON(object: any): WriteLimits_WriteLimit {
-    return {
-      tableIds: Array.isArray(object?.tableIds) ? object.tableIds.map((e: any) => Number(e)) : [],
-      reason: isSet(object.reason) ? String(object.reason) : "",
-    };
-  },
-
-  toJSON(message: WriteLimits_WriteLimit): unknown {
-    const obj: any = {};
-    if (message.tableIds) {
-      obj.tableIds = message.tableIds.map((e) => Math.round(e));
-    } else {
-      obj.tableIds = [];
-    }
-    message.reason !== undefined && (obj.reason = message.reason);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<WriteLimits_WriteLimit>, I>>(object: I): WriteLimits_WriteLimit {
-    const message = createBaseWriteLimits_WriteLimit();
-    message.tableIds = object.tableIds?.map((e) => e) || [];
-    message.reason = object.reason ?? "";
-    return message;
-  },
-};
-
-function createBaseWriteLimits_WriteLimitsEntry(): WriteLimits_WriteLimitsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const WriteLimits_WriteLimitsEntry = {
-  fromJSON(object: any): WriteLimits_WriteLimitsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? WriteLimits_WriteLimit.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: WriteLimits_WriteLimitsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined &&
-      (obj.value = message.value ? WriteLimits_WriteLimit.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<WriteLimits_WriteLimitsEntry>, I>>(object: I): WriteLimits_WriteLimitsEntry {
-    const message = createBaseWriteLimits_WriteLimitsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? WriteLimits_WriteLimit.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-declare var self: any | undefined;
-declare var window: any | undefined;
-declare var global: any | undefined;
-var globalThis: any = (() => {
-  if (typeof globalThis !== "undefined") {
-    return globalThis;
-  }
-  if (typeof self !== "undefined") {
-    return self;
-  }
-  if (typeof window !== "undefined") {
-    return window;
-  }
-  if (typeof global !== "undefined") {
-    return global;
-  }
-  throw "Unable to locate global object";
-})();
-
-function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-
-function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin: string[] = [];
-    arr.forEach((byte) => {
-      bin.push(String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null;
-}
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/java_binding.ts b/dashboard/proto/gen/java_binding.ts
deleted file mode 100644
index 5cc7e19adaf82..0000000000000
--- a/dashboard/proto/gen/java_binding.ts
+++ /dev/null
@@ -1,237 +0,0 @@
-/* eslint-disable */
-import { Table } from "./catalog";
-import { HummockVersion } from "./hummock";
-
-export const protobufPackage = "java_binding";
-
-/** When `left` or `right` is none, it represents unbounded. */
-export interface KeyRange {
-  left: Uint8Array;
-  right: Uint8Array;
-  leftBound: KeyRange_Bound;
-  rightBound: KeyRange_Bound;
-}
-
-export const KeyRange_Bound = {
-  UNSPECIFIED: "UNSPECIFIED",
-  UNBOUNDED: "UNBOUNDED",
-  INCLUDED: "INCLUDED",
-  EXCLUDED: "EXCLUDED",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type KeyRange_Bound = typeof KeyRange_Bound[keyof typeof KeyRange_Bound];
-
-export function keyRange_BoundFromJSON(object: any): KeyRange_Bound {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return KeyRange_Bound.UNSPECIFIED;
-    case 1:
-    case "UNBOUNDED":
-      return KeyRange_Bound.UNBOUNDED;
-    case 2:
-    case "INCLUDED":
-      return KeyRange_Bound.INCLUDED;
-    case 3:
-    case "EXCLUDED":
-      return KeyRange_Bound.EXCLUDED;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return KeyRange_Bound.UNRECOGNIZED;
-  }
-}
-
-export function keyRange_BoundToJSON(object: KeyRange_Bound): string {
-  switch (object) {
-    case KeyRange_Bound.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case KeyRange_Bound.UNBOUNDED:
-      return "UNBOUNDED";
-    case KeyRange_Bound.INCLUDED:
-      return "INCLUDED";
-    case KeyRange_Bound.EXCLUDED:
-      return "EXCLUDED";
-    case KeyRange_Bound.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface ReadPlan {
-  objectStoreUrl: string;
-  dataDir: string;
-  keyRange: KeyRange | undefined;
-  tableId: number;
-  epoch: number;
-  version: HummockVersion | undefined;
-  tableCatalog: Table | undefined;
-  vnodeIds: number[];
-}
-
-function createBaseKeyRange(): KeyRange {
-  return {
-    left: new Uint8Array(),
-    right: new Uint8Array(),
-    leftBound: KeyRange_Bound.UNSPECIFIED,
-    rightBound: KeyRange_Bound.UNSPECIFIED,
-  };
-}
-
-export const KeyRange = {
-  fromJSON(object: any): KeyRange {
-    return {
-      left: isSet(object.left) ? bytesFromBase64(object.left) : new Uint8Array(),
-      right: isSet(object.right) ? bytesFromBase64(object.right) : new Uint8Array(),
-      leftBound: isSet(object.leftBound) ? keyRange_BoundFromJSON(object.leftBound) : KeyRange_Bound.UNSPECIFIED,
-      rightBound: isSet(object.rightBound) ? keyRange_BoundFromJSON(object.rightBound) : KeyRange_Bound.UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: KeyRange): unknown {
-    const obj: any = {};
-    message.left !== undefined &&
-      (obj.left = base64FromBytes(message.left !== undefined ? message.left : new Uint8Array()));
-    message.right !== undefined &&
-      (obj.right = base64FromBytes(message.right !== undefined ? message.right : new Uint8Array()));
-    message.leftBound !== undefined && (obj.leftBound = keyRange_BoundToJSON(message.leftBound));
-    message.rightBound !== undefined && (obj.rightBound = keyRange_BoundToJSON(message.rightBound));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<KeyRange>, I>>(object: I): KeyRange {
-    const message = createBaseKeyRange();
-    message.left = object.left ?? new Uint8Array();
-    message.right = object.right ?? new Uint8Array();
-    message.leftBound = object.leftBound ?? KeyRange_Bound.UNSPECIFIED;
-    message.rightBound = object.rightBound ?? KeyRange_Bound.UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseReadPlan(): ReadPlan {
-  return {
-    objectStoreUrl: "",
-    dataDir: "",
-    keyRange: undefined,
-    tableId: 0,
-    epoch: 0,
-    version: undefined,
-    tableCatalog: undefined,
-    vnodeIds: [],
-  };
-}
-
-export const ReadPlan = {
-  fromJSON(object: any): ReadPlan {
-    return {
-      objectStoreUrl: isSet(object.objectStoreUrl) ? String(object.objectStoreUrl) : "",
-      dataDir: isSet(object.dataDir) ? String(object.dataDir) : "",
-      keyRange: isSet(object.keyRange) ? KeyRange.fromJSON(object.keyRange) : undefined,
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      epoch: isSet(object.epoch) ? Number(object.epoch) : 0,
-      version: isSet(object.version) ? HummockVersion.fromJSON(object.version) : undefined,
-      tableCatalog: isSet(object.tableCatalog) ? Table.fromJSON(object.tableCatalog) : undefined,
-      vnodeIds: Array.isArray(object?.vnodeIds) ? object.vnodeIds.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: ReadPlan): unknown {
-    const obj: any = {};
-    message.objectStoreUrl !== undefined && (obj.objectStoreUrl = message.objectStoreUrl);
-    message.dataDir !== undefined && (obj.dataDir = message.dataDir);
-    message.keyRange !== undefined && (obj.keyRange = message.keyRange ? KeyRange.toJSON(message.keyRange) : undefined);
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    message.version !== undefined &&
-      (obj.version = message.version ? HummockVersion.toJSON(message.version) : undefined);
-    message.tableCatalog !== undefined &&
-      (obj.tableCatalog = message.tableCatalog ? Table.toJSON(message.tableCatalog) : undefined);
-    if (message.vnodeIds) {
-      obj.vnodeIds = message.vnodeIds.map((e) => Math.round(e));
-    } else {
-      obj.vnodeIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ReadPlan>, I>>(object: I): ReadPlan {
-    const message = createBaseReadPlan();
-    message.objectStoreUrl = object.objectStoreUrl ?? "";
-    message.dataDir = object.dataDir ?? "";
-    message.keyRange = (object.keyRange !== undefined && object.keyRange !== null)
-      ? KeyRange.fromPartial(object.keyRange)
-      : undefined;
-    message.tableId = object.tableId ?? 0;
-    message.epoch = object.epoch ?? 0;
-    message.version = (object.version !== undefined && object.version !== null)
-      ? HummockVersion.fromPartial(object.version)
-      : undefined;
-    message.tableCatalog = (object.tableCatalog !== undefined && object.tableCatalog !== null)
-      ? Table.fromPartial(object.tableCatalog)
-      : undefined;
-    message.vnodeIds = object.vnodeIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-declare var self: any | undefined;
-declare var window: any | undefined;
-declare var global: any | undefined;
-var globalThis: any = (() => {
-  if (typeof globalThis !== "undefined") {
-    return globalThis;
-  }
-  if (typeof self !== "undefined") {
-    return self;
-  }
-  if (typeof window !== "undefined") {
-    return window;
-  }
-  if (typeof global !== "undefined") {
-    return global;
-  }
-  throw "Unable to locate global object";
-})();
-
-function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-
-function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin: string[] = [];
-    arr.forEach((byte) => {
-      bin.push(String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/meta.ts b/dashboard/proto/gen/meta.ts
deleted file mode 100644
index fda7e6edeb8c0..0000000000000
--- a/dashboard/proto/gen/meta.ts
+++ /dev/null
@@ -1,2665 +0,0 @@
-/* eslint-disable */
-import { MetaBackupManifestId } from "./backup_service";
-import { Database, Function, Index, Schema, Sink, Source, Table, View } from "./catalog";
-import {
-  HostAddress,
-  ParallelUnit,
-  ParallelUnitMapping,
-  Status,
-  WorkerNode,
-  WorkerType,
-  workerTypeFromJSON,
-  workerTypeToJSON,
-} from "./common";
-import { HummockSnapshot, HummockVersion, HummockVersionDeltas, WriteLimits } from "./hummock";
-import { ConnectorSplits } from "./source";
-import { Dispatcher, StreamActor, StreamEnvironment, StreamNode } from "./stream_plan";
-import { UserInfo } from "./user";
-
-export const protobufPackage = "meta";
-
-export const SubscribeType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  FRONTEND: "FRONTEND",
-  HUMMOCK: "HUMMOCK",
-  COMPACTOR: "COMPACTOR",
-  COMPUTE: "COMPUTE",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type SubscribeType = typeof SubscribeType[keyof typeof SubscribeType];
-
-export function subscribeTypeFromJSON(object: any): SubscribeType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return SubscribeType.UNSPECIFIED;
-    case 1:
-    case "FRONTEND":
-      return SubscribeType.FRONTEND;
-    case 2:
-    case "HUMMOCK":
-      return SubscribeType.HUMMOCK;
-    case 3:
-    case "COMPACTOR":
-      return SubscribeType.COMPACTOR;
-    case 4:
-    case "COMPUTE":
-      return SubscribeType.COMPUTE;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return SubscribeType.UNRECOGNIZED;
-  }
-}
-
-export function subscribeTypeToJSON(object: SubscribeType): string {
-  switch (object) {
-    case SubscribeType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case SubscribeType.FRONTEND:
-      return "FRONTEND";
-    case SubscribeType.HUMMOCK:
-      return "HUMMOCK";
-    case SubscribeType.COMPACTOR:
-      return "COMPACTOR";
-    case SubscribeType.COMPUTE:
-      return "COMPUTE";
-    case SubscribeType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface HeartbeatRequest {
-  nodeId: number;
-  /** Lightweight info piggybacked by heartbeat request. */
-  info: HeartbeatRequest_ExtraInfo[];
-}
-
-export interface HeartbeatRequest_ExtraInfo {
-  info?: { $case: "hummockGcWatermark"; hummockGcWatermark: number };
-}
-
-export interface HeartbeatResponse {
-  status: Status | undefined;
-}
-
-/** Fragments of a Streaming Job */
-export interface TableFragments {
-  tableId: number;
-  state: TableFragments_State;
-  fragments: { [key: number]: TableFragments_Fragment };
-  actorStatus: { [key: number]: TableFragments_ActorStatus };
-  actorSplits: { [key: number]: ConnectorSplits };
-  env: StreamEnvironment | undefined;
-}
-
-/** The state of the fragments of this table */
-export const TableFragments_State = {
-  UNSPECIFIED: "UNSPECIFIED",
-  /** INITIAL - The streaming job is initial. */
-  INITIAL: "INITIAL",
-  /** CREATING - The streaming job is creating. */
-  CREATING: "CREATING",
-  /** CREATED - The streaming job has been created. */
-  CREATED: "CREATED",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type TableFragments_State = typeof TableFragments_State[keyof typeof TableFragments_State];
-
-export function tableFragments_StateFromJSON(object: any): TableFragments_State {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return TableFragments_State.UNSPECIFIED;
-    case 1:
-    case "INITIAL":
-      return TableFragments_State.INITIAL;
-    case 2:
-    case "CREATING":
-      return TableFragments_State.CREATING;
-    case 3:
-    case "CREATED":
-      return TableFragments_State.CREATED;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return TableFragments_State.UNRECOGNIZED;
-  }
-}
-
-export function tableFragments_StateToJSON(object: TableFragments_State): string {
-  switch (object) {
-    case TableFragments_State.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case TableFragments_State.INITIAL:
-      return "INITIAL";
-    case TableFragments_State.CREATING:
-      return "CREATING";
-    case TableFragments_State.CREATED:
-      return "CREATED";
-    case TableFragments_State.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-/** Runtime information of an actor */
-export interface TableFragments_ActorStatus {
-  /** Current on which parallel unit */
-  parallelUnit:
-    | ParallelUnit
-    | undefined;
-  /** Current state */
-  state: TableFragments_ActorStatus_ActorState;
-}
-
-/** Current state of actor */
-export const TableFragments_ActorStatus_ActorState = {
-  UNSPECIFIED: "UNSPECIFIED",
-  /** INACTIVE - Initial state after creation */
-  INACTIVE: "INACTIVE",
-  /** RUNNING - Running normally */
-  RUNNING: "RUNNING",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type TableFragments_ActorStatus_ActorState =
-  typeof TableFragments_ActorStatus_ActorState[keyof typeof TableFragments_ActorStatus_ActorState];
-
-export function tableFragments_ActorStatus_ActorStateFromJSON(object: any): TableFragments_ActorStatus_ActorState {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return TableFragments_ActorStatus_ActorState.UNSPECIFIED;
-    case 1:
-    case "INACTIVE":
-      return TableFragments_ActorStatus_ActorState.INACTIVE;
-    case 2:
-    case "RUNNING":
-      return TableFragments_ActorStatus_ActorState.RUNNING;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return TableFragments_ActorStatus_ActorState.UNRECOGNIZED;
-  }
-}
-
-export function tableFragments_ActorStatus_ActorStateToJSON(object: TableFragments_ActorStatus_ActorState): string {
-  switch (object) {
-    case TableFragments_ActorStatus_ActorState.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case TableFragments_ActorStatus_ActorState.INACTIVE:
-      return "INACTIVE";
-    case TableFragments_ActorStatus_ActorState.RUNNING:
-      return "RUNNING";
-    case TableFragments_ActorStatus_ActorState.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface TableFragments_Fragment {
-  fragmentId: number;
-  /** Bitwise-OR of FragmentTypeFlags */
-  fragmentTypeMask: number;
-  distributionType: TableFragments_Fragment_FragmentDistributionType;
-  actors: StreamActor[];
-  /**
-   * Vnode mapping (which should be set in upstream dispatcher) of the fragment.
-   * This field is always set to `Some`. For singleton, the parallel unit for all vnodes will be the same.
-   */
-  vnodeMapping: ParallelUnitMapping | undefined;
-  stateTableIds: number[];
-  /**
-   * Note that this can be derived backwards from the upstream actors of the Actor held by the Fragment,
-   * but in some scenarios (e.g. Scaling) it will lead to a lot of duplicate code,
-   * so we pre-generate and store it here, this member will only be initialized when creating the Fragment
-   * and modified when creating the mv-on-mv
-   */
-  upstreamFragmentIds: number[];
-}
-
-export const TableFragments_Fragment_FragmentDistributionType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  SINGLE: "SINGLE",
-  HASH: "HASH",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type TableFragments_Fragment_FragmentDistributionType =
-  typeof TableFragments_Fragment_FragmentDistributionType[
-    keyof typeof TableFragments_Fragment_FragmentDistributionType
-  ];
-
-export function tableFragments_Fragment_FragmentDistributionTypeFromJSON(
-  object: any,
-): TableFragments_Fragment_FragmentDistributionType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return TableFragments_Fragment_FragmentDistributionType.UNSPECIFIED;
-    case 1:
-    case "SINGLE":
-      return TableFragments_Fragment_FragmentDistributionType.SINGLE;
-    case 2:
-    case "HASH":
-      return TableFragments_Fragment_FragmentDistributionType.HASH;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return TableFragments_Fragment_FragmentDistributionType.UNRECOGNIZED;
-  }
-}
-
-export function tableFragments_Fragment_FragmentDistributionTypeToJSON(
-  object: TableFragments_Fragment_FragmentDistributionType,
-): string {
-  switch (object) {
-    case TableFragments_Fragment_FragmentDistributionType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case TableFragments_Fragment_FragmentDistributionType.SINGLE:
-      return "SINGLE";
-    case TableFragments_Fragment_FragmentDistributionType.HASH:
-      return "HASH";
-    case TableFragments_Fragment_FragmentDistributionType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface TableFragments_FragmentsEntry {
-  key: number;
-  value: TableFragments_Fragment | undefined;
-}
-
-export interface TableFragments_ActorStatusEntry {
-  key: number;
-  value: TableFragments_ActorStatus | undefined;
-}
-
-export interface TableFragments_ActorSplitsEntry {
-  key: number;
-  value: ConnectorSplits | undefined;
-}
-
-/** / Parallel unit mapping with fragment id, used for notification. */
-export interface FragmentParallelUnitMapping {
-  fragmentId: number;
-  mapping: ParallelUnitMapping | undefined;
-}
-
-/** TODO: remove this when dashboard refactored. */
-export interface ActorLocation {
-  node: WorkerNode | undefined;
-  actors: StreamActor[];
-}
-
-export interface FlushRequest {
-  checkpoint: boolean;
-}
-
-export interface FlushResponse {
-  status: Status | undefined;
-  snapshot: HummockSnapshot | undefined;
-}
-
-export interface CreatingJobInfo {
-  databaseId: number;
-  schemaId: number;
-  name: string;
-}
-
-export interface CancelCreatingJobsRequest {
-  infos: CreatingJobInfo[];
-}
-
-export interface CancelCreatingJobsResponse {
-  status: Status | undefined;
-}
-
-export interface ListTableFragmentsRequest {
-  tableIds: number[];
-}
-
-export interface ListTableFragmentsResponse {
-  tableFragments: { [key: number]: ListTableFragmentsResponse_TableFragmentInfo };
-}
-
-export interface ListTableFragmentsResponse_ActorInfo {
-  id: number;
-  node: StreamNode | undefined;
-  dispatcher: Dispatcher[];
-}
-
-export interface ListTableFragmentsResponse_FragmentInfo {
-  id: number;
-  actors: ListTableFragmentsResponse_ActorInfo[];
-}
-
-export interface ListTableFragmentsResponse_TableFragmentInfo {
-  fragments: ListTableFragmentsResponse_FragmentInfo[];
-  env: StreamEnvironment | undefined;
-}
-
-export interface ListTableFragmentsResponse_TableFragmentsEntry {
-  key: number;
-  value: ListTableFragmentsResponse_TableFragmentInfo | undefined;
-}
-
-export interface AddWorkerNodeRequest {
-  workerType: WorkerType;
-  host: HostAddress | undefined;
-  workerNodeParallelism: number;
-}
-
-export interface AddWorkerNodeResponse {
-  status: Status | undefined;
-  node: WorkerNode | undefined;
-}
-
-export interface ActivateWorkerNodeRequest {
-  host: HostAddress | undefined;
-}
-
-export interface ActivateWorkerNodeResponse {
-  status: Status | undefined;
-}
-
-export interface DeleteWorkerNodeRequest {
-  host: HostAddress | undefined;
-}
-
-export interface DeleteWorkerNodeResponse {
-  status: Status | undefined;
-}
-
-export interface ListAllNodesRequest {
-  workerType: WorkerType;
-  /** Whether to include nodes still starting */
-  includeStartingNodes: boolean;
-}
-
-export interface ListAllNodesResponse {
-  status: Status | undefined;
-  nodes: WorkerNode[];
-}
-
-/** Below for notification service. */
-export interface SubscribeRequest {
-  subscribeType: SubscribeType;
-  host: HostAddress | undefined;
-  workerId: number;
-}
-
-export interface MetaSnapshot {
-  databases: Database[];
-  schemas: Schema[];
-  sources: Source[];
-  sinks: Sink[];
-  tables: Table[];
-  indexes: Index[];
-  views: View[];
-  functions: Function[];
-  users: UserInfo[];
-  parallelUnitMappings: FragmentParallelUnitMapping[];
-  nodes: WorkerNode[];
-  hummockSnapshot: HummockSnapshot | undefined;
-  hummockVersion: HummockVersion | undefined;
-  metaBackupManifestId: MetaBackupManifestId | undefined;
-  hummockWriteLimits: WriteLimits | undefined;
-  version: MetaSnapshot_SnapshotVersion | undefined;
-}
-
-export interface MetaSnapshot_SnapshotVersion {
-  catalogVersion: number;
-  parallelUnitMappingVersion: number;
-  workerNodeVersion: number;
-}
-
-export interface SubscribeResponse {
-  status: Status | undefined;
-  operation: SubscribeResponse_Operation;
-  version: number;
-  info?:
-    | { $case: "database"; database: Database }
-    | { $case: "schema"; schema: Schema }
-    | { $case: "table"; table: Table }
-    | { $case: "source"; source: Source }
-    | { $case: "sink"; sink: Sink }
-    | { $case: "index"; index: Index }
-    | { $case: "view"; view: View }
-    | { $case: "function"; function: Function }
-    | { $case: "user"; user: UserInfo }
-    | { $case: "parallelUnitMapping"; parallelUnitMapping: FragmentParallelUnitMapping }
-    | { $case: "node"; node: WorkerNode }
-    | { $case: "hummockSnapshot"; hummockSnapshot: HummockSnapshot }
-    | { $case: "hummockVersionDeltas"; hummockVersionDeltas: HummockVersionDeltas }
-    | { $case: "snapshot"; snapshot: MetaSnapshot }
-    | { $case: "metaBackupManifestId"; metaBackupManifestId: MetaBackupManifestId }
-    | { $case: "systemParams"; systemParams: SystemParams }
-    | { $case: "hummockWriteLimits"; hummockWriteLimits: WriteLimits };
-}
-
-export const SubscribeResponse_Operation = {
-  UNSPECIFIED: "UNSPECIFIED",
-  ADD: "ADD",
-  DELETE: "DELETE",
-  UPDATE: "UPDATE",
-  SNAPSHOT: "SNAPSHOT",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type SubscribeResponse_Operation = typeof SubscribeResponse_Operation[keyof typeof SubscribeResponse_Operation];
-
-export function subscribeResponse_OperationFromJSON(object: any): SubscribeResponse_Operation {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return SubscribeResponse_Operation.UNSPECIFIED;
-    case 1:
-    case "ADD":
-      return SubscribeResponse_Operation.ADD;
-    case 2:
-    case "DELETE":
-      return SubscribeResponse_Operation.DELETE;
-    case 3:
-    case "UPDATE":
-      return SubscribeResponse_Operation.UPDATE;
-    case 4:
-    case "SNAPSHOT":
-      return SubscribeResponse_Operation.SNAPSHOT;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return SubscribeResponse_Operation.UNRECOGNIZED;
-  }
-}
-
-export function subscribeResponse_OperationToJSON(object: SubscribeResponse_Operation): string {
-  switch (object) {
-    case SubscribeResponse_Operation.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case SubscribeResponse_Operation.ADD:
-      return "ADD";
-    case SubscribeResponse_Operation.DELETE:
-      return "DELETE";
-    case SubscribeResponse_Operation.UPDATE:
-      return "UPDATE";
-    case SubscribeResponse_Operation.SNAPSHOT:
-      return "SNAPSHOT";
-    case SubscribeResponse_Operation.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface PauseRequest {
-}
-
-export interface PauseResponse {
-}
-
-export interface ResumeRequest {
-}
-
-export interface ResumeResponse {
-}
-
-export interface GetClusterInfoRequest {
-}
-
-export interface GetClusterInfoResponse {
-  workerNodes: WorkerNode[];
-  tableFragments: TableFragments[];
-  actorSplits: { [key: number]: ConnectorSplits };
-  sourceInfos: { [key: number]: Source };
-}
-
-export interface GetClusterInfoResponse_ActorSplitsEntry {
-  key: number;
-  value: ConnectorSplits | undefined;
-}
-
-export interface GetClusterInfoResponse_SourceInfosEntry {
-  key: number;
-  value: Source | undefined;
-}
-
-export interface RescheduleRequest {
-  /** reschedule plan for each fragment */
-  reschedules: { [key: number]: RescheduleRequest_Reschedule };
-}
-
-export interface RescheduleRequest_Reschedule {
-  addedParallelUnits: number[];
-  removedParallelUnits: number[];
-}
-
-export interface RescheduleRequest_ReschedulesEntry {
-  key: number;
-  value: RescheduleRequest_Reschedule | undefined;
-}
-
-export interface RescheduleResponse {
-  success: boolean;
-}
-
-export interface MembersRequest {
-}
-
-export interface MetaMember {
-  address: HostAddress | undefined;
-  isLeader: boolean;
-}
-
-export interface MembersResponse {
-  members: MetaMember[];
-}
-
-/**
- * The schema for persisted system parameters.
- * Note on backward compatibility:
- * - Do not remove deprecated fields. Mark them as deprecated both after the field definition and in `system_params/mod.rs` instead.
- * - Do not rename existing fields, since each field is stored separately in the meta store with the field name as the key.
- * - To modify (rename, change the type or semantic of) a field, introduce a new field suffixed by the version.
- */
-export interface SystemParams {
-  barrierIntervalMs?: number | undefined;
-  checkpointFrequency?: number | undefined;
-  sstableSizeMb?: number | undefined;
-  blockSizeKb?: number | undefined;
-  bloomFalsePositive?: number | undefined;
-  stateStore?: string | undefined;
-  dataDirectory?: string | undefined;
-  backupStorageUrl?: string | undefined;
-  backupStorageDirectory?: string | undefined;
-}
-
-export interface GetSystemParamsRequest {
-}
-
-export interface GetSystemParamsResponse {
-  params: SystemParams | undefined;
-}
-
-export interface SetSystemParamRequest {
-  param: string;
-  /** None means set to default value. */
-  value?: string | undefined;
-}
-
-export interface SetSystemParamResponse {
-}
-
-function createBaseHeartbeatRequest(): HeartbeatRequest {
-  return { nodeId: 0, info: [] };
-}
-
-export const HeartbeatRequest = {
-  fromJSON(object: any): HeartbeatRequest {
-    return {
-      nodeId: isSet(object.nodeId) ? Number(object.nodeId) : 0,
-      info: Array.isArray(object?.info) ? object.info.map((e: any) => HeartbeatRequest_ExtraInfo.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: HeartbeatRequest): unknown {
-    const obj: any = {};
-    message.nodeId !== undefined && (obj.nodeId = Math.round(message.nodeId));
-    if (message.info) {
-      obj.info = message.info.map((e) => e ? HeartbeatRequest_ExtraInfo.toJSON(e) : undefined);
-    } else {
-      obj.info = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HeartbeatRequest>, I>>(object: I): HeartbeatRequest {
-    const message = createBaseHeartbeatRequest();
-    message.nodeId = object.nodeId ?? 0;
-    message.info = object.info?.map((e) => HeartbeatRequest_ExtraInfo.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseHeartbeatRequest_ExtraInfo(): HeartbeatRequest_ExtraInfo {
-  return { info: undefined };
-}
-
-export const HeartbeatRequest_ExtraInfo = {
-  fromJSON(object: any): HeartbeatRequest_ExtraInfo {
-    return {
-      info: isSet(object.hummockGcWatermark)
-        ? { $case: "hummockGcWatermark", hummockGcWatermark: Number(object.hummockGcWatermark) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: HeartbeatRequest_ExtraInfo): unknown {
-    const obj: any = {};
-    message.info?.$case === "hummockGcWatermark" &&
-      (obj.hummockGcWatermark = Math.round(message.info?.hummockGcWatermark));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HeartbeatRequest_ExtraInfo>, I>>(object: I): HeartbeatRequest_ExtraInfo {
-    const message = createBaseHeartbeatRequest_ExtraInfo();
-    if (
-      object.info?.$case === "hummockGcWatermark" &&
-      object.info?.hummockGcWatermark !== undefined &&
-      object.info?.hummockGcWatermark !== null
-    ) {
-      message.info = { $case: "hummockGcWatermark", hummockGcWatermark: object.info.hummockGcWatermark };
-    }
-    return message;
-  },
-};
-
-function createBaseHeartbeatResponse(): HeartbeatResponse {
-  return { status: undefined };
-}
-
-export const HeartbeatResponse = {
-  fromJSON(object: any): HeartbeatResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: HeartbeatResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HeartbeatResponse>, I>>(object: I): HeartbeatResponse {
-    const message = createBaseHeartbeatResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseTableFragments(): TableFragments {
-  return {
-    tableId: 0,
-    state: TableFragments_State.UNSPECIFIED,
-    fragments: {},
-    actorStatus: {},
-    actorSplits: {},
-    env: undefined,
-  };
-}
-
-export const TableFragments = {
-  fromJSON(object: any): TableFragments {
-    return {
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      state: isSet(object.state) ? tableFragments_StateFromJSON(object.state) : TableFragments_State.UNSPECIFIED,
-      fragments: isObject(object.fragments)
-        ? Object.entries(object.fragments).reduce<{ [key: number]: TableFragments_Fragment }>((acc, [key, value]) => {
-          acc[Number(key)] = TableFragments_Fragment.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-      actorStatus: isObject(object.actorStatus)
-        ? Object.entries(object.actorStatus).reduce<{ [key: number]: TableFragments_ActorStatus }>(
-          (acc, [key, value]) => {
-            acc[Number(key)] = TableFragments_ActorStatus.fromJSON(value);
-            return acc;
-          },
-          {},
-        )
-        : {},
-      actorSplits: isObject(object.actorSplits)
-        ? Object.entries(object.actorSplits).reduce<{ [key: number]: ConnectorSplits }>((acc, [key, value]) => {
-          acc[Number(key)] = ConnectorSplits.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-      env: isSet(object.env) ? StreamEnvironment.fromJSON(object.env) : undefined,
-    };
-  },
-
-  toJSON(message: TableFragments): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    message.state !== undefined && (obj.state = tableFragments_StateToJSON(message.state));
-    obj.fragments = {};
-    if (message.fragments) {
-      Object.entries(message.fragments).forEach(([k, v]) => {
-        obj.fragments[k] = TableFragments_Fragment.toJSON(v);
-      });
-    }
-    obj.actorStatus = {};
-    if (message.actorStatus) {
-      Object.entries(message.actorStatus).forEach(([k, v]) => {
-        obj.actorStatus[k] = TableFragments_ActorStatus.toJSON(v);
-      });
-    }
-    obj.actorSplits = {};
-    if (message.actorSplits) {
-      Object.entries(message.actorSplits).forEach(([k, v]) => {
-        obj.actorSplits[k] = ConnectorSplits.toJSON(v);
-      });
-    }
-    message.env !== undefined && (obj.env = message.env ? StreamEnvironment.toJSON(message.env) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableFragments>, I>>(object: I): TableFragments {
-    const message = createBaseTableFragments();
-    message.tableId = object.tableId ?? 0;
-    message.state = object.state ?? TableFragments_State.UNSPECIFIED;
-    message.fragments = Object.entries(object.fragments ?? {}).reduce<{ [key: number]: TableFragments_Fragment }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = TableFragments_Fragment.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.actorStatus = Object.entries(object.actorStatus ?? {}).reduce<
-      { [key: number]: TableFragments_ActorStatus }
-    >((acc, [key, value]) => {
-      if (value !== undefined) {
-        acc[Number(key)] = TableFragments_ActorStatus.fromPartial(value);
-      }
-      return acc;
-    }, {});
-    message.actorSplits = Object.entries(object.actorSplits ?? {}).reduce<{ [key: number]: ConnectorSplits }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = ConnectorSplits.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.env = (object.env !== undefined && object.env !== null)
-      ? StreamEnvironment.fromPartial(object.env)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseTableFragments_ActorStatus(): TableFragments_ActorStatus {
-  return { parallelUnit: undefined, state: TableFragments_ActorStatus_ActorState.UNSPECIFIED };
-}
-
-export const TableFragments_ActorStatus = {
-  fromJSON(object: any): TableFragments_ActorStatus {
-    return {
-      parallelUnit: isSet(object.parallelUnit) ? ParallelUnit.fromJSON(object.parallelUnit) : undefined,
-      state: isSet(object.state)
-        ? tableFragments_ActorStatus_ActorStateFromJSON(object.state)
-        : TableFragments_ActorStatus_ActorState.UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: TableFragments_ActorStatus): unknown {
-    const obj: any = {};
-    message.parallelUnit !== undefined &&
-      (obj.parallelUnit = message.parallelUnit ? ParallelUnit.toJSON(message.parallelUnit) : undefined);
-    message.state !== undefined && (obj.state = tableFragments_ActorStatus_ActorStateToJSON(message.state));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableFragments_ActorStatus>, I>>(object: I): TableFragments_ActorStatus {
-    const message = createBaseTableFragments_ActorStatus();
-    message.parallelUnit = (object.parallelUnit !== undefined && object.parallelUnit !== null)
-      ? ParallelUnit.fromPartial(object.parallelUnit)
-      : undefined;
-    message.state = object.state ?? TableFragments_ActorStatus_ActorState.UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseTableFragments_Fragment(): TableFragments_Fragment {
-  return {
-    fragmentId: 0,
-    fragmentTypeMask: 0,
-    distributionType: TableFragments_Fragment_FragmentDistributionType.UNSPECIFIED,
-    actors: [],
-    vnodeMapping: undefined,
-    stateTableIds: [],
-    upstreamFragmentIds: [],
-  };
-}
-
-export const TableFragments_Fragment = {
-  fromJSON(object: any): TableFragments_Fragment {
-    return {
-      fragmentId: isSet(object.fragmentId) ? Number(object.fragmentId) : 0,
-      fragmentTypeMask: isSet(object.fragmentTypeMask) ? Number(object.fragmentTypeMask) : 0,
-      distributionType: isSet(object.distributionType)
-        ? tableFragments_Fragment_FragmentDistributionTypeFromJSON(object.distributionType)
-        : TableFragments_Fragment_FragmentDistributionType.UNSPECIFIED,
-      actors: Array.isArray(object?.actors) ? object.actors.map((e: any) => StreamActor.fromJSON(e)) : [],
-      vnodeMapping: isSet(object.vnodeMapping) ? ParallelUnitMapping.fromJSON(object.vnodeMapping) : undefined,
-      stateTableIds: Array.isArray(object?.stateTableIds) ? object.stateTableIds.map((e: any) => Number(e)) : [],
-      upstreamFragmentIds: Array.isArray(object?.upstreamFragmentIds)
-        ? object.upstreamFragmentIds.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: TableFragments_Fragment): unknown {
-    const obj: any = {};
-    message.fragmentId !== undefined && (obj.fragmentId = Math.round(message.fragmentId));
-    message.fragmentTypeMask !== undefined && (obj.fragmentTypeMask = Math.round(message.fragmentTypeMask));
-    message.distributionType !== undefined &&
-      (obj.distributionType = tableFragments_Fragment_FragmentDistributionTypeToJSON(message.distributionType));
-    if (message.actors) {
-      obj.actors = message.actors.map((e) => e ? StreamActor.toJSON(e) : undefined);
-    } else {
-      obj.actors = [];
-    }
-    message.vnodeMapping !== undefined &&
-      (obj.vnodeMapping = message.vnodeMapping ? ParallelUnitMapping.toJSON(message.vnodeMapping) : undefined);
-    if (message.stateTableIds) {
-      obj.stateTableIds = message.stateTableIds.map((e) => Math.round(e));
-    } else {
-      obj.stateTableIds = [];
-    }
-    if (message.upstreamFragmentIds) {
-      obj.upstreamFragmentIds = message.upstreamFragmentIds.map((e) => Math.round(e));
-    } else {
-      obj.upstreamFragmentIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableFragments_Fragment>, I>>(object: I): TableFragments_Fragment {
-    const message = createBaseTableFragments_Fragment();
-    message.fragmentId = object.fragmentId ?? 0;
-    message.fragmentTypeMask = object.fragmentTypeMask ?? 0;
-    message.distributionType = object.distributionType ?? TableFragments_Fragment_FragmentDistributionType.UNSPECIFIED;
-    message.actors = object.actors?.map((e) => StreamActor.fromPartial(e)) || [];
-    message.vnodeMapping = (object.vnodeMapping !== undefined && object.vnodeMapping !== null)
-      ? ParallelUnitMapping.fromPartial(object.vnodeMapping)
-      : undefined;
-    message.stateTableIds = object.stateTableIds?.map((e) => e) || [];
-    message.upstreamFragmentIds = object.upstreamFragmentIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseTableFragments_FragmentsEntry(): TableFragments_FragmentsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const TableFragments_FragmentsEntry = {
-  fromJSON(object: any): TableFragments_FragmentsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? TableFragments_Fragment.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: TableFragments_FragmentsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined &&
-      (obj.value = message.value ? TableFragments_Fragment.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableFragments_FragmentsEntry>, I>>(
-    object: I,
-  ): TableFragments_FragmentsEntry {
-    const message = createBaseTableFragments_FragmentsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? TableFragments_Fragment.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseTableFragments_ActorStatusEntry(): TableFragments_ActorStatusEntry {
-  return { key: 0, value: undefined };
-}
-
-export const TableFragments_ActorStatusEntry = {
-  fromJSON(object: any): TableFragments_ActorStatusEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? TableFragments_ActorStatus.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: TableFragments_ActorStatusEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined &&
-      (obj.value = message.value ? TableFragments_ActorStatus.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableFragments_ActorStatusEntry>, I>>(
-    object: I,
-  ): TableFragments_ActorStatusEntry {
-    const message = createBaseTableFragments_ActorStatusEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? TableFragments_ActorStatus.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseTableFragments_ActorSplitsEntry(): TableFragments_ActorSplitsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const TableFragments_ActorSplitsEntry = {
-  fromJSON(object: any): TableFragments_ActorSplitsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? ConnectorSplits.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: TableFragments_ActorSplitsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? ConnectorSplits.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TableFragments_ActorSplitsEntry>, I>>(
-    object: I,
-  ): TableFragments_ActorSplitsEntry {
-    const message = createBaseTableFragments_ActorSplitsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? ConnectorSplits.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseFragmentParallelUnitMapping(): FragmentParallelUnitMapping {
-  return { fragmentId: 0, mapping: undefined };
-}
-
-export const FragmentParallelUnitMapping = {
-  fromJSON(object: any): FragmentParallelUnitMapping {
-    return {
-      fragmentId: isSet(object.fragmentId) ? Number(object.fragmentId) : 0,
-      mapping: isSet(object.mapping) ? ParallelUnitMapping.fromJSON(object.mapping) : undefined,
-    };
-  },
-
-  toJSON(message: FragmentParallelUnitMapping): unknown {
-    const obj: any = {};
-    message.fragmentId !== undefined && (obj.fragmentId = Math.round(message.fragmentId));
-    message.mapping !== undefined &&
-      (obj.mapping = message.mapping ? ParallelUnitMapping.toJSON(message.mapping) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<FragmentParallelUnitMapping>, I>>(object: I): FragmentParallelUnitMapping {
-    const message = createBaseFragmentParallelUnitMapping();
-    message.fragmentId = object.fragmentId ?? 0;
-    message.mapping = (object.mapping !== undefined && object.mapping !== null)
-      ? ParallelUnitMapping.fromPartial(object.mapping)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseActorLocation(): ActorLocation {
-  return { node: undefined, actors: [] };
-}
-
-export const ActorLocation = {
-  fromJSON(object: any): ActorLocation {
-    return {
-      node: isSet(object.node) ? WorkerNode.fromJSON(object.node) : undefined,
-      actors: Array.isArray(object?.actors) ? object.actors.map((e: any) => StreamActor.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: ActorLocation): unknown {
-    const obj: any = {};
-    message.node !== undefined && (obj.node = message.node ? WorkerNode.toJSON(message.node) : undefined);
-    if (message.actors) {
-      obj.actors = message.actors.map((e) => e ? StreamActor.toJSON(e) : undefined);
-    } else {
-      obj.actors = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ActorLocation>, I>>(object: I): ActorLocation {
-    const message = createBaseActorLocation();
-    message.node = (object.node !== undefined && object.node !== null)
-      ? WorkerNode.fromPartial(object.node)
-      : undefined;
-    message.actors = object.actors?.map((e) => StreamActor.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseFlushRequest(): FlushRequest {
-  return { checkpoint: false };
-}
-
-export const FlushRequest = {
-  fromJSON(object: any): FlushRequest {
-    return { checkpoint: isSet(object.checkpoint) ? Boolean(object.checkpoint) : false };
-  },
-
-  toJSON(message: FlushRequest): unknown {
-    const obj: any = {};
-    message.checkpoint !== undefined && (obj.checkpoint = message.checkpoint);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<FlushRequest>, I>>(object: I): FlushRequest {
-    const message = createBaseFlushRequest();
-    message.checkpoint = object.checkpoint ?? false;
-    return message;
-  },
-};
-
-function createBaseFlushResponse(): FlushResponse {
-  return { status: undefined, snapshot: undefined };
-}
-
-export const FlushResponse = {
-  fromJSON(object: any): FlushResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      snapshot: isSet(object.snapshot) ? HummockSnapshot.fromJSON(object.snapshot) : undefined,
-    };
-  },
-
-  toJSON(message: FlushResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.snapshot !== undefined &&
-      (obj.snapshot = message.snapshot ? HummockSnapshot.toJSON(message.snapshot) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<FlushResponse>, I>>(object: I): FlushResponse {
-    const message = createBaseFlushResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.snapshot = (object.snapshot !== undefined && object.snapshot !== null)
-      ? HummockSnapshot.fromPartial(object.snapshot)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseCreatingJobInfo(): CreatingJobInfo {
-  return { databaseId: 0, schemaId: 0, name: "" };
-}
-
-export const CreatingJobInfo = {
-  fromJSON(object: any): CreatingJobInfo {
-    return {
-      databaseId: isSet(object.databaseId) ? Number(object.databaseId) : 0,
-      schemaId: isSet(object.schemaId) ? Number(object.schemaId) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-    };
-  },
-
-  toJSON(message: CreatingJobInfo): unknown {
-    const obj: any = {};
-    message.databaseId !== undefined && (obj.databaseId = Math.round(message.databaseId));
-    message.schemaId !== undefined && (obj.schemaId = Math.round(message.schemaId));
-    message.name !== undefined && (obj.name = message.name);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreatingJobInfo>, I>>(object: I): CreatingJobInfo {
-    const message = createBaseCreatingJobInfo();
-    message.databaseId = object.databaseId ?? 0;
-    message.schemaId = object.schemaId ?? 0;
-    message.name = object.name ?? "";
-    return message;
-  },
-};
-
-function createBaseCancelCreatingJobsRequest(): CancelCreatingJobsRequest {
-  return { infos: [] };
-}
-
-export const CancelCreatingJobsRequest = {
-  fromJSON(object: any): CancelCreatingJobsRequest {
-    return { infos: Array.isArray(object?.infos) ? object.infos.map((e: any) => CreatingJobInfo.fromJSON(e)) : [] };
-  },
-
-  toJSON(message: CancelCreatingJobsRequest): unknown {
-    const obj: any = {};
-    if (message.infos) {
-      obj.infos = message.infos.map((e) => e ? CreatingJobInfo.toJSON(e) : undefined);
-    } else {
-      obj.infos = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CancelCreatingJobsRequest>, I>>(object: I): CancelCreatingJobsRequest {
-    const message = createBaseCancelCreatingJobsRequest();
-    message.infos = object.infos?.map((e) => CreatingJobInfo.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseCancelCreatingJobsResponse(): CancelCreatingJobsResponse {
-  return { status: undefined };
-}
-
-export const CancelCreatingJobsResponse = {
-  fromJSON(object: any): CancelCreatingJobsResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: CancelCreatingJobsResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CancelCreatingJobsResponse>, I>>(object: I): CancelCreatingJobsResponse {
-    const message = createBaseCancelCreatingJobsResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseListTableFragmentsRequest(): ListTableFragmentsRequest {
-  return { tableIds: [] };
-}
-
-export const ListTableFragmentsRequest = {
-  fromJSON(object: any): ListTableFragmentsRequest {
-    return { tableIds: Array.isArray(object?.tableIds) ? object.tableIds.map((e: any) => Number(e)) : [] };
-  },
-
-  toJSON(message: ListTableFragmentsRequest): unknown {
-    const obj: any = {};
-    if (message.tableIds) {
-      obj.tableIds = message.tableIds.map((e) => Math.round(e));
-    } else {
-      obj.tableIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListTableFragmentsRequest>, I>>(object: I): ListTableFragmentsRequest {
-    const message = createBaseListTableFragmentsRequest();
-    message.tableIds = object.tableIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseListTableFragmentsResponse(): ListTableFragmentsResponse {
-  return { tableFragments: {} };
-}
-
-export const ListTableFragmentsResponse = {
-  fromJSON(object: any): ListTableFragmentsResponse {
-    return {
-      tableFragments: isObject(object.tableFragments)
-        ? Object.entries(object.tableFragments).reduce<{ [key: number]: ListTableFragmentsResponse_TableFragmentInfo }>(
-          (acc, [key, value]) => {
-            acc[Number(key)] = ListTableFragmentsResponse_TableFragmentInfo.fromJSON(value);
-            return acc;
-          },
-          {},
-        )
-        : {},
-    };
-  },
-
-  toJSON(message: ListTableFragmentsResponse): unknown {
-    const obj: any = {};
-    obj.tableFragments = {};
-    if (message.tableFragments) {
-      Object.entries(message.tableFragments).forEach(([k, v]) => {
-        obj.tableFragments[k] = ListTableFragmentsResponse_TableFragmentInfo.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListTableFragmentsResponse>, I>>(object: I): ListTableFragmentsResponse {
-    const message = createBaseListTableFragmentsResponse();
-    message.tableFragments = Object.entries(object.tableFragments ?? {}).reduce<
-      { [key: number]: ListTableFragmentsResponse_TableFragmentInfo }
-    >((acc, [key, value]) => {
-      if (value !== undefined) {
-        acc[Number(key)] = ListTableFragmentsResponse_TableFragmentInfo.fromPartial(value);
-      }
-      return acc;
-    }, {});
-    return message;
-  },
-};
-
-function createBaseListTableFragmentsResponse_ActorInfo(): ListTableFragmentsResponse_ActorInfo {
-  return { id: 0, node: undefined, dispatcher: [] };
-}
-
-export const ListTableFragmentsResponse_ActorInfo = {
-  fromJSON(object: any): ListTableFragmentsResponse_ActorInfo {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      node: isSet(object.node) ? StreamNode.fromJSON(object.node) : undefined,
-      dispatcher: Array.isArray(object?.dispatcher) ? object.dispatcher.map((e: any) => Dispatcher.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: ListTableFragmentsResponse_ActorInfo): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.node !== undefined && (obj.node = message.node ? StreamNode.toJSON(message.node) : undefined);
-    if (message.dispatcher) {
-      obj.dispatcher = message.dispatcher.map((e) => e ? Dispatcher.toJSON(e) : undefined);
-    } else {
-      obj.dispatcher = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListTableFragmentsResponse_ActorInfo>, I>>(
-    object: I,
-  ): ListTableFragmentsResponse_ActorInfo {
-    const message = createBaseListTableFragmentsResponse_ActorInfo();
-    message.id = object.id ?? 0;
-    message.node = (object.node !== undefined && object.node !== null)
-      ? StreamNode.fromPartial(object.node)
-      : undefined;
-    message.dispatcher = object.dispatcher?.map((e) => Dispatcher.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseListTableFragmentsResponse_FragmentInfo(): ListTableFragmentsResponse_FragmentInfo {
-  return { id: 0, actors: [] };
-}
-
-export const ListTableFragmentsResponse_FragmentInfo = {
-  fromJSON(object: any): ListTableFragmentsResponse_FragmentInfo {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      actors: Array.isArray(object?.actors)
-        ? object.actors.map((e: any) => ListTableFragmentsResponse_ActorInfo.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: ListTableFragmentsResponse_FragmentInfo): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    if (message.actors) {
-      obj.actors = message.actors.map((e) => e ? ListTableFragmentsResponse_ActorInfo.toJSON(e) : undefined);
-    } else {
-      obj.actors = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListTableFragmentsResponse_FragmentInfo>, I>>(
-    object: I,
-  ): ListTableFragmentsResponse_FragmentInfo {
-    const message = createBaseListTableFragmentsResponse_FragmentInfo();
-    message.id = object.id ?? 0;
-    message.actors = object.actors?.map((e) => ListTableFragmentsResponse_ActorInfo.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseListTableFragmentsResponse_TableFragmentInfo(): ListTableFragmentsResponse_TableFragmentInfo {
-  return { fragments: [], env: undefined };
-}
-
-export const ListTableFragmentsResponse_TableFragmentInfo = {
-  fromJSON(object: any): ListTableFragmentsResponse_TableFragmentInfo {
-    return {
-      fragments: Array.isArray(object?.fragments)
-        ? object.fragments.map((e: any) => ListTableFragmentsResponse_FragmentInfo.fromJSON(e))
-        : [],
-      env: isSet(object.env) ? StreamEnvironment.fromJSON(object.env) : undefined,
-    };
-  },
-
-  toJSON(message: ListTableFragmentsResponse_TableFragmentInfo): unknown {
-    const obj: any = {};
-    if (message.fragments) {
-      obj.fragments = message.fragments.map((e) => e ? ListTableFragmentsResponse_FragmentInfo.toJSON(e) : undefined);
-    } else {
-      obj.fragments = [];
-    }
-    message.env !== undefined && (obj.env = message.env ? StreamEnvironment.toJSON(message.env) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListTableFragmentsResponse_TableFragmentInfo>, I>>(
-    object: I,
-  ): ListTableFragmentsResponse_TableFragmentInfo {
-    const message = createBaseListTableFragmentsResponse_TableFragmentInfo();
-    message.fragments = object.fragments?.map((e) => ListTableFragmentsResponse_FragmentInfo.fromPartial(e)) || [];
-    message.env = (object.env !== undefined && object.env !== null)
-      ? StreamEnvironment.fromPartial(object.env)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseListTableFragmentsResponse_TableFragmentsEntry(): ListTableFragmentsResponse_TableFragmentsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const ListTableFragmentsResponse_TableFragmentsEntry = {
-  fromJSON(object: any): ListTableFragmentsResponse_TableFragmentsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? ListTableFragmentsResponse_TableFragmentInfo.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: ListTableFragmentsResponse_TableFragmentsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined &&
-      (obj.value = message.value ? ListTableFragmentsResponse_TableFragmentInfo.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListTableFragmentsResponse_TableFragmentsEntry>, I>>(
-    object: I,
-  ): ListTableFragmentsResponse_TableFragmentsEntry {
-    const message = createBaseListTableFragmentsResponse_TableFragmentsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? ListTableFragmentsResponse_TableFragmentInfo.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseAddWorkerNodeRequest(): AddWorkerNodeRequest {
-  return { workerType: WorkerType.UNSPECIFIED, host: undefined, workerNodeParallelism: 0 };
-}
-
-export const AddWorkerNodeRequest = {
-  fromJSON(object: any): AddWorkerNodeRequest {
-    return {
-      workerType: isSet(object.workerType) ? workerTypeFromJSON(object.workerType) : WorkerType.UNSPECIFIED,
-      host: isSet(object.host) ? HostAddress.fromJSON(object.host) : undefined,
-      workerNodeParallelism: isSet(object.workerNodeParallelism) ? Number(object.workerNodeParallelism) : 0,
-    };
-  },
-
-  toJSON(message: AddWorkerNodeRequest): unknown {
-    const obj: any = {};
-    message.workerType !== undefined && (obj.workerType = workerTypeToJSON(message.workerType));
-    message.host !== undefined && (obj.host = message.host ? HostAddress.toJSON(message.host) : undefined);
-    message.workerNodeParallelism !== undefined &&
-      (obj.workerNodeParallelism = Math.round(message.workerNodeParallelism));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddWorkerNodeRequest>, I>>(object: I): AddWorkerNodeRequest {
-    const message = createBaseAddWorkerNodeRequest();
-    message.workerType = object.workerType ?? WorkerType.UNSPECIFIED;
-    message.host = (object.host !== undefined && object.host !== null)
-      ? HostAddress.fromPartial(object.host)
-      : undefined;
-    message.workerNodeParallelism = object.workerNodeParallelism ?? 0;
-    return message;
-  },
-};
-
-function createBaseAddWorkerNodeResponse(): AddWorkerNodeResponse {
-  return { status: undefined, node: undefined };
-}
-
-export const AddWorkerNodeResponse = {
-  fromJSON(object: any): AddWorkerNodeResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      node: isSet(object.node) ? WorkerNode.fromJSON(object.node) : undefined,
-    };
-  },
-
-  toJSON(message: AddWorkerNodeResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.node !== undefined && (obj.node = message.node ? WorkerNode.toJSON(message.node) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddWorkerNodeResponse>, I>>(object: I): AddWorkerNodeResponse {
-    const message = createBaseAddWorkerNodeResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.node = (object.node !== undefined && object.node !== null)
-      ? WorkerNode.fromPartial(object.node)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseActivateWorkerNodeRequest(): ActivateWorkerNodeRequest {
-  return { host: undefined };
-}
-
-export const ActivateWorkerNodeRequest = {
-  fromJSON(object: any): ActivateWorkerNodeRequest {
-    return { host: isSet(object.host) ? HostAddress.fromJSON(object.host) : undefined };
-  },
-
-  toJSON(message: ActivateWorkerNodeRequest): unknown {
-    const obj: any = {};
-    message.host !== undefined && (obj.host = message.host ? HostAddress.toJSON(message.host) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ActivateWorkerNodeRequest>, I>>(object: I): ActivateWorkerNodeRequest {
-    const message = createBaseActivateWorkerNodeRequest();
-    message.host = (object.host !== undefined && object.host !== null)
-      ? HostAddress.fromPartial(object.host)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseActivateWorkerNodeResponse(): ActivateWorkerNodeResponse {
-  return { status: undefined };
-}
-
-export const ActivateWorkerNodeResponse = {
-  fromJSON(object: any): ActivateWorkerNodeResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: ActivateWorkerNodeResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ActivateWorkerNodeResponse>, I>>(object: I): ActivateWorkerNodeResponse {
-    const message = createBaseActivateWorkerNodeResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseDeleteWorkerNodeRequest(): DeleteWorkerNodeRequest {
-  return { host: undefined };
-}
-
-export const DeleteWorkerNodeRequest = {
-  fromJSON(object: any): DeleteWorkerNodeRequest {
-    return { host: isSet(object.host) ? HostAddress.fromJSON(object.host) : undefined };
-  },
-
-  toJSON(message: DeleteWorkerNodeRequest): unknown {
-    const obj: any = {};
-    message.host !== undefined && (obj.host = message.host ? HostAddress.toJSON(message.host) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeleteWorkerNodeRequest>, I>>(object: I): DeleteWorkerNodeRequest {
-    const message = createBaseDeleteWorkerNodeRequest();
-    message.host = (object.host !== undefined && object.host !== null)
-      ? HostAddress.fromPartial(object.host)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseDeleteWorkerNodeResponse(): DeleteWorkerNodeResponse {
-  return { status: undefined };
-}
-
-export const DeleteWorkerNodeResponse = {
-  fromJSON(object: any): DeleteWorkerNodeResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: DeleteWorkerNodeResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeleteWorkerNodeResponse>, I>>(object: I): DeleteWorkerNodeResponse {
-    const message = createBaseDeleteWorkerNodeResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseListAllNodesRequest(): ListAllNodesRequest {
-  return { workerType: WorkerType.UNSPECIFIED, includeStartingNodes: false };
-}
-
-export const ListAllNodesRequest = {
-  fromJSON(object: any): ListAllNodesRequest {
-    return {
-      workerType: isSet(object.workerType) ? workerTypeFromJSON(object.workerType) : WorkerType.UNSPECIFIED,
-      includeStartingNodes: isSet(object.includeStartingNodes) ? Boolean(object.includeStartingNodes) : false,
-    };
-  },
-
-  toJSON(message: ListAllNodesRequest): unknown {
-    const obj: any = {};
-    message.workerType !== undefined && (obj.workerType = workerTypeToJSON(message.workerType));
-    message.includeStartingNodes !== undefined && (obj.includeStartingNodes = message.includeStartingNodes);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListAllNodesRequest>, I>>(object: I): ListAllNodesRequest {
-    const message = createBaseListAllNodesRequest();
-    message.workerType = object.workerType ?? WorkerType.UNSPECIFIED;
-    message.includeStartingNodes = object.includeStartingNodes ?? false;
-    return message;
-  },
-};
-
-function createBaseListAllNodesResponse(): ListAllNodesResponse {
-  return { status: undefined, nodes: [] };
-}
-
-export const ListAllNodesResponse = {
-  fromJSON(object: any): ListAllNodesResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      nodes: Array.isArray(object?.nodes) ? object.nodes.map((e: any) => WorkerNode.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: ListAllNodesResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    if (message.nodes) {
-      obj.nodes = message.nodes.map((e) => e ? WorkerNode.toJSON(e) : undefined);
-    } else {
-      obj.nodes = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ListAllNodesResponse>, I>>(object: I): ListAllNodesResponse {
-    const message = createBaseListAllNodesResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.nodes = object.nodes?.map((e) => WorkerNode.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseSubscribeRequest(): SubscribeRequest {
-  return { subscribeType: SubscribeType.UNSPECIFIED, host: undefined, workerId: 0 };
-}
-
-export const SubscribeRequest = {
-  fromJSON(object: any): SubscribeRequest {
-    return {
-      subscribeType: isSet(object.subscribeType)
-        ? subscribeTypeFromJSON(object.subscribeType)
-        : SubscribeType.UNSPECIFIED,
-      host: isSet(object.host) ? HostAddress.fromJSON(object.host) : undefined,
-      workerId: isSet(object.workerId) ? Number(object.workerId) : 0,
-    };
-  },
-
-  toJSON(message: SubscribeRequest): unknown {
-    const obj: any = {};
-    message.subscribeType !== undefined && (obj.subscribeType = subscribeTypeToJSON(message.subscribeType));
-    message.host !== undefined && (obj.host = message.host ? HostAddress.toJSON(message.host) : undefined);
-    message.workerId !== undefined && (obj.workerId = Math.round(message.workerId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SubscribeRequest>, I>>(object: I): SubscribeRequest {
-    const message = createBaseSubscribeRequest();
-    message.subscribeType = object.subscribeType ?? SubscribeType.UNSPECIFIED;
-    message.host = (object.host !== undefined && object.host !== null)
-      ? HostAddress.fromPartial(object.host)
-      : undefined;
-    message.workerId = object.workerId ?? 0;
-    return message;
-  },
-};
-
-function createBaseMetaSnapshot(): MetaSnapshot {
-  return {
-    databases: [],
-    schemas: [],
-    sources: [],
-    sinks: [],
-    tables: [],
-    indexes: [],
-    views: [],
-    functions: [],
-    users: [],
-    parallelUnitMappings: [],
-    nodes: [],
-    hummockSnapshot: undefined,
-    hummockVersion: undefined,
-    metaBackupManifestId: undefined,
-    hummockWriteLimits: undefined,
-    version: undefined,
-  };
-}
-
-export const MetaSnapshot = {
-  fromJSON(object: any): MetaSnapshot {
-    return {
-      databases: Array.isArray(object?.databases) ? object.databases.map((e: any) => Database.fromJSON(e)) : [],
-      schemas: Array.isArray(object?.schemas) ? object.schemas.map((e: any) => Schema.fromJSON(e)) : [],
-      sources: Array.isArray(object?.sources) ? object.sources.map((e: any) => Source.fromJSON(e)) : [],
-      sinks: Array.isArray(object?.sinks) ? object.sinks.map((e: any) => Sink.fromJSON(e)) : [],
-      tables: Array.isArray(object?.tables) ? object.tables.map((e: any) => Table.fromJSON(e)) : [],
-      indexes: Array.isArray(object?.indexes) ? object.indexes.map((e: any) => Index.fromJSON(e)) : [],
-      views: Array.isArray(object?.views) ? object.views.map((e: any) => View.fromJSON(e)) : [],
-      functions: Array.isArray(object?.functions) ? object.functions.map((e: any) => Function.fromJSON(e)) : [],
-      users: Array.isArray(object?.users) ? object.users.map((e: any) => UserInfo.fromJSON(e)) : [],
-      parallelUnitMappings: Array.isArray(object?.parallelUnitMappings)
-        ? object.parallelUnitMappings.map((e: any) => FragmentParallelUnitMapping.fromJSON(e))
-        : [],
-      nodes: Array.isArray(object?.nodes)
-        ? object.nodes.map((e: any) => WorkerNode.fromJSON(e))
-        : [],
-      hummockSnapshot: isSet(object.hummockSnapshot) ? HummockSnapshot.fromJSON(object.hummockSnapshot) : undefined,
-      hummockVersion: isSet(object.hummockVersion) ? HummockVersion.fromJSON(object.hummockVersion) : undefined,
-      metaBackupManifestId: isSet(object.metaBackupManifestId)
-        ? MetaBackupManifestId.fromJSON(object.metaBackupManifestId)
-        : undefined,
-      hummockWriteLimits: isSet(object.hummockWriteLimits)
-        ? WriteLimits.fromJSON(object.hummockWriteLimits)
-        : undefined,
-      version: isSet(object.version) ? MetaSnapshot_SnapshotVersion.fromJSON(object.version) : undefined,
-    };
-  },
-
-  toJSON(message: MetaSnapshot): unknown {
-    const obj: any = {};
-    if (message.databases) {
-      obj.databases = message.databases.map((e) => e ? Database.toJSON(e) : undefined);
-    } else {
-      obj.databases = [];
-    }
-    if (message.schemas) {
-      obj.schemas = message.schemas.map((e) => e ? Schema.toJSON(e) : undefined);
-    } else {
-      obj.schemas = [];
-    }
-    if (message.sources) {
-      obj.sources = message.sources.map((e) => e ? Source.toJSON(e) : undefined);
-    } else {
-      obj.sources = [];
-    }
-    if (message.sinks) {
-      obj.sinks = message.sinks.map((e) => e ? Sink.toJSON(e) : undefined);
-    } else {
-      obj.sinks = [];
-    }
-    if (message.tables) {
-      obj.tables = message.tables.map((e) => e ? Table.toJSON(e) : undefined);
-    } else {
-      obj.tables = [];
-    }
-    if (message.indexes) {
-      obj.indexes = message.indexes.map((e) => e ? Index.toJSON(e) : undefined);
-    } else {
-      obj.indexes = [];
-    }
-    if (message.views) {
-      obj.views = message.views.map((e) => e ? View.toJSON(e) : undefined);
-    } else {
-      obj.views = [];
-    }
-    if (message.functions) {
-      obj.functions = message.functions.map((e) => e ? Function.toJSON(e) : undefined);
-    } else {
-      obj.functions = [];
-    }
-    if (message.users) {
-      obj.users = message.users.map((e) => e ? UserInfo.toJSON(e) : undefined);
-    } else {
-      obj.users = [];
-    }
-    if (message.parallelUnitMappings) {
-      obj.parallelUnitMappings = message.parallelUnitMappings.map((e) =>
-        e ? FragmentParallelUnitMapping.toJSON(e) : undefined
-      );
-    } else {
-      obj.parallelUnitMappings = [];
-    }
-    if (message.nodes) {
-      obj.nodes = message.nodes.map((e) => e ? WorkerNode.toJSON(e) : undefined);
-    } else {
-      obj.nodes = [];
-    }
-    message.hummockSnapshot !== undefined &&
-      (obj.hummockSnapshot = message.hummockSnapshot ? HummockSnapshot.toJSON(message.hummockSnapshot) : undefined);
-    message.hummockVersion !== undefined &&
-      (obj.hummockVersion = message.hummockVersion ? HummockVersion.toJSON(message.hummockVersion) : undefined);
-    message.metaBackupManifestId !== undefined && (obj.metaBackupManifestId = message.metaBackupManifestId
-      ? MetaBackupManifestId.toJSON(message.metaBackupManifestId)
-      : undefined);
-    message.hummockWriteLimits !== undefined &&
-      (obj.hummockWriteLimits = message.hummockWriteLimits
-        ? WriteLimits.toJSON(message.hummockWriteLimits)
-        : undefined);
-    message.version !== undefined &&
-      (obj.version = message.version ? MetaSnapshot_SnapshotVersion.toJSON(message.version) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MetaSnapshot>, I>>(object: I): MetaSnapshot {
-    const message = createBaseMetaSnapshot();
-    message.databases = object.databases?.map((e) => Database.fromPartial(e)) || [];
-    message.schemas = object.schemas?.map((e) => Schema.fromPartial(e)) || [];
-    message.sources = object.sources?.map((e) => Source.fromPartial(e)) || [];
-    message.sinks = object.sinks?.map((e) => Sink.fromPartial(e)) || [];
-    message.tables = object.tables?.map((e) => Table.fromPartial(e)) || [];
-    message.indexes = object.indexes?.map((e) => Index.fromPartial(e)) || [];
-    message.views = object.views?.map((e) => View.fromPartial(e)) || [];
-    message.functions = object.functions?.map((e) => Function.fromPartial(e)) || [];
-    message.users = object.users?.map((e) => UserInfo.fromPartial(e)) || [];
-    message.parallelUnitMappings =
-      object.parallelUnitMappings?.map((e) => FragmentParallelUnitMapping.fromPartial(e)) || [];
-    message.nodes = object.nodes?.map((e) => WorkerNode.fromPartial(e)) || [];
-    message.hummockSnapshot = (object.hummockSnapshot !== undefined && object.hummockSnapshot !== null)
-      ? HummockSnapshot.fromPartial(object.hummockSnapshot)
-      : undefined;
-    message.hummockVersion = (object.hummockVersion !== undefined && object.hummockVersion !== null)
-      ? HummockVersion.fromPartial(object.hummockVersion)
-      : undefined;
-    message.metaBackupManifestId = (object.metaBackupManifestId !== undefined && object.metaBackupManifestId !== null)
-      ? MetaBackupManifestId.fromPartial(object.metaBackupManifestId)
-      : undefined;
-    message.hummockWriteLimits = (object.hummockWriteLimits !== undefined && object.hummockWriteLimits !== null)
-      ? WriteLimits.fromPartial(object.hummockWriteLimits)
-      : undefined;
-    message.version = (object.version !== undefined && object.version !== null)
-      ? MetaSnapshot_SnapshotVersion.fromPartial(object.version)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseMetaSnapshot_SnapshotVersion(): MetaSnapshot_SnapshotVersion {
-  return { catalogVersion: 0, parallelUnitMappingVersion: 0, workerNodeVersion: 0 };
-}
-
-export const MetaSnapshot_SnapshotVersion = {
-  fromJSON(object: any): MetaSnapshot_SnapshotVersion {
-    return {
-      catalogVersion: isSet(object.catalogVersion) ? Number(object.catalogVersion) : 0,
-      parallelUnitMappingVersion: isSet(object.parallelUnitMappingVersion)
-        ? Number(object.parallelUnitMappingVersion)
-        : 0,
-      workerNodeVersion: isSet(object.workerNodeVersion) ? Number(object.workerNodeVersion) : 0,
-    };
-  },
-
-  toJSON(message: MetaSnapshot_SnapshotVersion): unknown {
-    const obj: any = {};
-    message.catalogVersion !== undefined && (obj.catalogVersion = Math.round(message.catalogVersion));
-    message.parallelUnitMappingVersion !== undefined &&
-      (obj.parallelUnitMappingVersion = Math.round(message.parallelUnitMappingVersion));
-    message.workerNodeVersion !== undefined && (obj.workerNodeVersion = Math.round(message.workerNodeVersion));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MetaSnapshot_SnapshotVersion>, I>>(object: I): MetaSnapshot_SnapshotVersion {
-    const message = createBaseMetaSnapshot_SnapshotVersion();
-    message.catalogVersion = object.catalogVersion ?? 0;
-    message.parallelUnitMappingVersion = object.parallelUnitMappingVersion ?? 0;
-    message.workerNodeVersion = object.workerNodeVersion ?? 0;
-    return message;
-  },
-};
-
-function createBaseSubscribeResponse(): SubscribeResponse {
-  return { status: undefined, operation: SubscribeResponse_Operation.UNSPECIFIED, version: 0, info: undefined };
-}
-
-export const SubscribeResponse = {
-  fromJSON(object: any): SubscribeResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      operation: isSet(object.operation)
-        ? subscribeResponse_OperationFromJSON(object.operation)
-        : SubscribeResponse_Operation.UNSPECIFIED,
-      version: isSet(object.version) ? Number(object.version) : 0,
-      info: isSet(object.database)
-        ? { $case: "database", database: Database.fromJSON(object.database) }
-        : isSet(object.schema)
-        ? { $case: "schema", schema: Schema.fromJSON(object.schema) }
-        : isSet(object.table)
-        ? { $case: "table", table: Table.fromJSON(object.table) }
-        : isSet(object.source)
-        ? { $case: "source", source: Source.fromJSON(object.source) }
-        : isSet(object.sink)
-        ? { $case: "sink", sink: Sink.fromJSON(object.sink) }
-        : isSet(object.index)
-        ? { $case: "index", index: Index.fromJSON(object.index) }
-        : isSet(object.view)
-        ? { $case: "view", view: View.fromJSON(object.view) }
-        : isSet(object.function)
-        ? { $case: "function", function: Function.fromJSON(object.function) }
-        : isSet(object.user)
-        ? { $case: "user", user: UserInfo.fromJSON(object.user) }
-        : isSet(object.parallelUnitMapping)
-        ? {
-          $case: "parallelUnitMapping",
-          parallelUnitMapping: FragmentParallelUnitMapping.fromJSON(object.parallelUnitMapping),
-        }
-        : isSet(object.node)
-        ? { $case: "node", node: WorkerNode.fromJSON(object.node) }
-        : isSet(object.hummockSnapshot)
-        ? { $case: "hummockSnapshot", hummockSnapshot: HummockSnapshot.fromJSON(object.hummockSnapshot) }
-        : isSet(object.hummockVersionDeltas)
-        ? {
-          $case: "hummockVersionDeltas",
-          hummockVersionDeltas: HummockVersionDeltas.fromJSON(object.hummockVersionDeltas),
-        }
-        : isSet(object.snapshot)
-        ? { $case: "snapshot", snapshot: MetaSnapshot.fromJSON(object.snapshot) }
-        : isSet(object.metaBackupManifestId)
-        ? {
-          $case: "metaBackupManifestId",
-          metaBackupManifestId: MetaBackupManifestId.fromJSON(object.metaBackupManifestId),
-        }
-        : isSet(object.systemParams)
-        ? { $case: "systemParams", systemParams: SystemParams.fromJSON(object.systemParams) }
-        : isSet(object.hummockWriteLimits)
-        ? { $case: "hummockWriteLimits", hummockWriteLimits: WriteLimits.fromJSON(object.hummockWriteLimits) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: SubscribeResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.operation !== undefined && (obj.operation = subscribeResponse_OperationToJSON(message.operation));
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    message.info?.$case === "database" &&
-      (obj.database = message.info?.database ? Database.toJSON(message.info?.database) : undefined);
-    message.info?.$case === "schema" &&
-      (obj.schema = message.info?.schema ? Schema.toJSON(message.info?.schema) : undefined);
-    message.info?.$case === "table" &&
-      (obj.table = message.info?.table ? Table.toJSON(message.info?.table) : undefined);
-    message.info?.$case === "source" &&
-      (obj.source = message.info?.source ? Source.toJSON(message.info?.source) : undefined);
-    message.info?.$case === "sink" && (obj.sink = message.info?.sink ? Sink.toJSON(message.info?.sink) : undefined);
-    message.info?.$case === "index" &&
-      (obj.index = message.info?.index ? Index.toJSON(message.info?.index) : undefined);
-    message.info?.$case === "view" && (obj.view = message.info?.view ? View.toJSON(message.info?.view) : undefined);
-    message.info?.$case === "function" &&
-      (obj.function = message.info?.function ? Function.toJSON(message.info?.function) : undefined);
-    message.info?.$case === "user" && (obj.user = message.info?.user ? UserInfo.toJSON(message.info?.user) : undefined);
-    message.info?.$case === "parallelUnitMapping" && (obj.parallelUnitMapping = message.info?.parallelUnitMapping
-      ? FragmentParallelUnitMapping.toJSON(message.info?.parallelUnitMapping)
-      : undefined);
-    message.info?.$case === "node" &&
-      (obj.node = message.info?.node ? WorkerNode.toJSON(message.info?.node) : undefined);
-    message.info?.$case === "hummockSnapshot" && (obj.hummockSnapshot = message.info?.hummockSnapshot
-      ? HummockSnapshot.toJSON(message.info?.hummockSnapshot)
-      : undefined);
-    message.info?.$case === "hummockVersionDeltas" && (obj.hummockVersionDeltas = message.info?.hummockVersionDeltas
-      ? HummockVersionDeltas.toJSON(message.info?.hummockVersionDeltas)
-      : undefined);
-    message.info?.$case === "snapshot" &&
-      (obj.snapshot = message.info?.snapshot ? MetaSnapshot.toJSON(message.info?.snapshot) : undefined);
-    message.info?.$case === "metaBackupManifestId" && (obj.metaBackupManifestId = message.info?.metaBackupManifestId
-      ? MetaBackupManifestId.toJSON(message.info?.metaBackupManifestId)
-      : undefined);
-    message.info?.$case === "systemParams" &&
-      (obj.systemParams = message.info?.systemParams ? SystemParams.toJSON(message.info?.systemParams) : undefined);
-    message.info?.$case === "hummockWriteLimits" && (obj.hummockWriteLimits = message.info?.hummockWriteLimits
-      ? WriteLimits.toJSON(message.info?.hummockWriteLimits)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SubscribeResponse>, I>>(object: I): SubscribeResponse {
-    const message = createBaseSubscribeResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.operation = object.operation ?? SubscribeResponse_Operation.UNSPECIFIED;
-    message.version = object.version ?? 0;
-    if (object.info?.$case === "database" && object.info?.database !== undefined && object.info?.database !== null) {
-      message.info = { $case: "database", database: Database.fromPartial(object.info.database) };
-    }
-    if (object.info?.$case === "schema" && object.info?.schema !== undefined && object.info?.schema !== null) {
-      message.info = { $case: "schema", schema: Schema.fromPartial(object.info.schema) };
-    }
-    if (object.info?.$case === "table" && object.info?.table !== undefined && object.info?.table !== null) {
-      message.info = { $case: "table", table: Table.fromPartial(object.info.table) };
-    }
-    if (object.info?.$case === "source" && object.info?.source !== undefined && object.info?.source !== null) {
-      message.info = { $case: "source", source: Source.fromPartial(object.info.source) };
-    }
-    if (object.info?.$case === "sink" && object.info?.sink !== undefined && object.info?.sink !== null) {
-      message.info = { $case: "sink", sink: Sink.fromPartial(object.info.sink) };
-    }
-    if (object.info?.$case === "index" && object.info?.index !== undefined && object.info?.index !== null) {
-      message.info = { $case: "index", index: Index.fromPartial(object.info.index) };
-    }
-    if (object.info?.$case === "view" && object.info?.view !== undefined && object.info?.view !== null) {
-      message.info = { $case: "view", view: View.fromPartial(object.info.view) };
-    }
-    if (object.info?.$case === "function" && object.info?.function !== undefined && object.info?.function !== null) {
-      message.info = { $case: "function", function: Function.fromPartial(object.info.function) };
-    }
-    if (object.info?.$case === "user" && object.info?.user !== undefined && object.info?.user !== null) {
-      message.info = { $case: "user", user: UserInfo.fromPartial(object.info.user) };
-    }
-    if (
-      object.info?.$case === "parallelUnitMapping" &&
-      object.info?.parallelUnitMapping !== undefined &&
-      object.info?.parallelUnitMapping !== null
-    ) {
-      message.info = {
-        $case: "parallelUnitMapping",
-        parallelUnitMapping: FragmentParallelUnitMapping.fromPartial(object.info.parallelUnitMapping),
-      };
-    }
-    if (object.info?.$case === "node" && object.info?.node !== undefined && object.info?.node !== null) {
-      message.info = { $case: "node", node: WorkerNode.fromPartial(object.info.node) };
-    }
-    if (
-      object.info?.$case === "hummockSnapshot" &&
-      object.info?.hummockSnapshot !== undefined &&
-      object.info?.hummockSnapshot !== null
-    ) {
-      message.info = {
-        $case: "hummockSnapshot",
-        hummockSnapshot: HummockSnapshot.fromPartial(object.info.hummockSnapshot),
-      };
-    }
-    if (
-      object.info?.$case === "hummockVersionDeltas" &&
-      object.info?.hummockVersionDeltas !== undefined &&
-      object.info?.hummockVersionDeltas !== null
-    ) {
-      message.info = {
-        $case: "hummockVersionDeltas",
-        hummockVersionDeltas: HummockVersionDeltas.fromPartial(object.info.hummockVersionDeltas),
-      };
-    }
-    if (object.info?.$case === "snapshot" && object.info?.snapshot !== undefined && object.info?.snapshot !== null) {
-      message.info = { $case: "snapshot", snapshot: MetaSnapshot.fromPartial(object.info.snapshot) };
-    }
-    if (
-      object.info?.$case === "metaBackupManifestId" &&
-      object.info?.metaBackupManifestId !== undefined &&
-      object.info?.metaBackupManifestId !== null
-    ) {
-      message.info = {
-        $case: "metaBackupManifestId",
-        metaBackupManifestId: MetaBackupManifestId.fromPartial(object.info.metaBackupManifestId),
-      };
-    }
-    if (
-      object.info?.$case === "systemParams" &&
-      object.info?.systemParams !== undefined &&
-      object.info?.systemParams !== null
-    ) {
-      message.info = { $case: "systemParams", systemParams: SystemParams.fromPartial(object.info.systemParams) };
-    }
-    if (
-      object.info?.$case === "hummockWriteLimits" &&
-      object.info?.hummockWriteLimits !== undefined &&
-      object.info?.hummockWriteLimits !== null
-    ) {
-      message.info = {
-        $case: "hummockWriteLimits",
-        hummockWriteLimits: WriteLimits.fromPartial(object.info.hummockWriteLimits),
-      };
-    }
-    return message;
-  },
-};
-
-function createBasePauseRequest(): PauseRequest {
-  return {};
-}
-
-export const PauseRequest = {
-  fromJSON(_: any): PauseRequest {
-    return {};
-  },
-
-  toJSON(_: PauseRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PauseRequest>, I>>(_: I): PauseRequest {
-    const message = createBasePauseRequest();
-    return message;
-  },
-};
-
-function createBasePauseResponse(): PauseResponse {
-  return {};
-}
-
-export const PauseResponse = {
-  fromJSON(_: any): PauseResponse {
-    return {};
-  },
-
-  toJSON(_: PauseResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PauseResponse>, I>>(_: I): PauseResponse {
-    const message = createBasePauseResponse();
-    return message;
-  },
-};
-
-function createBaseResumeRequest(): ResumeRequest {
-  return {};
-}
-
-export const ResumeRequest = {
-  fromJSON(_: any): ResumeRequest {
-    return {};
-  },
-
-  toJSON(_: ResumeRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ResumeRequest>, I>>(_: I): ResumeRequest {
-    const message = createBaseResumeRequest();
-    return message;
-  },
-};
-
-function createBaseResumeResponse(): ResumeResponse {
-  return {};
-}
-
-export const ResumeResponse = {
-  fromJSON(_: any): ResumeResponse {
-    return {};
-  },
-
-  toJSON(_: ResumeResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ResumeResponse>, I>>(_: I): ResumeResponse {
-    const message = createBaseResumeResponse();
-    return message;
-  },
-};
-
-function createBaseGetClusterInfoRequest(): GetClusterInfoRequest {
-  return {};
-}
-
-export const GetClusterInfoRequest = {
-  fromJSON(_: any): GetClusterInfoRequest {
-    return {};
-  },
-
-  toJSON(_: GetClusterInfoRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetClusterInfoRequest>, I>>(_: I): GetClusterInfoRequest {
-    const message = createBaseGetClusterInfoRequest();
-    return message;
-  },
-};
-
-function createBaseGetClusterInfoResponse(): GetClusterInfoResponse {
-  return { workerNodes: [], tableFragments: [], actorSplits: {}, sourceInfos: {} };
-}
-
-export const GetClusterInfoResponse = {
-  fromJSON(object: any): GetClusterInfoResponse {
-    return {
-      workerNodes: Array.isArray(object?.workerNodes) ? object.workerNodes.map((e: any) => WorkerNode.fromJSON(e)) : [],
-      tableFragments: Array.isArray(object?.tableFragments)
-        ? object.tableFragments.map((e: any) => TableFragments.fromJSON(e))
-        : [],
-      actorSplits: isObject(object.actorSplits)
-        ? Object.entries(object.actorSplits).reduce<{ [key: number]: ConnectorSplits }>((acc, [key, value]) => {
-          acc[Number(key)] = ConnectorSplits.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-      sourceInfos: isObject(object.sourceInfos)
-        ? Object.entries(object.sourceInfos).reduce<{ [key: number]: Source }>((acc, [key, value]) => {
-          acc[Number(key)] = Source.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: GetClusterInfoResponse): unknown {
-    const obj: any = {};
-    if (message.workerNodes) {
-      obj.workerNodes = message.workerNodes.map((e) => e ? WorkerNode.toJSON(e) : undefined);
-    } else {
-      obj.workerNodes = [];
-    }
-    if (message.tableFragments) {
-      obj.tableFragments = message.tableFragments.map((e) => e ? TableFragments.toJSON(e) : undefined);
-    } else {
-      obj.tableFragments = [];
-    }
-    obj.actorSplits = {};
-    if (message.actorSplits) {
-      Object.entries(message.actorSplits).forEach(([k, v]) => {
-        obj.actorSplits[k] = ConnectorSplits.toJSON(v);
-      });
-    }
-    obj.sourceInfos = {};
-    if (message.sourceInfos) {
-      Object.entries(message.sourceInfos).forEach(([k, v]) => {
-        obj.sourceInfos[k] = Source.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetClusterInfoResponse>, I>>(object: I): GetClusterInfoResponse {
-    const message = createBaseGetClusterInfoResponse();
-    message.workerNodes = object.workerNodes?.map((e) => WorkerNode.fromPartial(e)) || [];
-    message.tableFragments = object.tableFragments?.map((e) => TableFragments.fromPartial(e)) || [];
-    message.actorSplits = Object.entries(object.actorSplits ?? {}).reduce<{ [key: number]: ConnectorSplits }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = ConnectorSplits.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.sourceInfos = Object.entries(object.sourceInfos ?? {}).reduce<{ [key: number]: Source }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = Source.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseGetClusterInfoResponse_ActorSplitsEntry(): GetClusterInfoResponse_ActorSplitsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const GetClusterInfoResponse_ActorSplitsEntry = {
-  fromJSON(object: any): GetClusterInfoResponse_ActorSplitsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? ConnectorSplits.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: GetClusterInfoResponse_ActorSplitsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? ConnectorSplits.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetClusterInfoResponse_ActorSplitsEntry>, I>>(
-    object: I,
-  ): GetClusterInfoResponse_ActorSplitsEntry {
-    const message = createBaseGetClusterInfoResponse_ActorSplitsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? ConnectorSplits.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseGetClusterInfoResponse_SourceInfosEntry(): GetClusterInfoResponse_SourceInfosEntry {
-  return { key: 0, value: undefined };
-}
-
-export const GetClusterInfoResponse_SourceInfosEntry = {
-  fromJSON(object: any): GetClusterInfoResponse_SourceInfosEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? Source.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: GetClusterInfoResponse_SourceInfosEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? Source.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetClusterInfoResponse_SourceInfosEntry>, I>>(
-    object: I,
-  ): GetClusterInfoResponse_SourceInfosEntry {
-    const message = createBaseGetClusterInfoResponse_SourceInfosEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? Source.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseRescheduleRequest(): RescheduleRequest {
-  return { reschedules: {} };
-}
-
-export const RescheduleRequest = {
-  fromJSON(object: any): RescheduleRequest {
-    return {
-      reschedules: isObject(object.reschedules)
-        ? Object.entries(object.reschedules).reduce<{ [key: number]: RescheduleRequest_Reschedule }>(
-          (acc, [key, value]) => {
-            acc[Number(key)] = RescheduleRequest_Reschedule.fromJSON(value);
-            return acc;
-          },
-          {},
-        )
-        : {},
-    };
-  },
-
-  toJSON(message: RescheduleRequest): unknown {
-    const obj: any = {};
-    obj.reschedules = {};
-    if (message.reschedules) {
-      Object.entries(message.reschedules).forEach(([k, v]) => {
-        obj.reschedules[k] = RescheduleRequest_Reschedule.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RescheduleRequest>, I>>(object: I): RescheduleRequest {
-    const message = createBaseRescheduleRequest();
-    message.reschedules = Object.entries(object.reschedules ?? {}).reduce<
-      { [key: number]: RescheduleRequest_Reschedule }
-    >((acc, [key, value]) => {
-      if (value !== undefined) {
-        acc[Number(key)] = RescheduleRequest_Reschedule.fromPartial(value);
-      }
-      return acc;
-    }, {});
-    return message;
-  },
-};
-
-function createBaseRescheduleRequest_Reschedule(): RescheduleRequest_Reschedule {
-  return { addedParallelUnits: [], removedParallelUnits: [] };
-}
-
-export const RescheduleRequest_Reschedule = {
-  fromJSON(object: any): RescheduleRequest_Reschedule {
-    return {
-      addedParallelUnits: Array.isArray(object?.addedParallelUnits)
-        ? object.addedParallelUnits.map((e: any) => Number(e))
-        : [],
-      removedParallelUnits: Array.isArray(object?.removedParallelUnits)
-        ? object.removedParallelUnits.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: RescheduleRequest_Reschedule): unknown {
-    const obj: any = {};
-    if (message.addedParallelUnits) {
-      obj.addedParallelUnits = message.addedParallelUnits.map((e) => Math.round(e));
-    } else {
-      obj.addedParallelUnits = [];
-    }
-    if (message.removedParallelUnits) {
-      obj.removedParallelUnits = message.removedParallelUnits.map((e) => Math.round(e));
-    } else {
-      obj.removedParallelUnits = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RescheduleRequest_Reschedule>, I>>(object: I): RescheduleRequest_Reschedule {
-    const message = createBaseRescheduleRequest_Reschedule();
-    message.addedParallelUnits = object.addedParallelUnits?.map((e) => e) || [];
-    message.removedParallelUnits = object.removedParallelUnits?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseRescheduleRequest_ReschedulesEntry(): RescheduleRequest_ReschedulesEntry {
-  return { key: 0, value: undefined };
-}
-
-export const RescheduleRequest_ReschedulesEntry = {
-  fromJSON(object: any): RescheduleRequest_ReschedulesEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? RescheduleRequest_Reschedule.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: RescheduleRequest_ReschedulesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined &&
-      (obj.value = message.value ? RescheduleRequest_Reschedule.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RescheduleRequest_ReschedulesEntry>, I>>(
-    object: I,
-  ): RescheduleRequest_ReschedulesEntry {
-    const message = createBaseRescheduleRequest_ReschedulesEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? RescheduleRequest_Reschedule.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseRescheduleResponse(): RescheduleResponse {
-  return { success: false };
-}
-
-export const RescheduleResponse = {
-  fromJSON(object: any): RescheduleResponse {
-    return { success: isSet(object.success) ? Boolean(object.success) : false };
-  },
-
-  toJSON(message: RescheduleResponse): unknown {
-    const obj: any = {};
-    message.success !== undefined && (obj.success = message.success);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RescheduleResponse>, I>>(object: I): RescheduleResponse {
-    const message = createBaseRescheduleResponse();
-    message.success = object.success ?? false;
-    return message;
-  },
-};
-
-function createBaseMembersRequest(): MembersRequest {
-  return {};
-}
-
-export const MembersRequest = {
-  fromJSON(_: any): MembersRequest {
-    return {};
-  },
-
-  toJSON(_: MembersRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MembersRequest>, I>>(_: I): MembersRequest {
-    const message = createBaseMembersRequest();
-    return message;
-  },
-};
-
-function createBaseMetaMember(): MetaMember {
-  return { address: undefined, isLeader: false };
-}
-
-export const MetaMember = {
-  fromJSON(object: any): MetaMember {
-    return {
-      address: isSet(object.address) ? HostAddress.fromJSON(object.address) : undefined,
-      isLeader: isSet(object.isLeader) ? Boolean(object.isLeader) : false,
-    };
-  },
-
-  toJSON(message: MetaMember): unknown {
-    const obj: any = {};
-    message.address !== undefined && (obj.address = message.address ? HostAddress.toJSON(message.address) : undefined);
-    message.isLeader !== undefined && (obj.isLeader = message.isLeader);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MetaMember>, I>>(object: I): MetaMember {
-    const message = createBaseMetaMember();
-    message.address = (object.address !== undefined && object.address !== null)
-      ? HostAddress.fromPartial(object.address)
-      : undefined;
-    message.isLeader = object.isLeader ?? false;
-    return message;
-  },
-};
-
-function createBaseMembersResponse(): MembersResponse {
-  return { members: [] };
-}
-
-export const MembersResponse = {
-  fromJSON(object: any): MembersResponse {
-    return { members: Array.isArray(object?.members) ? object.members.map((e: any) => MetaMember.fromJSON(e)) : [] };
-  },
-
-  toJSON(message: MembersResponse): unknown {
-    const obj: any = {};
-    if (message.members) {
-      obj.members = message.members.map((e) => e ? MetaMember.toJSON(e) : undefined);
-    } else {
-      obj.members = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MembersResponse>, I>>(object: I): MembersResponse {
-    const message = createBaseMembersResponse();
-    message.members = object.members?.map((e) => MetaMember.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseSystemParams(): SystemParams {
-  return {
-    barrierIntervalMs: undefined,
-    checkpointFrequency: undefined,
-    sstableSizeMb: undefined,
-    blockSizeKb: undefined,
-    bloomFalsePositive: undefined,
-    stateStore: undefined,
-    dataDirectory: undefined,
-    backupStorageUrl: undefined,
-    backupStorageDirectory: undefined,
-  };
-}
-
-export const SystemParams = {
-  fromJSON(object: any): SystemParams {
-    return {
-      barrierIntervalMs: isSet(object.barrierIntervalMs) ? Number(object.barrierIntervalMs) : undefined,
-      checkpointFrequency: isSet(object.checkpointFrequency) ? Number(object.checkpointFrequency) : undefined,
-      sstableSizeMb: isSet(object.sstableSizeMb) ? Number(object.sstableSizeMb) : undefined,
-      blockSizeKb: isSet(object.blockSizeKb) ? Number(object.blockSizeKb) : undefined,
-      bloomFalsePositive: isSet(object.bloomFalsePositive) ? Number(object.bloomFalsePositive) : undefined,
-      stateStore: isSet(object.stateStore) ? String(object.stateStore) : undefined,
-      dataDirectory: isSet(object.dataDirectory) ? String(object.dataDirectory) : undefined,
-      backupStorageUrl: isSet(object.backupStorageUrl) ? String(object.backupStorageUrl) : undefined,
-      backupStorageDirectory: isSet(object.backupStorageDirectory) ? String(object.backupStorageDirectory) : undefined,
-    };
-  },
-
-  toJSON(message: SystemParams): unknown {
-    const obj: any = {};
-    message.barrierIntervalMs !== undefined && (obj.barrierIntervalMs = Math.round(message.barrierIntervalMs));
-    message.checkpointFrequency !== undefined && (obj.checkpointFrequency = Math.round(message.checkpointFrequency));
-    message.sstableSizeMb !== undefined && (obj.sstableSizeMb = Math.round(message.sstableSizeMb));
-    message.blockSizeKb !== undefined && (obj.blockSizeKb = Math.round(message.blockSizeKb));
-    message.bloomFalsePositive !== undefined && (obj.bloomFalsePositive = message.bloomFalsePositive);
-    message.stateStore !== undefined && (obj.stateStore = message.stateStore);
-    message.dataDirectory !== undefined && (obj.dataDirectory = message.dataDirectory);
-    message.backupStorageUrl !== undefined && (obj.backupStorageUrl = message.backupStorageUrl);
-    message.backupStorageDirectory !== undefined && (obj.backupStorageDirectory = message.backupStorageDirectory);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SystemParams>, I>>(object: I): SystemParams {
-    const message = createBaseSystemParams();
-    message.barrierIntervalMs = object.barrierIntervalMs ?? undefined;
-    message.checkpointFrequency = object.checkpointFrequency ?? undefined;
-    message.sstableSizeMb = object.sstableSizeMb ?? undefined;
-    message.blockSizeKb = object.blockSizeKb ?? undefined;
-    message.bloomFalsePositive = object.bloomFalsePositive ?? undefined;
-    message.stateStore = object.stateStore ?? undefined;
-    message.dataDirectory = object.dataDirectory ?? undefined;
-    message.backupStorageUrl = object.backupStorageUrl ?? undefined;
-    message.backupStorageDirectory = object.backupStorageDirectory ?? undefined;
-    return message;
-  },
-};
-
-function createBaseGetSystemParamsRequest(): GetSystemParamsRequest {
-  return {};
-}
-
-export const GetSystemParamsRequest = {
-  fromJSON(_: any): GetSystemParamsRequest {
-    return {};
-  },
-
-  toJSON(_: GetSystemParamsRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetSystemParamsRequest>, I>>(_: I): GetSystemParamsRequest {
-    const message = createBaseGetSystemParamsRequest();
-    return message;
-  },
-};
-
-function createBaseGetSystemParamsResponse(): GetSystemParamsResponse {
-  return { params: undefined };
-}
-
-export const GetSystemParamsResponse = {
-  fromJSON(object: any): GetSystemParamsResponse {
-    return { params: isSet(object.params) ? SystemParams.fromJSON(object.params) : undefined };
-  },
-
-  toJSON(message: GetSystemParamsResponse): unknown {
-    const obj: any = {};
-    message.params !== undefined && (obj.params = message.params ? SystemParams.toJSON(message.params) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetSystemParamsResponse>, I>>(object: I): GetSystemParamsResponse {
-    const message = createBaseGetSystemParamsResponse();
-    message.params = (object.params !== undefined && object.params !== null)
-      ? SystemParams.fromPartial(object.params)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSetSystemParamRequest(): SetSystemParamRequest {
-  return { param: "", value: undefined };
-}
-
-export const SetSystemParamRequest = {
-  fromJSON(object: any): SetSystemParamRequest {
-    return {
-      param: isSet(object.param) ? String(object.param) : "",
-      value: isSet(object.value) ? String(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: SetSystemParamRequest): unknown {
-    const obj: any = {};
-    message.param !== undefined && (obj.param = message.param);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SetSystemParamRequest>, I>>(object: I): SetSystemParamRequest {
-    const message = createBaseSetSystemParamRequest();
-    message.param = object.param ?? "";
-    message.value = object.value ?? undefined;
-    return message;
-  },
-};
-
-function createBaseSetSystemParamResponse(): SetSystemParamResponse {
-  return {};
-}
-
-export const SetSystemParamResponse = {
-  fromJSON(_: any): SetSystemParamResponse {
-    return {};
-  },
-
-  toJSON(_: SetSystemParamResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SetSystemParamResponse>, I>>(_: I): SetSystemParamResponse {
-    const message = createBaseSetSystemParamResponse();
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null;
-}
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/monitor_service.ts b/dashboard/proto/gen/monitor_service.ts
deleted file mode 100644
index 3719692cb88de..0000000000000
--- a/dashboard/proto/gen/monitor_service.ts
+++ /dev/null
@@ -1,274 +0,0 @@
-/* eslint-disable */
-
-export const protobufPackage = "monitor_service";
-
-export interface StackTraceRequest {
-}
-
-export interface StackTraceResponse {
-  actorTraces: { [key: number]: string };
-  rpcTraces: { [key: string]: string };
-}
-
-export interface StackTraceResponse_ActorTracesEntry {
-  key: number;
-  value: string;
-}
-
-export interface StackTraceResponse_RpcTracesEntry {
-  key: string;
-  value: string;
-}
-
-export interface ProfilingRequest {
-  /** How long the profiling should last. */
-  sleepS: number;
-}
-
-export interface ProfilingResponse {
-  result: Uint8Array;
-}
-
-function createBaseStackTraceRequest(): StackTraceRequest {
-  return {};
-}
-
-export const StackTraceRequest = {
-  fromJSON(_: any): StackTraceRequest {
-    return {};
-  },
-
-  toJSON(_: StackTraceRequest): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StackTraceRequest>, I>>(_: I): StackTraceRequest {
-    const message = createBaseStackTraceRequest();
-    return message;
-  },
-};
-
-function createBaseStackTraceResponse(): StackTraceResponse {
-  return { actorTraces: {}, rpcTraces: {} };
-}
-
-export const StackTraceResponse = {
-  fromJSON(object: any): StackTraceResponse {
-    return {
-      actorTraces: isObject(object.actorTraces)
-        ? Object.entries(object.actorTraces).reduce<{ [key: number]: string }>((acc, [key, value]) => {
-          acc[Number(key)] = String(value);
-          return acc;
-        }, {})
-        : {},
-      rpcTraces: isObject(object.rpcTraces)
-        ? Object.entries(object.rpcTraces).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: StackTraceResponse): unknown {
-    const obj: any = {};
-    obj.actorTraces = {};
-    if (message.actorTraces) {
-      Object.entries(message.actorTraces).forEach(([k, v]) => {
-        obj.actorTraces[k] = v;
-      });
-    }
-    obj.rpcTraces = {};
-    if (message.rpcTraces) {
-      Object.entries(message.rpcTraces).forEach(([k, v]) => {
-        obj.rpcTraces[k] = v;
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StackTraceResponse>, I>>(object: I): StackTraceResponse {
-    const message = createBaseStackTraceResponse();
-    message.actorTraces = Object.entries(object.actorTraces ?? {}).reduce<{ [key: number]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.rpcTraces = Object.entries(object.rpcTraces ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseStackTraceResponse_ActorTracesEntry(): StackTraceResponse_ActorTracesEntry {
-  return { key: 0, value: "" };
-}
-
-export const StackTraceResponse_ActorTracesEntry = {
-  fromJSON(object: any): StackTraceResponse_ActorTracesEntry {
-    return { key: isSet(object.key) ? Number(object.key) : 0, value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: StackTraceResponse_ActorTracesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StackTraceResponse_ActorTracesEntry>, I>>(
-    object: I,
-  ): StackTraceResponse_ActorTracesEntry {
-    const message = createBaseStackTraceResponse_ActorTracesEntry();
-    message.key = object.key ?? 0;
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseStackTraceResponse_RpcTracesEntry(): StackTraceResponse_RpcTracesEntry {
-  return { key: "", value: "" };
-}
-
-export const StackTraceResponse_RpcTracesEntry = {
-  fromJSON(object: any): StackTraceResponse_RpcTracesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: StackTraceResponse_RpcTracesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StackTraceResponse_RpcTracesEntry>, I>>(
-    object: I,
-  ): StackTraceResponse_RpcTracesEntry {
-    const message = createBaseStackTraceResponse_RpcTracesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseProfilingRequest(): ProfilingRequest {
-  return { sleepS: 0 };
-}
-
-export const ProfilingRequest = {
-  fromJSON(object: any): ProfilingRequest {
-    return { sleepS: isSet(object.sleepS) ? Number(object.sleepS) : 0 };
-  },
-
-  toJSON(message: ProfilingRequest): unknown {
-    const obj: any = {};
-    message.sleepS !== undefined && (obj.sleepS = Math.round(message.sleepS));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ProfilingRequest>, I>>(object: I): ProfilingRequest {
-    const message = createBaseProfilingRequest();
-    message.sleepS = object.sleepS ?? 0;
-    return message;
-  },
-};
-
-function createBaseProfilingResponse(): ProfilingResponse {
-  return { result: new Uint8Array() };
-}
-
-export const ProfilingResponse = {
-  fromJSON(object: any): ProfilingResponse {
-    return { result: isSet(object.result) ? bytesFromBase64(object.result) : new Uint8Array() };
-  },
-
-  toJSON(message: ProfilingResponse): unknown {
-    const obj: any = {};
-    message.result !== undefined &&
-      (obj.result = base64FromBytes(message.result !== undefined ? message.result : new Uint8Array()));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ProfilingResponse>, I>>(object: I): ProfilingResponse {
-    const message = createBaseProfilingResponse();
-    message.result = object.result ?? new Uint8Array();
-    return message;
-  },
-};
-
-declare var self: any | undefined;
-declare var window: any | undefined;
-declare var global: any | undefined;
-var globalThis: any = (() => {
-  if (typeof globalThis !== "undefined") {
-    return globalThis;
-  }
-  if (typeof self !== "undefined") {
-    return self;
-  }
-  if (typeof window !== "undefined") {
-    return window;
-  }
-  if (typeof global !== "undefined") {
-    return global;
-  }
-  throw "Unable to locate global object";
-})();
-
-function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-
-function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin: string[] = [];
-    arr.forEach((byte) => {
-      bin.push(String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null;
-}
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/order.ts b/dashboard/proto/gen/order.ts
deleted file mode 100644
index 6037394eadcee..0000000000000
--- a/dashboard/proto/gen/order.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-/* eslint-disable */
-
-export const protobufPackage = "order";
-
-export const PbDirection = {
-  PbDirection_UNSPECIFIED: "PbDirection_UNSPECIFIED",
-  PbDirection_ASCENDING: "PbDirection_ASCENDING",
-  PbDirection_DESCENDING: "PbDirection_DESCENDING",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type PbDirection = typeof PbDirection[keyof typeof PbDirection];
-
-export function pbDirectionFromJSON(object: any): PbDirection {
-  switch (object) {
-    case 0:
-    case "PbDirection_UNSPECIFIED":
-      return PbDirection.PbDirection_UNSPECIFIED;
-    case 1:
-    case "PbDirection_ASCENDING":
-      return PbDirection.PbDirection_ASCENDING;
-    case 2:
-    case "PbDirection_DESCENDING":
-      return PbDirection.PbDirection_DESCENDING;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return PbDirection.UNRECOGNIZED;
-  }
-}
-
-export function pbDirectionToJSON(object: PbDirection): string {
-  switch (object) {
-    case PbDirection.PbDirection_UNSPECIFIED:
-      return "PbDirection_UNSPECIFIED";
-    case PbDirection.PbDirection_ASCENDING:
-      return "PbDirection_ASCENDING";
-    case PbDirection.PbDirection_DESCENDING:
-      return "PbDirection_DESCENDING";
-    case PbDirection.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface PbOrderType {
-  /**
-   * TODO(rc): enable `NULLS FIRST | LAST`
-   * PbNullsAre nulls_are = 2;
-   */
-  direction: PbDirection;
-}
-
-/** Column index with an order type (ASC or DESC). Used to represent a sort key (`repeated PbColumnOrder`). */
-export interface PbColumnOrder {
-  columnIndex: number;
-  orderType: PbOrderType | undefined;
-}
-
-function createBasePbOrderType(): PbOrderType {
-  return { direction: PbDirection.PbDirection_UNSPECIFIED };
-}
-
-export const PbOrderType = {
-  fromJSON(object: any): PbOrderType {
-    return {
-      direction: isSet(object.direction) ? pbDirectionFromJSON(object.direction) : PbDirection.PbDirection_UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: PbOrderType): unknown {
-    const obj: any = {};
-    message.direction !== undefined && (obj.direction = pbDirectionToJSON(message.direction));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PbOrderType>, I>>(object: I): PbOrderType {
-    const message = createBasePbOrderType();
-    message.direction = object.direction ?? PbDirection.PbDirection_UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBasePbColumnOrder(): PbColumnOrder {
-  return { columnIndex: 0, orderType: undefined };
-}
-
-export const PbColumnOrder = {
-  fromJSON(object: any): PbColumnOrder {
-    return {
-      columnIndex: isSet(object.columnIndex) ? Number(object.columnIndex) : 0,
-      orderType: isSet(object.orderType) ? PbOrderType.fromJSON(object.orderType) : undefined,
-    };
-  },
-
-  toJSON(message: PbColumnOrder): unknown {
-    const obj: any = {};
-    message.columnIndex !== undefined && (obj.columnIndex = Math.round(message.columnIndex));
-    message.orderType !== undefined &&
-      (obj.orderType = message.orderType ? PbOrderType.toJSON(message.orderType) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PbColumnOrder>, I>>(object: I): PbColumnOrder {
-    const message = createBasePbColumnOrder();
-    message.columnIndex = object.columnIndex ?? 0;
-    message.orderType = (object.orderType !== undefined && object.orderType !== null)
-      ? PbOrderType.fromPartial(object.orderType)
-      : undefined;
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/plan_common.ts b/dashboard/proto/gen/plan_common.ts
deleted file mode 100644
index 38a14ad1a05a8..0000000000000
--- a/dashboard/proto/gen/plan_common.ts
+++ /dev/null
@@ -1,414 +0,0 @@
-/* eslint-disable */
-import { ColumnOrder } from "./common";
-import { DataType } from "./data";
-
-export const protobufPackage = "plan_common";
-
-export const JoinType = {
-  /**
-   * UNSPECIFIED - Note that it comes from Calcite's JoinRelType.
-   * DO NOT HAVE direction for SEMI and ANTI now.
-   */
-  UNSPECIFIED: "UNSPECIFIED",
-  INNER: "INNER",
-  LEFT_OUTER: "LEFT_OUTER",
-  RIGHT_OUTER: "RIGHT_OUTER",
-  FULL_OUTER: "FULL_OUTER",
-  LEFT_SEMI: "LEFT_SEMI",
-  LEFT_ANTI: "LEFT_ANTI",
-  RIGHT_SEMI: "RIGHT_SEMI",
-  RIGHT_ANTI: "RIGHT_ANTI",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type JoinType = typeof JoinType[keyof typeof JoinType];
-
-export function joinTypeFromJSON(object: any): JoinType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return JoinType.UNSPECIFIED;
-    case 1:
-    case "INNER":
-      return JoinType.INNER;
-    case 2:
-    case "LEFT_OUTER":
-      return JoinType.LEFT_OUTER;
-    case 3:
-    case "RIGHT_OUTER":
-      return JoinType.RIGHT_OUTER;
-    case 4:
-    case "FULL_OUTER":
-      return JoinType.FULL_OUTER;
-    case 5:
-    case "LEFT_SEMI":
-      return JoinType.LEFT_SEMI;
-    case 6:
-    case "LEFT_ANTI":
-      return JoinType.LEFT_ANTI;
-    case 7:
-    case "RIGHT_SEMI":
-      return JoinType.RIGHT_SEMI;
-    case 8:
-    case "RIGHT_ANTI":
-      return JoinType.RIGHT_ANTI;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return JoinType.UNRECOGNIZED;
-  }
-}
-
-export function joinTypeToJSON(object: JoinType): string {
-  switch (object) {
-    case JoinType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case JoinType.INNER:
-      return "INNER";
-    case JoinType.LEFT_OUTER:
-      return "LEFT_OUTER";
-    case JoinType.RIGHT_OUTER:
-      return "RIGHT_OUTER";
-    case JoinType.FULL_OUTER:
-      return "FULL_OUTER";
-    case JoinType.LEFT_SEMI:
-      return "LEFT_SEMI";
-    case JoinType.LEFT_ANTI:
-      return "LEFT_ANTI";
-    case JoinType.RIGHT_SEMI:
-      return "RIGHT_SEMI";
-    case JoinType.RIGHT_ANTI:
-      return "RIGHT_ANTI";
-    case JoinType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const RowFormatType = {
-  ROW_UNSPECIFIED: "ROW_UNSPECIFIED",
-  JSON: "JSON",
-  PROTOBUF: "PROTOBUF",
-  DEBEZIUM_JSON: "DEBEZIUM_JSON",
-  AVRO: "AVRO",
-  MAXWELL: "MAXWELL",
-  CANAL_JSON: "CANAL_JSON",
-  CSV: "CSV",
-  NATIVE: "NATIVE",
-  DEBEZIUM_AVRO: "DEBEZIUM_AVRO",
-  UPSERT_JSON: "UPSERT_JSON",
-  UPSERT_AVRO: "UPSERT_AVRO",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type RowFormatType = typeof RowFormatType[keyof typeof RowFormatType];
-
-export function rowFormatTypeFromJSON(object: any): RowFormatType {
-  switch (object) {
-    case 0:
-    case "ROW_UNSPECIFIED":
-      return RowFormatType.ROW_UNSPECIFIED;
-    case 1:
-    case "JSON":
-      return RowFormatType.JSON;
-    case 2:
-    case "PROTOBUF":
-      return RowFormatType.PROTOBUF;
-    case 3:
-    case "DEBEZIUM_JSON":
-      return RowFormatType.DEBEZIUM_JSON;
-    case 4:
-    case "AVRO":
-      return RowFormatType.AVRO;
-    case 5:
-    case "MAXWELL":
-      return RowFormatType.MAXWELL;
-    case 6:
-    case "CANAL_JSON":
-      return RowFormatType.CANAL_JSON;
-    case 7:
-    case "CSV":
-      return RowFormatType.CSV;
-    case 8:
-    case "NATIVE":
-      return RowFormatType.NATIVE;
-    case 9:
-    case "DEBEZIUM_AVRO":
-      return RowFormatType.DEBEZIUM_AVRO;
-    case 10:
-    case "UPSERT_JSON":
-      return RowFormatType.UPSERT_JSON;
-    case 11:
-    case "UPSERT_AVRO":
-      return RowFormatType.UPSERT_AVRO;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return RowFormatType.UNRECOGNIZED;
-  }
-}
-
-export function rowFormatTypeToJSON(object: RowFormatType): string {
-  switch (object) {
-    case RowFormatType.ROW_UNSPECIFIED:
-      return "ROW_UNSPECIFIED";
-    case RowFormatType.JSON:
-      return "JSON";
-    case RowFormatType.PROTOBUF:
-      return "PROTOBUF";
-    case RowFormatType.DEBEZIUM_JSON:
-      return "DEBEZIUM_JSON";
-    case RowFormatType.AVRO:
-      return "AVRO";
-    case RowFormatType.MAXWELL:
-      return "MAXWELL";
-    case RowFormatType.CANAL_JSON:
-      return "CANAL_JSON";
-    case RowFormatType.CSV:
-      return "CSV";
-    case RowFormatType.NATIVE:
-      return "NATIVE";
-    case RowFormatType.DEBEZIUM_AVRO:
-      return "DEBEZIUM_AVRO";
-    case RowFormatType.UPSERT_JSON:
-      return "UPSERT_JSON";
-    case RowFormatType.UPSERT_AVRO:
-      return "UPSERT_AVRO";
-    case RowFormatType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-/** Field is a column in the streaming or batch plan. */
-export interface Field {
-  dataType: DataType | undefined;
-  name: string;
-}
-
-export interface ColumnDesc {
-  columnType: DataType | undefined;
-  columnId: number;
-  /**
-   * we store the column name in column desc now just for debug, but in future
-   * we should store it in ColumnCatalog but not here
-   */
-  name: string;
-  /** For STRUCT type. */
-  fieldDescs: ColumnDesc[];
-  /**
-   * The user-defined type's name. Empty if the column type is a builtin type.
-   * For example, when the type is created from a protobuf schema file,
-   * this field will store the message name.
-   */
-  typeName: string;
-}
-
-export interface ColumnCatalog {
-  columnDesc: ColumnDesc | undefined;
-  isHidden: boolean;
-}
-
-export interface StorageTableDesc {
-  tableId: number;
-  columns: ColumnDesc[];
-  /** TODO: may refactor primary key representations */
-  pk: ColumnOrder[];
-  distKeyIndices: number[];
-  retentionSeconds: number;
-  valueIndices: number[];
-  readPrefixLenHint: number;
-  /**
-   * Whether the table is versioned. If `true`, column-aware row encoding will be used
-   * to be compatible with schema changes.
-   */
-  versioned: boolean;
-}
-
-function createBaseField(): Field {
-  return { dataType: undefined, name: "" };
-}
-
-export const Field = {
-  fromJSON(object: any): Field {
-    return {
-      dataType: isSet(object.dataType) ? DataType.fromJSON(object.dataType) : undefined,
-      name: isSet(object.name) ? String(object.name) : "",
-    };
-  },
-
-  toJSON(message: Field): unknown {
-    const obj: any = {};
-    message.dataType !== undefined && (obj.dataType = message.dataType ? DataType.toJSON(message.dataType) : undefined);
-    message.name !== undefined && (obj.name = message.name);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Field>, I>>(object: I): Field {
-    const message = createBaseField();
-    message.dataType = (object.dataType !== undefined && object.dataType !== null)
-      ? DataType.fromPartial(object.dataType)
-      : undefined;
-    message.name = object.name ?? "";
-    return message;
-  },
-};
-
-function createBaseColumnDesc(): ColumnDesc {
-  return { columnType: undefined, columnId: 0, name: "", fieldDescs: [], typeName: "" };
-}
-
-export const ColumnDesc = {
-  fromJSON(object: any): ColumnDesc {
-    return {
-      columnType: isSet(object.columnType) ? DataType.fromJSON(object.columnType) : undefined,
-      columnId: isSet(object.columnId) ? Number(object.columnId) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      fieldDescs: Array.isArray(object?.fieldDescs) ? object.fieldDescs.map((e: any) => ColumnDesc.fromJSON(e)) : [],
-      typeName: isSet(object.typeName) ? String(object.typeName) : "",
-    };
-  },
-
-  toJSON(message: ColumnDesc): unknown {
-    const obj: any = {};
-    message.columnType !== undefined &&
-      (obj.columnType = message.columnType ? DataType.toJSON(message.columnType) : undefined);
-    message.columnId !== undefined && (obj.columnId = Math.round(message.columnId));
-    message.name !== undefined && (obj.name = message.name);
-    if (message.fieldDescs) {
-      obj.fieldDescs = message.fieldDescs.map((e) => e ? ColumnDesc.toJSON(e) : undefined);
-    } else {
-      obj.fieldDescs = [];
-    }
-    message.typeName !== undefined && (obj.typeName = message.typeName);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ColumnDesc>, I>>(object: I): ColumnDesc {
-    const message = createBaseColumnDesc();
-    message.columnType = (object.columnType !== undefined && object.columnType !== null)
-      ? DataType.fromPartial(object.columnType)
-      : undefined;
-    message.columnId = object.columnId ?? 0;
-    message.name = object.name ?? "";
-    message.fieldDescs = object.fieldDescs?.map((e) => ColumnDesc.fromPartial(e)) || [];
-    message.typeName = object.typeName ?? "";
-    return message;
-  },
-};
-
-function createBaseColumnCatalog(): ColumnCatalog {
-  return { columnDesc: undefined, isHidden: false };
-}
-
-export const ColumnCatalog = {
-  fromJSON(object: any): ColumnCatalog {
-    return {
-      columnDesc: isSet(object.columnDesc) ? ColumnDesc.fromJSON(object.columnDesc) : undefined,
-      isHidden: isSet(object.isHidden) ? Boolean(object.isHidden) : false,
-    };
-  },
-
-  toJSON(message: ColumnCatalog): unknown {
-    const obj: any = {};
-    message.columnDesc !== undefined &&
-      (obj.columnDesc = message.columnDesc ? ColumnDesc.toJSON(message.columnDesc) : undefined);
-    message.isHidden !== undefined && (obj.isHidden = message.isHidden);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ColumnCatalog>, I>>(object: I): ColumnCatalog {
-    const message = createBaseColumnCatalog();
-    message.columnDesc = (object.columnDesc !== undefined && object.columnDesc !== null)
-      ? ColumnDesc.fromPartial(object.columnDesc)
-      : undefined;
-    message.isHidden = object.isHidden ?? false;
-    return message;
-  },
-};
-
-function createBaseStorageTableDesc(): StorageTableDesc {
-  return {
-    tableId: 0,
-    columns: [],
-    pk: [],
-    distKeyIndices: [],
-    retentionSeconds: 0,
-    valueIndices: [],
-    readPrefixLenHint: 0,
-    versioned: false,
-  };
-}
-
-export const StorageTableDesc = {
-  fromJSON(object: any): StorageTableDesc {
-    return {
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      columns: Array.isArray(object?.columns) ? object.columns.map((e: any) => ColumnDesc.fromJSON(e)) : [],
-      pk: Array.isArray(object?.pk) ? object.pk.map((e: any) => ColumnOrder.fromJSON(e)) : [],
-      distKeyIndices: Array.isArray(object?.distKeyIndices) ? object.distKeyIndices.map((e: any) => Number(e)) : [],
-      retentionSeconds: isSet(object.retentionSeconds) ? Number(object.retentionSeconds) : 0,
-      valueIndices: Array.isArray(object?.valueIndices) ? object.valueIndices.map((e: any) => Number(e)) : [],
-      readPrefixLenHint: isSet(object.readPrefixLenHint) ? Number(object.readPrefixLenHint) : 0,
-      versioned: isSet(object.versioned) ? Boolean(object.versioned) : false,
-    };
-  },
-
-  toJSON(message: StorageTableDesc): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? ColumnDesc.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    if (message.pk) {
-      obj.pk = message.pk.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.pk = [];
-    }
-    if (message.distKeyIndices) {
-      obj.distKeyIndices = message.distKeyIndices.map((e) => Math.round(e));
-    } else {
-      obj.distKeyIndices = [];
-    }
-    message.retentionSeconds !== undefined && (obj.retentionSeconds = Math.round(message.retentionSeconds));
-    if (message.valueIndices) {
-      obj.valueIndices = message.valueIndices.map((e) => Math.round(e));
-    } else {
-      obj.valueIndices = [];
-    }
-    message.readPrefixLenHint !== undefined && (obj.readPrefixLenHint = Math.round(message.readPrefixLenHint));
-    message.versioned !== undefined && (obj.versioned = message.versioned);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StorageTableDesc>, I>>(object: I): StorageTableDesc {
-    const message = createBaseStorageTableDesc();
-    message.tableId = object.tableId ?? 0;
-    message.columns = object.columns?.map((e) => ColumnDesc.fromPartial(e)) || [];
-    message.pk = object.pk?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.distKeyIndices = object.distKeyIndices?.map((e) => e) || [];
-    message.retentionSeconds = object.retentionSeconds ?? 0;
-    message.valueIndices = object.valueIndices?.map((e) => e) || [];
-    message.readPrefixLenHint = object.readPrefixLenHint ?? 0;
-    message.versioned = object.versioned ?? false;
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/source.ts b/dashboard/proto/gen/source.ts
deleted file mode 100644
index 1d45c28375e74..0000000000000
--- a/dashboard/proto/gen/source.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-/* eslint-disable */
-
-export const protobufPackage = "source";
-
-export interface ConnectorSplit {
-  splitType: string;
-  encodedSplit: Uint8Array;
-}
-
-export interface ConnectorSplits {
-  splits: ConnectorSplit[];
-}
-
-export interface SourceActorInfo {
-  actorId: number;
-  splits: ConnectorSplits | undefined;
-}
-
-function createBaseConnectorSplit(): ConnectorSplit {
-  return { splitType: "", encodedSplit: new Uint8Array() };
-}
-
-export const ConnectorSplit = {
-  fromJSON(object: any): ConnectorSplit {
-    return {
-      splitType: isSet(object.splitType) ? String(object.splitType) : "",
-      encodedSplit: isSet(object.encodedSplit) ? bytesFromBase64(object.encodedSplit) : new Uint8Array(),
-    };
-  },
-
-  toJSON(message: ConnectorSplit): unknown {
-    const obj: any = {};
-    message.splitType !== undefined && (obj.splitType = message.splitType);
-    message.encodedSplit !== undefined &&
-      (obj.encodedSplit = base64FromBytes(
-        message.encodedSplit !== undefined ? message.encodedSplit : new Uint8Array(),
-      ));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ConnectorSplit>, I>>(object: I): ConnectorSplit {
-    const message = createBaseConnectorSplit();
-    message.splitType = object.splitType ?? "";
-    message.encodedSplit = object.encodedSplit ?? new Uint8Array();
-    return message;
-  },
-};
-
-function createBaseConnectorSplits(): ConnectorSplits {
-  return { splits: [] };
-}
-
-export const ConnectorSplits = {
-  fromJSON(object: any): ConnectorSplits {
-    return { splits: Array.isArray(object?.splits) ? object.splits.map((e: any) => ConnectorSplit.fromJSON(e)) : [] };
-  },
-
-  toJSON(message: ConnectorSplits): unknown {
-    const obj: any = {};
-    if (message.splits) {
-      obj.splits = message.splits.map((e) => e ? ConnectorSplit.toJSON(e) : undefined);
-    } else {
-      obj.splits = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ConnectorSplits>, I>>(object: I): ConnectorSplits {
-    const message = createBaseConnectorSplits();
-    message.splits = object.splits?.map((e) => ConnectorSplit.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseSourceActorInfo(): SourceActorInfo {
-  return { actorId: 0, splits: undefined };
-}
-
-export const SourceActorInfo = {
-  fromJSON(object: any): SourceActorInfo {
-    return {
-      actorId: isSet(object.actorId) ? Number(object.actorId) : 0,
-      splits: isSet(object.splits) ? ConnectorSplits.fromJSON(object.splits) : undefined,
-    };
-  },
-
-  toJSON(message: SourceActorInfo): unknown {
-    const obj: any = {};
-    message.actorId !== undefined && (obj.actorId = Math.round(message.actorId));
-    message.splits !== undefined && (obj.splits = message.splits ? ConnectorSplits.toJSON(message.splits) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SourceActorInfo>, I>>(object: I): SourceActorInfo {
-    const message = createBaseSourceActorInfo();
-    message.actorId = object.actorId ?? 0;
-    message.splits = (object.splits !== undefined && object.splits !== null)
-      ? ConnectorSplits.fromPartial(object.splits)
-      : undefined;
-    return message;
-  },
-};
-
-declare var self: any | undefined;
-declare var window: any | undefined;
-declare var global: any | undefined;
-var globalThis: any = (() => {
-  if (typeof globalThis !== "undefined") {
-    return globalThis;
-  }
-  if (typeof self !== "undefined") {
-    return self;
-  }
-  if (typeof window !== "undefined") {
-    return window;
-  }
-  if (typeof global !== "undefined") {
-    return global;
-  }
-  throw "Unable to locate global object";
-})();
-
-function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-
-function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin: string[] = [];
-    arr.forEach((byte) => {
-      bin.push(String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/stream_plan.ts b/dashboard/proto/gen/stream_plan.ts
deleted file mode 100644
index 528c7adaf466c..0000000000000
--- a/dashboard/proto/gen/stream_plan.ts
+++ /dev/null
@@ -1,4595 +0,0 @@
-/* eslint-disable */
-import { SinkType, sinkTypeFromJSON, sinkTypeToJSON, StreamSourceInfo, Table, WatermarkDesc } from "./catalog";
-import { Buffer, ColumnOrder } from "./common";
-import { Datum, Epoch, IntervalUnit, StreamChunk } from "./data";
-import { AggCall, ExprNode, InputRef, ProjectSetSelectItem } from "./expr";
-import {
-  ColumnCatalog,
-  ColumnDesc,
-  Field,
-  JoinType,
-  joinTypeFromJSON,
-  joinTypeToJSON,
-  StorageTableDesc,
-} from "./plan_common";
-import { ConnectorSplits } from "./source";
-
-export const protobufPackage = "stream_plan";
-
-export const HandleConflictBehavior = {
-  NO_CHECK_UNSPECIFIED: "NO_CHECK_UNSPECIFIED",
-  OVERWRITE: "OVERWRITE",
-  IGNORE: "IGNORE",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type HandleConflictBehavior = typeof HandleConflictBehavior[keyof typeof HandleConflictBehavior];
-
-export function handleConflictBehaviorFromJSON(object: any): HandleConflictBehavior {
-  switch (object) {
-    case 0:
-    case "NO_CHECK_UNSPECIFIED":
-      return HandleConflictBehavior.NO_CHECK_UNSPECIFIED;
-    case 1:
-    case "OVERWRITE":
-      return HandleConflictBehavior.OVERWRITE;
-    case 2:
-    case "IGNORE":
-      return HandleConflictBehavior.IGNORE;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return HandleConflictBehavior.UNRECOGNIZED;
-  }
-}
-
-export function handleConflictBehaviorToJSON(object: HandleConflictBehavior): string {
-  switch (object) {
-    case HandleConflictBehavior.NO_CHECK_UNSPECIFIED:
-      return "NO_CHECK_UNSPECIFIED";
-    case HandleConflictBehavior.OVERWRITE:
-      return "OVERWRITE";
-    case HandleConflictBehavior.IGNORE:
-      return "IGNORE";
-    case HandleConflictBehavior.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const ChainType = {
-  CHAIN_UNSPECIFIED: "CHAIN_UNSPECIFIED",
-  /** CHAIN - CHAIN is corresponding to the chain executor. */
-  CHAIN: "CHAIN",
-  /** REARRANGE - REARRANGE is corresponding to the rearranged chain executor. */
-  REARRANGE: "REARRANGE",
-  /** BACKFILL - BACKFILL is corresponding to the backfill executor. */
-  BACKFILL: "BACKFILL",
-  /** UPSTREAM_ONLY - UPSTREAM_ONLY is corresponding to the chain executor, but doesn't consume the snapshot. */
-  UPSTREAM_ONLY: "UPSTREAM_ONLY",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type ChainType = typeof ChainType[keyof typeof ChainType];
-
-export function chainTypeFromJSON(object: any): ChainType {
-  switch (object) {
-    case 0:
-    case "CHAIN_UNSPECIFIED":
-      return ChainType.CHAIN_UNSPECIFIED;
-    case 1:
-    case "CHAIN":
-      return ChainType.CHAIN;
-    case 2:
-    case "REARRANGE":
-      return ChainType.REARRANGE;
-    case 3:
-    case "BACKFILL":
-      return ChainType.BACKFILL;
-    case 4:
-    case "UPSTREAM_ONLY":
-      return ChainType.UPSTREAM_ONLY;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return ChainType.UNRECOGNIZED;
-  }
-}
-
-export function chainTypeToJSON(object: ChainType): string {
-  switch (object) {
-    case ChainType.CHAIN_UNSPECIFIED:
-      return "CHAIN_UNSPECIFIED";
-    case ChainType.CHAIN:
-      return "CHAIN";
-    case ChainType.REARRANGE:
-      return "REARRANGE";
-    case ChainType.BACKFILL:
-      return "BACKFILL";
-    case ChainType.UPSTREAM_ONLY:
-      return "UPSTREAM_ONLY";
-    case ChainType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const DispatcherType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  /** HASH - Dispatch by hash key, hashed by consistent hash. */
-  HASH: "HASH",
-  /**
-   * BROADCAST - Broadcast to all downstreams.
-   *
-   * Note a broadcast cannot be represented as multiple simple dispatchers, since they are
-   * different when we update dispatchers during scaling.
-   */
-  BROADCAST: "BROADCAST",
-  /** SIMPLE - Only one downstream. */
-  SIMPLE: "SIMPLE",
-  /**
-   * NO_SHUFFLE - A special kind of exchange that doesn't involve shuffle. The upstream actor will be directly
-   * piped into the downstream actor, if there are the same number of actors. If number of actors
-   * are not the same, should use hash instead. Should be only used when distribution is the same.
-   */
-  NO_SHUFFLE: "NO_SHUFFLE",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type DispatcherType = typeof DispatcherType[keyof typeof DispatcherType];
-
-export function dispatcherTypeFromJSON(object: any): DispatcherType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return DispatcherType.UNSPECIFIED;
-    case 1:
-    case "HASH":
-      return DispatcherType.HASH;
-    case 2:
-    case "BROADCAST":
-      return DispatcherType.BROADCAST;
-    case 3:
-    case "SIMPLE":
-      return DispatcherType.SIMPLE;
-    case 4:
-    case "NO_SHUFFLE":
-      return DispatcherType.NO_SHUFFLE;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return DispatcherType.UNRECOGNIZED;
-  }
-}
-
-export function dispatcherTypeToJSON(object: DispatcherType): string {
-  switch (object) {
-    case DispatcherType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case DispatcherType.HASH:
-      return "HASH";
-    case DispatcherType.BROADCAST:
-      return "BROADCAST";
-    case DispatcherType.SIMPLE:
-      return "SIMPLE";
-    case DispatcherType.NO_SHUFFLE:
-      return "NO_SHUFFLE";
-    case DispatcherType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export const FragmentTypeFlag = {
-  FRAGMENT_UNSPECIFIED: "FRAGMENT_UNSPECIFIED",
-  SOURCE: "SOURCE",
-  MVIEW: "MVIEW",
-  SINK: "SINK",
-  NOW: "NOW",
-  CHAIN_NODE: "CHAIN_NODE",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type FragmentTypeFlag = typeof FragmentTypeFlag[keyof typeof FragmentTypeFlag];
-
-export function fragmentTypeFlagFromJSON(object: any): FragmentTypeFlag {
-  switch (object) {
-    case 0:
-    case "FRAGMENT_UNSPECIFIED":
-      return FragmentTypeFlag.FRAGMENT_UNSPECIFIED;
-    case 1:
-    case "SOURCE":
-      return FragmentTypeFlag.SOURCE;
-    case 2:
-    case "MVIEW":
-      return FragmentTypeFlag.MVIEW;
-    case 4:
-    case "SINK":
-      return FragmentTypeFlag.SINK;
-    case 8:
-    case "NOW":
-      return FragmentTypeFlag.NOW;
-    case 16:
-    case "CHAIN_NODE":
-      return FragmentTypeFlag.CHAIN_NODE;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return FragmentTypeFlag.UNRECOGNIZED;
-  }
-}
-
-export function fragmentTypeFlagToJSON(object: FragmentTypeFlag): string {
-  switch (object) {
-    case FragmentTypeFlag.FRAGMENT_UNSPECIFIED:
-      return "FRAGMENT_UNSPECIFIED";
-    case FragmentTypeFlag.SOURCE:
-      return "SOURCE";
-    case FragmentTypeFlag.MVIEW:
-      return "MVIEW";
-    case FragmentTypeFlag.SINK:
-      return "SINK";
-    case FragmentTypeFlag.NOW:
-      return "NOW";
-    case FragmentTypeFlag.CHAIN_NODE:
-      return "CHAIN_NODE";
-    case FragmentTypeFlag.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface AddMutation {
-  /** New dispatchers for each actor. */
-  actorDispatchers: { [key: number]: AddMutation_Dispatchers };
-  /**
-   * We may embed a source change split mutation here.
-   * TODO: we may allow multiple mutations in a single barrier.
-   */
-  actorSplits: { [key: number]: ConnectorSplits };
-}
-
-export interface AddMutation_Dispatchers {
-  dispatchers: Dispatcher[];
-}
-
-export interface AddMutation_ActorDispatchersEntry {
-  key: number;
-  value: AddMutation_Dispatchers | undefined;
-}
-
-export interface AddMutation_ActorSplitsEntry {
-  key: number;
-  value: ConnectorSplits | undefined;
-}
-
-export interface StopMutation {
-  actors: number[];
-}
-
-export interface UpdateMutation {
-  /** Dispatcher updates. */
-  dispatcherUpdate: UpdateMutation_DispatcherUpdate[];
-  /** Merge updates. */
-  mergeUpdate: UpdateMutation_MergeUpdate[];
-  /** Vnode bitmap updates for each actor. */
-  actorVnodeBitmapUpdate: { [key: number]: Buffer };
-  /** All actors to be dropped in this update. */
-  droppedActors: number[];
-  /** Source updates. */
-  actorSplits: { [key: number]: ConnectorSplits };
-}
-
-export interface UpdateMutation_DispatcherUpdate {
-  /** Dispatcher can be uniquely identified by a combination of actor id and dispatcher id. */
-  actorId: number;
-  dispatcherId: number;
-  /**
-   * The hash mapping for consistent hash.
-   * For dispatcher types other than HASH, this is ignored.
-   */
-  hashMapping:
-    | ActorMapping
-    | undefined;
-  /** Added downstream actors. */
-  addedDownstreamActorId: number[];
-  /** Removed downstream actors. */
-  removedDownstreamActorId: number[];
-}
-
-export interface UpdateMutation_MergeUpdate {
-  /** Merge executor can be uniquely identified by a combination of actor id and upstream fragment id. */
-  actorId: number;
-  upstreamFragmentId: number;
-  /**
-   * - For scaling, this is always `None`.
-   * - For plan change, the upstream fragment will be changed to a new one, and this will be `Some`.
-   *   In this case, all the upstream actors should be removed and replaced by the `new` ones.
-   */
-  newUpstreamFragmentId?:
-    | number
-    | undefined;
-  /** Added upstream actors. */
-  addedUpstreamActorId: number[];
-  /** Removed upstream actors. */
-  removedUpstreamActorId: number[];
-}
-
-export interface UpdateMutation_ActorVnodeBitmapUpdateEntry {
-  key: number;
-  value: Buffer | undefined;
-}
-
-export interface UpdateMutation_ActorSplitsEntry {
-  key: number;
-  value: ConnectorSplits | undefined;
-}
-
-export interface SourceChangeSplitMutation {
-  actorSplits: { [key: number]: ConnectorSplits };
-}
-
-export interface SourceChangeSplitMutation_ActorSplitsEntry {
-  key: number;
-  value: ConnectorSplits | undefined;
-}
-
-export interface PauseMutation {
-}
-
-export interface ResumeMutation {
-}
-
-export interface Barrier {
-  epoch: Epoch | undefined;
-  mutation?:
-    | { $case: "add"; add: AddMutation }
-    | { $case: "stop"; stop: StopMutation }
-    | { $case: "update"; update: UpdateMutation }
-    | { $case: "splits"; splits: SourceChangeSplitMutation }
-    | { $case: "pause"; pause: PauseMutation }
-    | { $case: "resume"; resume: ResumeMutation };
-  /** Used for tracing. */
-  span: Uint8Array;
-  /** Whether this barrier do checkpoint */
-  checkpoint: boolean;
-  /** Record the actors that the barrier has passed. Only used for debugging. */
-  passedActors: number[];
-}
-
-export interface Watermark {
-  /** The reference to the watermark column in the stream's schema. */
-  column:
-    | InputRef
-    | undefined;
-  /** The watermark value, there will be no record having a greater value in the watermark column. */
-  val: Datum | undefined;
-}
-
-export interface StreamMessage {
-  streamMessage?: { $case: "streamChunk"; streamChunk: StreamChunk } | { $case: "barrier"; barrier: Barrier } | {
-    $case: "watermark";
-    watermark: Watermark;
-  };
-}
-
-/** Hash mapping for compute node. Stores mapping from virtual node to actor id. */
-export interface ActorMapping {
-  originalIndices: number[];
-  data: number[];
-}
-
-export interface StreamSource {
-  sourceId: number;
-  stateTable: Table | undefined;
-  rowIdIndex?: number | undefined;
-  columns: ColumnCatalog[];
-  pkColumnIds: number[];
-  properties: { [key: string]: string };
-  info: StreamSourceInfo | undefined;
-  sourceName: string;
-}
-
-export interface StreamSource_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-/**
- * The executor only for receiving barrier from the meta service. It always resides in the leaves
- * of the streaming graph.
- */
-export interface BarrierRecvNode {
-}
-
-export interface SourceNode {
-  /**
-   * The source node can contain either a stream source or nothing. So here we extract all
-   * information about stream source to a message, and here it will be an `Option` in Rust.
-   */
-  sourceInner: StreamSource | undefined;
-}
-
-export interface SinkDesc {
-  id: number;
-  name: string;
-  definition: string;
-  columns: ColumnDesc[];
-  pk: ColumnOrder[];
-  streamKey: number[];
-  distributionKey: number[];
-  properties: { [key: string]: string };
-  sinkType: SinkType;
-}
-
-export interface SinkDesc_PropertiesEntry {
-  key: string;
-  value: string;
-}
-
-export interface SinkNode {
-  sinkDesc: SinkDesc | undefined;
-}
-
-export interface ProjectNode {
-  selectList: ExprNode[];
-  /**
-   * this two field is expressing a list of usize pair, which means when project receives a
-   * watermark with `watermark_input_key[i]` column index, it should derive a new watermark
-   * with `watermark_output_key[i]`th expression
-   */
-  watermarkInputKey: number[];
-  watermarkOutputKey: number[];
-}
-
-export interface FilterNode {
-  searchCondition: ExprNode | undefined;
-}
-
-/**
- * A materialized view is regarded as a table.
- * In addition, we also specify primary key to MV for efficient point lookup during update and deletion.
- *
- * The node will be used for both create mv and create index.
- * - When creating mv, `pk == distribution_key == column_orders`.
- * - When creating index, `column_orders` will contain both
- *   arrange columns and pk columns, while distribution key will be arrange columns.
- */
-export interface MaterializeNode {
-  tableId: number;
-  /** Column indexes and orders of primary key. */
-  columnOrders: ColumnOrder[];
-  /** Used for internal table states. */
-  table:
-    | Table
-    | undefined;
-  /** Used to handle pk conflict, open it when upstream executor is source executor. */
-  handlePkConflictBehavior: HandleConflictBehavior;
-}
-
-export interface AggCallState {
-  inner?: { $case: "resultValueState"; resultValueState: AggCallState_ResultValueState } | {
-    $case: "tableState";
-    tableState: AggCallState_TableState;
-  } | { $case: "materializedInputState"; materializedInputState: AggCallState_MaterializedInputState };
-}
-
-/** use the one column of stream's result table as the AggCall's state, used for count/sum/append-only extreme. */
-export interface AggCallState_ResultValueState {
-}
-
-/** use untransformed result as the AggCall's state, used for append-only approx count distinct. */
-export interface AggCallState_TableState {
-  table: Table | undefined;
-}
-
-/** use the some column of the Upstream's materialization as the AggCall's state, used for extreme/string_agg/array_agg. */
-export interface AggCallState_MaterializedInputState {
-  table:
-    | Table
-    | undefined;
-  /** for constructing state table column mapping */
-  includedUpstreamIndices: number[];
-  tableValueIndices: number[];
-}
-
-export interface SimpleAggNode {
-  aggCalls: AggCall[];
-  /** Only used for local simple agg, not used for global simple agg. */
-  distributionKey: number[];
-  aggCallStates: AggCallState[];
-  resultTable:
-    | Table
-    | undefined;
-  /**
-   * Whether to optimize for append only stream.
-   * It is true when the input is append-only
-   */
-  isAppendOnly: boolean;
-  distinctDedupTables: { [key: number]: Table };
-  rowCountIndex: number;
-}
-
-export interface SimpleAggNode_DistinctDedupTablesEntry {
-  key: number;
-  value: Table | undefined;
-}
-
-export interface HashAggNode {
-  groupKey: number[];
-  aggCalls: AggCall[];
-  aggCallStates: AggCallState[];
-  resultTable:
-    | Table
-    | undefined;
-  /**
-   * Whether to optimize for append only stream.
-   * It is true when the input is append-only
-   */
-  isAppendOnly: boolean;
-  distinctDedupTables: { [key: number]: Table };
-  rowCountIndex: number;
-}
-
-export interface HashAggNode_DistinctDedupTablesEntry {
-  key: number;
-  value: Table | undefined;
-}
-
-export interface TopNNode {
-  /** 0 means no limit as limit of 0 means this node should be optimized away */
-  limit: number;
-  offset: number;
-  table: Table | undefined;
-  orderBy: ColumnOrder[];
-  withTies: boolean;
-}
-
-export interface GroupTopNNode {
-  /** 0 means no limit as limit of 0 means this node should be optimized away */
-  limit: number;
-  offset: number;
-  groupKey: number[];
-  table: Table | undefined;
-  orderBy: ColumnOrder[];
-  withTies: boolean;
-}
-
-export interface HashJoinNode {
-  joinType: JoinType;
-  leftKey: number[];
-  rightKey: number[];
-  condition:
-    | ExprNode
-    | undefined;
-  /** Used for internal table states. */
-  leftTable:
-    | Table
-    | undefined;
-  /** Used for internal table states. */
-  rightTable:
-    | Table
-    | undefined;
-  /** Used for internal table states. */
-  leftDegreeTable:
-    | Table
-    | undefined;
-  /** Used for internal table states. */
-  rightDegreeTable:
-    | Table
-    | undefined;
-  /** The output indices of current node */
-  outputIndices: number[];
-  /**
-   * Left deduped input pk indices. The pk of the left_table and
-   * left_degree_table is  [left_join_key | left_deduped_input_pk_indices]
-   * and is expected to be the shortest key which starts with
-   * the join key and satisfies unique constrain.
-   */
-  leftDedupedInputPkIndices: number[];
-  /**
-   * Right deduped input pk indices. The pk of the right_table and
-   * right_degree_table is  [right_join_key | right_deduped_input_pk_indices]
-   * and is expected to be the shortest key which starts with
-   * the join key and satisfies unique constrain.
-   */
-  rightDedupedInputPkIndices: number[];
-  nullSafe: boolean[];
-  /**
-   * Whether to optimize for append only stream.
-   * It is true when the input is append-only
-   */
-  isAppendOnly: boolean;
-}
-
-export interface TemporalJoinNode {
-  joinType: JoinType;
-  leftKey: number[];
-  rightKey: number[];
-  nullSafe: boolean[];
-  condition:
-    | ExprNode
-    | undefined;
-  /** The output indices of current node */
-  outputIndices: number[];
-  /** The table desc of the lookup side table. */
-  tableDesc:
-    | StorageTableDesc
-    | undefined;
-  /** The output indices of the lookup side table */
-  tableOutputIndices: number[];
-}
-
-export interface DynamicFilterNode {
-  leftKey: number;
-  /** Must be one of <, <=, >, >= */
-  condition:
-    | ExprNode
-    | undefined;
-  /** Left table stores all states with predicate possibly not NULL. */
-  leftTable:
-    | Table
-    | undefined;
-  /** Right table stores single value from RHS of predicate. */
-  rightTable: Table | undefined;
-}
-
-/**
- * Delta join with two indexes. This is a pseudo plan node generated on frontend. On meta
- * service, it will be rewritten into lookup joins.
- */
-export interface DeltaIndexJoinNode {
-  joinType: JoinType;
-  leftKey: number[];
-  rightKey: number[];
-  condition:
-    | ExprNode
-    | undefined;
-  /** Table id of the left index. */
-  leftTableId: number;
-  /** Table id of the right index. */
-  rightTableId: number;
-  /** Info about the left index */
-  leftInfo:
-    | ArrangementInfo
-    | undefined;
-  /** Info about the right index */
-  rightInfo:
-    | ArrangementInfo
-    | undefined;
-  /** the output indices of current node */
-  outputIndices: number[];
-}
-
-export interface HopWindowNode {
-  timeCol: number;
-  windowSlide: IntervalUnit | undefined;
-  windowSize: IntervalUnit | undefined;
-  outputIndices: number[];
-  windowStartExprs: ExprNode[];
-  windowEndExprs: ExprNode[];
-}
-
-export interface MergeNode {
-  upstreamActorId: number[];
-  upstreamFragmentId: number;
-  /**
-   * Type of the upstream dispatcher. If there's always one upstream according to this
-   * type, the compute node may use the `ReceiverExecutor` as an optimization.
-   */
-  upstreamDispatcherType: DispatcherType;
-  /** The schema of input columns. TODO: remove this field. */
-  fields: Field[];
-}
-
-/**
- * passed from frontend to meta, used by fragmenter to generate `MergeNode`
- * and maybe `DispatcherNode` later.
- */
-export interface ExchangeNode {
-  strategy: DispatchStrategy | undefined;
-}
-
-/**
- * ChainNode is used for mv on mv.
- * ChainNode is like a "UNION" on mv snapshot and streaming. So it takes two inputs with fixed order:
- *   1. MergeNode (as a placeholder) for streaming read.
- *   2. BatchPlanNode for snapshot read.
- */
-export interface ChainNode {
-  tableId: number;
-  /**
-   * The columns from the upstream table that'll be internally required by this chain node.
-   * - For non-backfill chain node, it's the same as the output columns.
-   * - For backfill chain node, there're additionally primary key columns.
-   */
-  upstreamColumnIds: number[];
-  /**
-   * The columns to be output by this chain node. The index is based on the internal required columns.
-   * - For non-backfill chain node, it's simply all the columns.
-   * - For backfill chain node, this strips the primary key columns if they're unnecessary.
-   */
-  outputIndices: number[];
-  /**
-   * Generally, the barrier needs to be rearranged during the MV creation process, so that data can
-   * be flushed to shared buffer periodically, instead of making the first epoch from batch query extra
-   * large. However, in some cases, e.g., shared state, the barrier cannot be rearranged in ChainNode.
-   * ChainType is used to decide which implementation for the ChainNode.
-   */
-  chainType: ChainType;
-  /** The upstream materialized view info used by backfill. */
-  tableDesc: StorageTableDesc | undefined;
-}
-
-/**
- * BatchPlanNode is used for mv on mv snapshot read.
- * BatchPlanNode is supposed to carry a batch plan that can be optimized with the streaming plan_common.
- * Currently, streaming to batch push down is not yet supported, BatchPlanNode is simply a table scan.
- */
-export interface BatchPlanNode {
-  tableDesc: StorageTableDesc | undefined;
-  columnIds: number[];
-}
-
-export interface ArrangementInfo {
-  /**
-   * Order key of the arrangement, including order by columns and pk from the materialize
-   * executor.
-   */
-  arrangeKeyOrders: ColumnOrder[];
-  /** Column descs of the arrangement */
-  columnDescs: ColumnDesc[];
-  /** Used to build storage table by stream lookup join of delta join. */
-  tableDesc: StorageTableDesc | undefined;
-}
-
-/**
- * Special node for shared state, which will only be produced in fragmenter. ArrangeNode will
- * produce a special Materialize executor, which materializes data for downstream to query.
- */
-export interface ArrangeNode {
-  /** Info about the arrangement */
-  tableInfo:
-    | ArrangementInfo
-    | undefined;
-  /** Hash key of the materialize node, which is a subset of pk. */
-  distributionKey: number[];
-  /** Used for internal table states. */
-  table:
-    | Table
-    | undefined;
-  /** Used to control whether doing sanity check, open it when upstream executor is source executor. */
-  handlePkConflictBehavior: HandleConflictBehavior;
-}
-
-/** Special node for shared state. LookupNode will join an arrangement with a stream. */
-export interface LookupNode {
-  /** Join key of the arrangement side */
-  arrangeKey: number[];
-  /** Join key of the stream side */
-  streamKey: number[];
-  /** Whether to join the current epoch of arrangement */
-  useCurrentEpoch: boolean;
-  /**
-   * Sometimes we need to re-order the output data to meet the requirement of schema.
-   * By default, lookup executor will produce `<arrangement side, stream side>`. We
-   * will then apply the column mapping to the combined result.
-   */
-  columnMapping: number[];
-  arrangementTableId?:
-    | { $case: "tableId"; tableId: number }
-    | { $case: "indexId"; indexId: number };
-  /** Info about the arrangement */
-  arrangementTableInfo: ArrangementInfo | undefined;
-}
-
-/** WatermarkFilter needs to filter the upstream data by the water mark. */
-export interface WatermarkFilterNode {
-  /** The watermark descs */
-  watermarkDescs: WatermarkDesc[];
-  /** The tables used to persist watermarks, the key is vnode. */
-  tables: Table[];
-}
-
-/** Acts like a merger, but on different inputs. */
-export interface UnionNode {
-}
-
-/** Special node for shared state. Merge and align barrier from upstreams. Pipe inputs in order. */
-export interface LookupUnionNode {
-  order: number[];
-}
-
-export interface ExpandNode {
-  columnSubsets: ExpandNode_Subset[];
-}
-
-export interface ExpandNode_Subset {
-  columnIndices: number[];
-}
-
-export interface ProjectSetNode {
-  selectList: ProjectSetSelectItem[];
-}
-
-/** Sorts inputs and outputs ordered data based on watermark. */
-export interface SortNode {
-  /** Persists data above watermark. */
-  stateTable:
-    | Table
-    | undefined;
-  /** Column index of watermark to perform sorting. */
-  sortColumnIndex: number;
-}
-
-/** Merges two streams from streaming and batch for data manipulation. */
-export interface DmlNode {
-  /** Id of the table on which DML performs. */
-  tableId: number;
-  /** Version of the table. */
-  tableVersionId: number;
-  /** Column descriptions of the table. */
-  columnDescs: ColumnDesc[];
-}
-
-export interface RowIdGenNode {
-  rowIdIndex: number;
-}
-
-export interface NowNode {
-  /** Persists emitted 'now'. */
-  stateTable: Table | undefined;
-}
-
-export interface StreamNode {
-  nodeBody?:
-    | { $case: "source"; source: SourceNode }
-    | { $case: "project"; project: ProjectNode }
-    | { $case: "filter"; filter: FilterNode }
-    | { $case: "materialize"; materialize: MaterializeNode }
-    | { $case: "localSimpleAgg"; localSimpleAgg: SimpleAggNode }
-    | { $case: "globalSimpleAgg"; globalSimpleAgg: SimpleAggNode }
-    | { $case: "hashAgg"; hashAgg: HashAggNode }
-    | { $case: "appendOnlyTopN"; appendOnlyTopN: TopNNode }
-    | { $case: "hashJoin"; hashJoin: HashJoinNode }
-    | { $case: "topN"; topN: TopNNode }
-    | { $case: "hopWindow"; hopWindow: HopWindowNode }
-    | { $case: "merge"; merge: MergeNode }
-    | { $case: "exchange"; exchange: ExchangeNode }
-    | { $case: "chain"; chain: ChainNode }
-    | { $case: "batchPlan"; batchPlan: BatchPlanNode }
-    | { $case: "lookup"; lookup: LookupNode }
-    | { $case: "arrange"; arrange: ArrangeNode }
-    | { $case: "lookupUnion"; lookupUnion: LookupUnionNode }
-    | { $case: "union"; union: UnionNode }
-    | { $case: "deltaIndexJoin"; deltaIndexJoin: DeltaIndexJoinNode }
-    | { $case: "sink"; sink: SinkNode }
-    | { $case: "expand"; expand: ExpandNode }
-    | { $case: "dynamicFilter"; dynamicFilter: DynamicFilterNode }
-    | { $case: "projectSet"; projectSet: ProjectSetNode }
-    | { $case: "groupTopN"; groupTopN: GroupTopNNode }
-    | { $case: "sort"; sort: SortNode }
-    | { $case: "watermarkFilter"; watermarkFilter: WatermarkFilterNode }
-    | { $case: "dml"; dml: DmlNode }
-    | { $case: "rowIdGen"; rowIdGen: RowIdGenNode }
-    | { $case: "now"; now: NowNode }
-    | { $case: "appendOnlyGroupTopN"; appendOnlyGroupTopN: GroupTopNNode }
-    | { $case: "temporalJoin"; temporalJoin: TemporalJoinNode }
-    | { $case: "barrierRecv"; barrierRecv: BarrierRecvNode };
-  /**
-   * The id for the operator. This is local per mview.
-   * TODO: should better be a uint32.
-   */
-  operatorId: number;
-  /** Child node in plan aka. upstream nodes in the streaming DAG */
-  input: StreamNode[];
-  streamKey: number[];
-  appendOnly: boolean;
-  identity: string;
-  /** The schema of the plan node */
-  fields: Field[];
-}
-
-/**
- * The property of an edge in the fragment graph.
- * This is essientially a "logical" version of `Dispatcher`. See the doc of `Dispatcher` for more details.
- */
-export interface DispatchStrategy {
-  type: DispatcherType;
-  distKeyIndices: number[];
-  outputIndices: number[];
-}
-
-/**
- * A dispatcher redistribute messages.
- * We encode both the type and other usage information in the proto.
- */
-export interface Dispatcher {
-  type: DispatcherType;
-  /**
-   * Indices of the columns to be used for hashing.
-   * For dispatcher types other than HASH, this is ignored.
-   */
-  distKeyIndices: number[];
-  /**
-   * Indices of the columns to output.
-   * In most cases, this contains all columns in the input. But for some cases like MV on MV or
-   * schema change, we may only output a subset of the columns.
-   */
-  outputIndices: number[];
-  /**
-   * The hash mapping for consistent hash.
-   * For dispatcher types other than HASH, this is ignored.
-   */
-  hashMapping:
-    | ActorMapping
-    | undefined;
-  /**
-   * Dispatcher can be uniquely identified by a combination of actor id and dispatcher id.
-   * This is exactly the same as its downstream fragment id.
-   */
-  dispatcherId: number;
-  /** Number of downstreams decides how many endpoints a dispatcher should dispatch. */
-  downstreamActorId: number[];
-}
-
-/** A StreamActor is a running fragment of the overall stream graph, */
-export interface StreamActor {
-  actorId: number;
-  fragmentId: number;
-  nodes: StreamNode | undefined;
-  dispatcher: Dispatcher[];
-  /**
-   * The actors that send messages to this actor.
-   * Note that upstream actor ids are also stored in the proto of merge nodes.
-   * It is painstaking to traverse through the node tree and get upstream actor id from the root StreamNode.
-   * We duplicate the information here to ease the parsing logic in stream manager.
-   */
-  upstreamActorId: number[];
-  /**
-   * Vnodes that the executors in this actor own.
-   * If the fragment is a singleton, this field will not be set and leave a `None`.
-   */
-  vnodeBitmap:
-    | Buffer
-    | undefined;
-  /** The SQL definition of this materialized view. Used for debugging only. */
-  mviewDefinition: string;
-}
-
-/** The environment associated with a stream plan */
-export interface StreamEnvironment {
-  /** The timezone associated with the streaming plan. Only applies to MV for now. */
-  timezone: string;
-}
-
-export interface StreamFragmentGraph {
-  /** all the fragments in the graph. */
-  fragments: { [key: number]: StreamFragmentGraph_StreamFragment };
-  /** edges between fragments. */
-  edges: StreamFragmentGraph_StreamFragmentEdge[];
-  dependentRelationIds: number[];
-  tableIdsCnt: number;
-  env:
-    | StreamEnvironment
-    | undefined;
-  /** If none, default parallelism will be applied. */
-  parallelism: StreamFragmentGraph_Parallelism | undefined;
-}
-
-export interface StreamFragmentGraph_StreamFragment {
-  /** 0-based on frontend, and will be rewritten to global id on meta. */
-  fragmentId: number;
-  /** root stream node in this fragment. */
-  node:
-    | StreamNode
-    | undefined;
-  /** Bitwise-OR of FragmentTypeFlags */
-  fragmentTypeMask: number;
-  /**
-   * Mark whether this fragment requires exactly one actor.
-   * Note: if this is `false`, the fragment may still be a singleton according to the scheduler.
-   * One should check `meta.Fragment.distribution_type` for the final result.
-   */
-  requiresSingleton: boolean;
-  /** Number of table ids (stateful states) for this fragment. */
-  tableIdsCnt: number;
-  /** Mark the upstream table ids of this fragment, Used for fragments with `Chain`s. */
-  upstreamTableIds: number[];
-}
-
-export interface StreamFragmentGraph_StreamFragmentEdge {
-  /** Dispatch strategy for the fragment. */
-  dispatchStrategy:
-    | DispatchStrategy
-    | undefined;
-  /**
-   * A unique identifier of this edge. Generally it should be exchange node's operator id. When
-   * rewriting fragments into delta joins or when inserting 1-to-1 exchange, there will be
-   * virtual links generated.
-   */
-  linkId: number;
-  upstreamId: number;
-  downstreamId: number;
-}
-
-export interface StreamFragmentGraph_Parallelism {
-  parallelism: number;
-}
-
-export interface StreamFragmentGraph_FragmentsEntry {
-  key: number;
-  value: StreamFragmentGraph_StreamFragment | undefined;
-}
-
-function createBaseAddMutation(): AddMutation {
-  return { actorDispatchers: {}, actorSplits: {} };
-}
-
-export const AddMutation = {
-  fromJSON(object: any): AddMutation {
-    return {
-      actorDispatchers: isObject(object.actorDispatchers)
-        ? Object.entries(object.actorDispatchers).reduce<{ [key: number]: AddMutation_Dispatchers }>(
-          (acc, [key, value]) => {
-            acc[Number(key)] = AddMutation_Dispatchers.fromJSON(value);
-            return acc;
-          },
-          {},
-        )
-        : {},
-      actorSplits: isObject(object.actorSplits)
-        ? Object.entries(object.actorSplits).reduce<{ [key: number]: ConnectorSplits }>((acc, [key, value]) => {
-          acc[Number(key)] = ConnectorSplits.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: AddMutation): unknown {
-    const obj: any = {};
-    obj.actorDispatchers = {};
-    if (message.actorDispatchers) {
-      Object.entries(message.actorDispatchers).forEach(([k, v]) => {
-        obj.actorDispatchers[k] = AddMutation_Dispatchers.toJSON(v);
-      });
-    }
-    obj.actorSplits = {};
-    if (message.actorSplits) {
-      Object.entries(message.actorSplits).forEach(([k, v]) => {
-        obj.actorSplits[k] = ConnectorSplits.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddMutation>, I>>(object: I): AddMutation {
-    const message = createBaseAddMutation();
-    message.actorDispatchers = Object.entries(object.actorDispatchers ?? {}).reduce<
-      { [key: number]: AddMutation_Dispatchers }
-    >((acc, [key, value]) => {
-      if (value !== undefined) {
-        acc[Number(key)] = AddMutation_Dispatchers.fromPartial(value);
-      }
-      return acc;
-    }, {});
-    message.actorSplits = Object.entries(object.actorSplits ?? {}).reduce<{ [key: number]: ConnectorSplits }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = ConnectorSplits.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseAddMutation_Dispatchers(): AddMutation_Dispatchers {
-  return { dispatchers: [] };
-}
-
-export const AddMutation_Dispatchers = {
-  fromJSON(object: any): AddMutation_Dispatchers {
-    return {
-      dispatchers: Array.isArray(object?.dispatchers) ? object.dispatchers.map((e: any) => Dispatcher.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: AddMutation_Dispatchers): unknown {
-    const obj: any = {};
-    if (message.dispatchers) {
-      obj.dispatchers = message.dispatchers.map((e) => e ? Dispatcher.toJSON(e) : undefined);
-    } else {
-      obj.dispatchers = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddMutation_Dispatchers>, I>>(object: I): AddMutation_Dispatchers {
-    const message = createBaseAddMutation_Dispatchers();
-    message.dispatchers = object.dispatchers?.map((e) => Dispatcher.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseAddMutation_ActorDispatchersEntry(): AddMutation_ActorDispatchersEntry {
-  return { key: 0, value: undefined };
-}
-
-export const AddMutation_ActorDispatchersEntry = {
-  fromJSON(object: any): AddMutation_ActorDispatchersEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? AddMutation_Dispatchers.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: AddMutation_ActorDispatchersEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined &&
-      (obj.value = message.value ? AddMutation_Dispatchers.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddMutation_ActorDispatchersEntry>, I>>(
-    object: I,
-  ): AddMutation_ActorDispatchersEntry {
-    const message = createBaseAddMutation_ActorDispatchersEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? AddMutation_Dispatchers.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseAddMutation_ActorSplitsEntry(): AddMutation_ActorSplitsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const AddMutation_ActorSplitsEntry = {
-  fromJSON(object: any): AddMutation_ActorSplitsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? ConnectorSplits.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: AddMutation_ActorSplitsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? ConnectorSplits.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddMutation_ActorSplitsEntry>, I>>(object: I): AddMutation_ActorSplitsEntry {
-    const message = createBaseAddMutation_ActorSplitsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? ConnectorSplits.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseStopMutation(): StopMutation {
-  return { actors: [] };
-}
-
-export const StopMutation = {
-  fromJSON(object: any): StopMutation {
-    return { actors: Array.isArray(object?.actors) ? object.actors.map((e: any) => Number(e)) : [] };
-  },
-
-  toJSON(message: StopMutation): unknown {
-    const obj: any = {};
-    if (message.actors) {
-      obj.actors = message.actors.map((e) => Math.round(e));
-    } else {
-      obj.actors = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StopMutation>, I>>(object: I): StopMutation {
-    const message = createBaseStopMutation();
-    message.actors = object.actors?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseUpdateMutation(): UpdateMutation {
-  return { dispatcherUpdate: [], mergeUpdate: [], actorVnodeBitmapUpdate: {}, droppedActors: [], actorSplits: {} };
-}
-
-export const UpdateMutation = {
-  fromJSON(object: any): UpdateMutation {
-    return {
-      dispatcherUpdate: Array.isArray(object?.dispatcherUpdate)
-        ? object.dispatcherUpdate.map((e: any) => UpdateMutation_DispatcherUpdate.fromJSON(e))
-        : [],
-      mergeUpdate: Array.isArray(object?.mergeUpdate)
-        ? object.mergeUpdate.map((e: any) => UpdateMutation_MergeUpdate.fromJSON(e))
-        : [],
-      actorVnodeBitmapUpdate: isObject(object.actorVnodeBitmapUpdate)
-        ? Object.entries(object.actorVnodeBitmapUpdate).reduce<{ [key: number]: Buffer }>((acc, [key, value]) => {
-          acc[Number(key)] = Buffer.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-      droppedActors: Array.isArray(object?.droppedActors)
-        ? object.droppedActors.map((e: any) => Number(e))
-        : [],
-      actorSplits: isObject(object.actorSplits)
-        ? Object.entries(object.actorSplits).reduce<{ [key: number]: ConnectorSplits }>((acc, [key, value]) => {
-          acc[Number(key)] = ConnectorSplits.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: UpdateMutation): unknown {
-    const obj: any = {};
-    if (message.dispatcherUpdate) {
-      obj.dispatcherUpdate = message.dispatcherUpdate.map((e) =>
-        e ? UpdateMutation_DispatcherUpdate.toJSON(e) : undefined
-      );
-    } else {
-      obj.dispatcherUpdate = [];
-    }
-    if (message.mergeUpdate) {
-      obj.mergeUpdate = message.mergeUpdate.map((e) => e ? UpdateMutation_MergeUpdate.toJSON(e) : undefined);
-    } else {
-      obj.mergeUpdate = [];
-    }
-    obj.actorVnodeBitmapUpdate = {};
-    if (message.actorVnodeBitmapUpdate) {
-      Object.entries(message.actorVnodeBitmapUpdate).forEach(([k, v]) => {
-        obj.actorVnodeBitmapUpdate[k] = Buffer.toJSON(v);
-      });
-    }
-    if (message.droppedActors) {
-      obj.droppedActors = message.droppedActors.map((e) => Math.round(e));
-    } else {
-      obj.droppedActors = [];
-    }
-    obj.actorSplits = {};
-    if (message.actorSplits) {
-      Object.entries(message.actorSplits).forEach(([k, v]) => {
-        obj.actorSplits[k] = ConnectorSplits.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateMutation>, I>>(object: I): UpdateMutation {
-    const message = createBaseUpdateMutation();
-    message.dispatcherUpdate = object.dispatcherUpdate?.map((e) => UpdateMutation_DispatcherUpdate.fromPartial(e)) ||
-      [];
-    message.mergeUpdate = object.mergeUpdate?.map((e) => UpdateMutation_MergeUpdate.fromPartial(e)) || [];
-    message.actorVnodeBitmapUpdate = Object.entries(object.actorVnodeBitmapUpdate ?? {}).reduce<
-      { [key: number]: Buffer }
-    >((acc, [key, value]) => {
-      if (value !== undefined) {
-        acc[Number(key)] = Buffer.fromPartial(value);
-      }
-      return acc;
-    }, {});
-    message.droppedActors = object.droppedActors?.map((e) => e) || [];
-    message.actorSplits = Object.entries(object.actorSplits ?? {}).reduce<{ [key: number]: ConnectorSplits }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = ConnectorSplits.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseUpdateMutation_DispatcherUpdate(): UpdateMutation_DispatcherUpdate {
-  return {
-    actorId: 0,
-    dispatcherId: 0,
-    hashMapping: undefined,
-    addedDownstreamActorId: [],
-    removedDownstreamActorId: [],
-  };
-}
-
-export const UpdateMutation_DispatcherUpdate = {
-  fromJSON(object: any): UpdateMutation_DispatcherUpdate {
-    return {
-      actorId: isSet(object.actorId) ? Number(object.actorId) : 0,
-      dispatcherId: isSet(object.dispatcherId) ? Number(object.dispatcherId) : 0,
-      hashMapping: isSet(object.hashMapping) ? ActorMapping.fromJSON(object.hashMapping) : undefined,
-      addedDownstreamActorId: Array.isArray(object?.addedDownstreamActorId)
-        ? object.addedDownstreamActorId.map((e: any) => Number(e))
-        : [],
-      removedDownstreamActorId: Array.isArray(object?.removedDownstreamActorId)
-        ? object.removedDownstreamActorId.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: UpdateMutation_DispatcherUpdate): unknown {
-    const obj: any = {};
-    message.actorId !== undefined && (obj.actorId = Math.round(message.actorId));
-    message.dispatcherId !== undefined && (obj.dispatcherId = Math.round(message.dispatcherId));
-    message.hashMapping !== undefined &&
-      (obj.hashMapping = message.hashMapping ? ActorMapping.toJSON(message.hashMapping) : undefined);
-    if (message.addedDownstreamActorId) {
-      obj.addedDownstreamActorId = message.addedDownstreamActorId.map((e) => Math.round(e));
-    } else {
-      obj.addedDownstreamActorId = [];
-    }
-    if (message.removedDownstreamActorId) {
-      obj.removedDownstreamActorId = message.removedDownstreamActorId.map((e) => Math.round(e));
-    } else {
-      obj.removedDownstreamActorId = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateMutation_DispatcherUpdate>, I>>(
-    object: I,
-  ): UpdateMutation_DispatcherUpdate {
-    const message = createBaseUpdateMutation_DispatcherUpdate();
-    message.actorId = object.actorId ?? 0;
-    message.dispatcherId = object.dispatcherId ?? 0;
-    message.hashMapping = (object.hashMapping !== undefined && object.hashMapping !== null)
-      ? ActorMapping.fromPartial(object.hashMapping)
-      : undefined;
-    message.addedDownstreamActorId = object.addedDownstreamActorId?.map((e) => e) || [];
-    message.removedDownstreamActorId = object.removedDownstreamActorId?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseUpdateMutation_MergeUpdate(): UpdateMutation_MergeUpdate {
-  return {
-    actorId: 0,
-    upstreamFragmentId: 0,
-    newUpstreamFragmentId: undefined,
-    addedUpstreamActorId: [],
-    removedUpstreamActorId: [],
-  };
-}
-
-export const UpdateMutation_MergeUpdate = {
-  fromJSON(object: any): UpdateMutation_MergeUpdate {
-    return {
-      actorId: isSet(object.actorId) ? Number(object.actorId) : 0,
-      upstreamFragmentId: isSet(object.upstreamFragmentId) ? Number(object.upstreamFragmentId) : 0,
-      newUpstreamFragmentId: isSet(object.newUpstreamFragmentId) ? Number(object.newUpstreamFragmentId) : undefined,
-      addedUpstreamActorId: Array.isArray(object?.addedUpstreamActorId)
-        ? object.addedUpstreamActorId.map((e: any) => Number(e))
-        : [],
-      removedUpstreamActorId: Array.isArray(object?.removedUpstreamActorId)
-        ? object.removedUpstreamActorId.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: UpdateMutation_MergeUpdate): unknown {
-    const obj: any = {};
-    message.actorId !== undefined && (obj.actorId = Math.round(message.actorId));
-    message.upstreamFragmentId !== undefined && (obj.upstreamFragmentId = Math.round(message.upstreamFragmentId));
-    message.newUpstreamFragmentId !== undefined &&
-      (obj.newUpstreamFragmentId = Math.round(message.newUpstreamFragmentId));
-    if (message.addedUpstreamActorId) {
-      obj.addedUpstreamActorId = message.addedUpstreamActorId.map((e) => Math.round(e));
-    } else {
-      obj.addedUpstreamActorId = [];
-    }
-    if (message.removedUpstreamActorId) {
-      obj.removedUpstreamActorId = message.removedUpstreamActorId.map((e) => Math.round(e));
-    } else {
-      obj.removedUpstreamActorId = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateMutation_MergeUpdate>, I>>(object: I): UpdateMutation_MergeUpdate {
-    const message = createBaseUpdateMutation_MergeUpdate();
-    message.actorId = object.actorId ?? 0;
-    message.upstreamFragmentId = object.upstreamFragmentId ?? 0;
-    message.newUpstreamFragmentId = object.newUpstreamFragmentId ?? undefined;
-    message.addedUpstreamActorId = object.addedUpstreamActorId?.map((e) => e) || [];
-    message.removedUpstreamActorId = object.removedUpstreamActorId?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseUpdateMutation_ActorVnodeBitmapUpdateEntry(): UpdateMutation_ActorVnodeBitmapUpdateEntry {
-  return { key: 0, value: undefined };
-}
-
-export const UpdateMutation_ActorVnodeBitmapUpdateEntry = {
-  fromJSON(object: any): UpdateMutation_ActorVnodeBitmapUpdateEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? Buffer.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: UpdateMutation_ActorVnodeBitmapUpdateEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? Buffer.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateMutation_ActorVnodeBitmapUpdateEntry>, I>>(
-    object: I,
-  ): UpdateMutation_ActorVnodeBitmapUpdateEntry {
-    const message = createBaseUpdateMutation_ActorVnodeBitmapUpdateEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? Buffer.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseUpdateMutation_ActorSplitsEntry(): UpdateMutation_ActorSplitsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const UpdateMutation_ActorSplitsEntry = {
-  fromJSON(object: any): UpdateMutation_ActorSplitsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? ConnectorSplits.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: UpdateMutation_ActorSplitsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? ConnectorSplits.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateMutation_ActorSplitsEntry>, I>>(
-    object: I,
-  ): UpdateMutation_ActorSplitsEntry {
-    const message = createBaseUpdateMutation_ActorSplitsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? ConnectorSplits.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSourceChangeSplitMutation(): SourceChangeSplitMutation {
-  return { actorSplits: {} };
-}
-
-export const SourceChangeSplitMutation = {
-  fromJSON(object: any): SourceChangeSplitMutation {
-    return {
-      actorSplits: isObject(object.actorSplits)
-        ? Object.entries(object.actorSplits).reduce<{ [key: number]: ConnectorSplits }>((acc, [key, value]) => {
-          acc[Number(key)] = ConnectorSplits.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: SourceChangeSplitMutation): unknown {
-    const obj: any = {};
-    obj.actorSplits = {};
-    if (message.actorSplits) {
-      Object.entries(message.actorSplits).forEach(([k, v]) => {
-        obj.actorSplits[k] = ConnectorSplits.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SourceChangeSplitMutation>, I>>(object: I): SourceChangeSplitMutation {
-    const message = createBaseSourceChangeSplitMutation();
-    message.actorSplits = Object.entries(object.actorSplits ?? {}).reduce<{ [key: number]: ConnectorSplits }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = ConnectorSplits.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseSourceChangeSplitMutation_ActorSplitsEntry(): SourceChangeSplitMutation_ActorSplitsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const SourceChangeSplitMutation_ActorSplitsEntry = {
-  fromJSON(object: any): SourceChangeSplitMutation_ActorSplitsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? ConnectorSplits.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: SourceChangeSplitMutation_ActorSplitsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? ConnectorSplits.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SourceChangeSplitMutation_ActorSplitsEntry>, I>>(
-    object: I,
-  ): SourceChangeSplitMutation_ActorSplitsEntry {
-    const message = createBaseSourceChangeSplitMutation_ActorSplitsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? ConnectorSplits.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBasePauseMutation(): PauseMutation {
-  return {};
-}
-
-export const PauseMutation = {
-  fromJSON(_: any): PauseMutation {
-    return {};
-  },
-
-  toJSON(_: PauseMutation): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<PauseMutation>, I>>(_: I): PauseMutation {
-    const message = createBasePauseMutation();
-    return message;
-  },
-};
-
-function createBaseResumeMutation(): ResumeMutation {
-  return {};
-}
-
-export const ResumeMutation = {
-  fromJSON(_: any): ResumeMutation {
-    return {};
-  },
-
-  toJSON(_: ResumeMutation): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ResumeMutation>, I>>(_: I): ResumeMutation {
-    const message = createBaseResumeMutation();
-    return message;
-  },
-};
-
-function createBaseBarrier(): Barrier {
-  return { epoch: undefined, mutation: undefined, span: new Uint8Array(), checkpoint: false, passedActors: [] };
-}
-
-export const Barrier = {
-  fromJSON(object: any): Barrier {
-    return {
-      epoch: isSet(object.epoch) ? Epoch.fromJSON(object.epoch) : undefined,
-      mutation: isSet(object.add)
-        ? { $case: "add", add: AddMutation.fromJSON(object.add) }
-        : isSet(object.stop)
-        ? { $case: "stop", stop: StopMutation.fromJSON(object.stop) }
-        : isSet(object.update)
-        ? { $case: "update", update: UpdateMutation.fromJSON(object.update) }
-        : isSet(object.splits)
-        ? { $case: "splits", splits: SourceChangeSplitMutation.fromJSON(object.splits) }
-        : isSet(object.pause)
-        ? { $case: "pause", pause: PauseMutation.fromJSON(object.pause) }
-        : isSet(object.resume)
-        ? { $case: "resume", resume: ResumeMutation.fromJSON(object.resume) }
-        : undefined,
-      span: isSet(object.span) ? bytesFromBase64(object.span) : new Uint8Array(),
-      checkpoint: isSet(object.checkpoint) ? Boolean(object.checkpoint) : false,
-      passedActors: Array.isArray(object?.passedActors)
-        ? object.passedActors.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: Barrier): unknown {
-    const obj: any = {};
-    message.epoch !== undefined && (obj.epoch = message.epoch ? Epoch.toJSON(message.epoch) : undefined);
-    message.mutation?.$case === "add" &&
-      (obj.add = message.mutation?.add ? AddMutation.toJSON(message.mutation?.add) : undefined);
-    message.mutation?.$case === "stop" &&
-      (obj.stop = message.mutation?.stop ? StopMutation.toJSON(message.mutation?.stop) : undefined);
-    message.mutation?.$case === "update" &&
-      (obj.update = message.mutation?.update ? UpdateMutation.toJSON(message.mutation?.update) : undefined);
-    message.mutation?.$case === "splits" &&
-      (obj.splits = message.mutation?.splits ? SourceChangeSplitMutation.toJSON(message.mutation?.splits) : undefined);
-    message.mutation?.$case === "pause" &&
-      (obj.pause = message.mutation?.pause ? PauseMutation.toJSON(message.mutation?.pause) : undefined);
-    message.mutation?.$case === "resume" &&
-      (obj.resume = message.mutation?.resume ? ResumeMutation.toJSON(message.mutation?.resume) : undefined);
-    message.span !== undefined &&
-      (obj.span = base64FromBytes(message.span !== undefined ? message.span : new Uint8Array()));
-    message.checkpoint !== undefined && (obj.checkpoint = message.checkpoint);
-    if (message.passedActors) {
-      obj.passedActors = message.passedActors.map((e) => Math.round(e));
-    } else {
-      obj.passedActors = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Barrier>, I>>(object: I): Barrier {
-    const message = createBaseBarrier();
-    message.epoch = (object.epoch !== undefined && object.epoch !== null) ? Epoch.fromPartial(object.epoch) : undefined;
-    if (object.mutation?.$case === "add" && object.mutation?.add !== undefined && object.mutation?.add !== null) {
-      message.mutation = { $case: "add", add: AddMutation.fromPartial(object.mutation.add) };
-    }
-    if (object.mutation?.$case === "stop" && object.mutation?.stop !== undefined && object.mutation?.stop !== null) {
-      message.mutation = { $case: "stop", stop: StopMutation.fromPartial(object.mutation.stop) };
-    }
-    if (
-      object.mutation?.$case === "update" && object.mutation?.update !== undefined && object.mutation?.update !== null
-    ) {
-      message.mutation = { $case: "update", update: UpdateMutation.fromPartial(object.mutation.update) };
-    }
-    if (
-      object.mutation?.$case === "splits" && object.mutation?.splits !== undefined && object.mutation?.splits !== null
-    ) {
-      message.mutation = { $case: "splits", splits: SourceChangeSplitMutation.fromPartial(object.mutation.splits) };
-    }
-    if (object.mutation?.$case === "pause" && object.mutation?.pause !== undefined && object.mutation?.pause !== null) {
-      message.mutation = { $case: "pause", pause: PauseMutation.fromPartial(object.mutation.pause) };
-    }
-    if (
-      object.mutation?.$case === "resume" && object.mutation?.resume !== undefined && object.mutation?.resume !== null
-    ) {
-      message.mutation = { $case: "resume", resume: ResumeMutation.fromPartial(object.mutation.resume) };
-    }
-    message.span = object.span ?? new Uint8Array();
-    message.checkpoint = object.checkpoint ?? false;
-    message.passedActors = object.passedActors?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseWatermark(): Watermark {
-  return { column: undefined, val: undefined };
-}
-
-export const Watermark = {
-  fromJSON(object: any): Watermark {
-    return {
-      column: isSet(object.column) ? InputRef.fromJSON(object.column) : undefined,
-      val: isSet(object.val) ? Datum.fromJSON(object.val) : undefined,
-    };
-  },
-
-  toJSON(message: Watermark): unknown {
-    const obj: any = {};
-    message.column !== undefined && (obj.column = message.column ? InputRef.toJSON(message.column) : undefined);
-    message.val !== undefined && (obj.val = message.val ? Datum.toJSON(message.val) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Watermark>, I>>(object: I): Watermark {
-    const message = createBaseWatermark();
-    message.column = (object.column !== undefined && object.column !== null)
-      ? InputRef.fromPartial(object.column)
-      : undefined;
-    message.val = (object.val !== undefined && object.val !== null) ? Datum.fromPartial(object.val) : undefined;
-    return message;
-  },
-};
-
-function createBaseStreamMessage(): StreamMessage {
-  return { streamMessage: undefined };
-}
-
-export const StreamMessage = {
-  fromJSON(object: any): StreamMessage {
-    return {
-      streamMessage: isSet(object.streamChunk)
-        ? { $case: "streamChunk", streamChunk: StreamChunk.fromJSON(object.streamChunk) }
-        : isSet(object.barrier)
-        ? { $case: "barrier", barrier: Barrier.fromJSON(object.barrier) }
-        : isSet(object.watermark)
-        ? { $case: "watermark", watermark: Watermark.fromJSON(object.watermark) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: StreamMessage): unknown {
-    const obj: any = {};
-    message.streamMessage?.$case === "streamChunk" && (obj.streamChunk = message.streamMessage?.streamChunk
-      ? StreamChunk.toJSON(message.streamMessage?.streamChunk)
-      : undefined);
-    message.streamMessage?.$case === "barrier" &&
-      (obj.barrier = message.streamMessage?.barrier ? Barrier.toJSON(message.streamMessage?.barrier) : undefined);
-    message.streamMessage?.$case === "watermark" &&
-      (obj.watermark = message.streamMessage?.watermark
-        ? Watermark.toJSON(message.streamMessage?.watermark)
-        : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamMessage>, I>>(object: I): StreamMessage {
-    const message = createBaseStreamMessage();
-    if (
-      object.streamMessage?.$case === "streamChunk" &&
-      object.streamMessage?.streamChunk !== undefined &&
-      object.streamMessage?.streamChunk !== null
-    ) {
-      message.streamMessage = {
-        $case: "streamChunk",
-        streamChunk: StreamChunk.fromPartial(object.streamMessage.streamChunk),
-      };
-    }
-    if (
-      object.streamMessage?.$case === "barrier" &&
-      object.streamMessage?.barrier !== undefined &&
-      object.streamMessage?.barrier !== null
-    ) {
-      message.streamMessage = { $case: "barrier", barrier: Barrier.fromPartial(object.streamMessage.barrier) };
-    }
-    if (
-      object.streamMessage?.$case === "watermark" &&
-      object.streamMessage?.watermark !== undefined &&
-      object.streamMessage?.watermark !== null
-    ) {
-      message.streamMessage = { $case: "watermark", watermark: Watermark.fromPartial(object.streamMessage.watermark) };
-    }
-    return message;
-  },
-};
-
-function createBaseActorMapping(): ActorMapping {
-  return { originalIndices: [], data: [] };
-}
-
-export const ActorMapping = {
-  fromJSON(object: any): ActorMapping {
-    return {
-      originalIndices: Array.isArray(object?.originalIndices) ? object.originalIndices.map((e: any) => Number(e)) : [],
-      data: Array.isArray(object?.data) ? object.data.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: ActorMapping): unknown {
-    const obj: any = {};
-    if (message.originalIndices) {
-      obj.originalIndices = message.originalIndices.map((e) => Math.round(e));
-    } else {
-      obj.originalIndices = [];
-    }
-    if (message.data) {
-      obj.data = message.data.map((e) => Math.round(e));
-    } else {
-      obj.data = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ActorMapping>, I>>(object: I): ActorMapping {
-    const message = createBaseActorMapping();
-    message.originalIndices = object.originalIndices?.map((e) => e) || [];
-    message.data = object.data?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseStreamSource(): StreamSource {
-  return {
-    sourceId: 0,
-    stateTable: undefined,
-    rowIdIndex: undefined,
-    columns: [],
-    pkColumnIds: [],
-    properties: {},
-    info: undefined,
-    sourceName: "",
-  };
-}
-
-export const StreamSource = {
-  fromJSON(object: any): StreamSource {
-    return {
-      sourceId: isSet(object.sourceId) ? Number(object.sourceId) : 0,
-      stateTable: isSet(object.stateTable) ? Table.fromJSON(object.stateTable) : undefined,
-      rowIdIndex: isSet(object.rowIdIndex) ? Number(object.rowIdIndex) : undefined,
-      columns: Array.isArray(object?.columns) ? object.columns.map((e: any) => ColumnCatalog.fromJSON(e)) : [],
-      pkColumnIds: Array.isArray(object?.pkColumnIds) ? object.pkColumnIds.map((e: any) => Number(e)) : [],
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-      info: isSet(object.info) ? StreamSourceInfo.fromJSON(object.info) : undefined,
-      sourceName: isSet(object.sourceName) ? String(object.sourceName) : "",
-    };
-  },
-
-  toJSON(message: StreamSource): unknown {
-    const obj: any = {};
-    message.sourceId !== undefined && (obj.sourceId = Math.round(message.sourceId));
-    message.stateTable !== undefined &&
-      (obj.stateTable = message.stateTable ? Table.toJSON(message.stateTable) : undefined);
-    message.rowIdIndex !== undefined && (obj.rowIdIndex = Math.round(message.rowIdIndex));
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? ColumnCatalog.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    if (message.pkColumnIds) {
-      obj.pkColumnIds = message.pkColumnIds.map((e) => Math.round(e));
-    } else {
-      obj.pkColumnIds = [];
-    }
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    message.info !== undefined && (obj.info = message.info ? StreamSourceInfo.toJSON(message.info) : undefined);
-    message.sourceName !== undefined && (obj.sourceName = message.sourceName);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamSource>, I>>(object: I): StreamSource {
-    const message = createBaseStreamSource();
-    message.sourceId = object.sourceId ?? 0;
-    message.stateTable = (object.stateTable !== undefined && object.stateTable !== null)
-      ? Table.fromPartial(object.stateTable)
-      : undefined;
-    message.rowIdIndex = object.rowIdIndex ?? undefined;
-    message.columns = object.columns?.map((e) => ColumnCatalog.fromPartial(e)) || [];
-    message.pkColumnIds = object.pkColumnIds?.map((e) => e) || [];
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.info = (object.info !== undefined && object.info !== null)
-      ? StreamSourceInfo.fromPartial(object.info)
-      : undefined;
-    message.sourceName = object.sourceName ?? "";
-    return message;
-  },
-};
-
-function createBaseStreamSource_PropertiesEntry(): StreamSource_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const StreamSource_PropertiesEntry = {
-  fromJSON(object: any): StreamSource_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: StreamSource_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamSource_PropertiesEntry>, I>>(object: I): StreamSource_PropertiesEntry {
-    const message = createBaseStreamSource_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseBarrierRecvNode(): BarrierRecvNode {
-  return {};
-}
-
-export const BarrierRecvNode = {
-  fromJSON(_: any): BarrierRecvNode {
-    return {};
-  },
-
-  toJSON(_: BarrierRecvNode): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BarrierRecvNode>, I>>(_: I): BarrierRecvNode {
-    const message = createBaseBarrierRecvNode();
-    return message;
-  },
-};
-
-function createBaseSourceNode(): SourceNode {
-  return { sourceInner: undefined };
-}
-
-export const SourceNode = {
-  fromJSON(object: any): SourceNode {
-    return { sourceInner: isSet(object.sourceInner) ? StreamSource.fromJSON(object.sourceInner) : undefined };
-  },
-
-  toJSON(message: SourceNode): unknown {
-    const obj: any = {};
-    message.sourceInner !== undefined &&
-      (obj.sourceInner = message.sourceInner ? StreamSource.toJSON(message.sourceInner) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SourceNode>, I>>(object: I): SourceNode {
-    const message = createBaseSourceNode();
-    message.sourceInner = (object.sourceInner !== undefined && object.sourceInner !== null)
-      ? StreamSource.fromPartial(object.sourceInner)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseSinkDesc(): SinkDesc {
-  return {
-    id: 0,
-    name: "",
-    definition: "",
-    columns: [],
-    pk: [],
-    streamKey: [],
-    distributionKey: [],
-    properties: {},
-    sinkType: SinkType.UNSPECIFIED,
-  };
-}
-
-export const SinkDesc = {
-  fromJSON(object: any): SinkDesc {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      definition: isSet(object.definition) ? String(object.definition) : "",
-      columns: Array.isArray(object?.columns)
-        ? object.columns.map((e: any) => ColumnDesc.fromJSON(e))
-        : [],
-      pk: Array.isArray(object?.pk) ? object.pk.map((e: any) => ColumnOrder.fromJSON(e)) : [],
-      streamKey: Array.isArray(object?.streamKey) ? object.streamKey.map((e: any) => Number(e)) : [],
-      distributionKey: Array.isArray(object?.distributionKey) ? object.distributionKey.map((e: any) => Number(e)) : [],
-      properties: isObject(object.properties)
-        ? Object.entries(object.properties).reduce<{ [key: string]: string }>((acc, [key, value]) => {
-          acc[key] = String(value);
-          return acc;
-        }, {})
-        : {},
-      sinkType: isSet(object.sinkType) ? sinkTypeFromJSON(object.sinkType) : SinkType.UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: SinkDesc): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.name !== undefined && (obj.name = message.name);
-    message.definition !== undefined && (obj.definition = message.definition);
-    if (message.columns) {
-      obj.columns = message.columns.map((e) => e ? ColumnDesc.toJSON(e) : undefined);
-    } else {
-      obj.columns = [];
-    }
-    if (message.pk) {
-      obj.pk = message.pk.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.pk = [];
-    }
-    if (message.streamKey) {
-      obj.streamKey = message.streamKey.map((e) => Math.round(e));
-    } else {
-      obj.streamKey = [];
-    }
-    if (message.distributionKey) {
-      obj.distributionKey = message.distributionKey.map((e) => Math.round(e));
-    } else {
-      obj.distributionKey = [];
-    }
-    obj.properties = {};
-    if (message.properties) {
-      Object.entries(message.properties).forEach(([k, v]) => {
-        obj.properties[k] = v;
-      });
-    }
-    message.sinkType !== undefined && (obj.sinkType = sinkTypeToJSON(message.sinkType));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkDesc>, I>>(object: I): SinkDesc {
-    const message = createBaseSinkDesc();
-    message.id = object.id ?? 0;
-    message.name = object.name ?? "";
-    message.definition = object.definition ?? "";
-    message.columns = object.columns?.map((e) => ColumnDesc.fromPartial(e)) || [];
-    message.pk = object.pk?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.streamKey = object.streamKey?.map((e) => e) || [];
-    message.distributionKey = object.distributionKey?.map((e) => e) || [];
-    message.properties = Object.entries(object.properties ?? {}).reduce<{ [key: string]: string }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = String(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.sinkType = object.sinkType ?? SinkType.UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseSinkDesc_PropertiesEntry(): SinkDesc_PropertiesEntry {
-  return { key: "", value: "" };
-}
-
-export const SinkDesc_PropertiesEntry = {
-  fromJSON(object: any): SinkDesc_PropertiesEntry {
-    return { key: isSet(object.key) ? String(object.key) : "", value: isSet(object.value) ? String(object.value) : "" };
-  },
-
-  toJSON(message: SinkDesc_PropertiesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkDesc_PropertiesEntry>, I>>(object: I): SinkDesc_PropertiesEntry {
-    const message = createBaseSinkDesc_PropertiesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? "";
-    return message;
-  },
-};
-
-function createBaseSinkNode(): SinkNode {
-  return { sinkDesc: undefined };
-}
-
-export const SinkNode = {
-  fromJSON(object: any): SinkNode {
-    return { sinkDesc: isSet(object.sinkDesc) ? SinkDesc.fromJSON(object.sinkDesc) : undefined };
-  },
-
-  toJSON(message: SinkNode): unknown {
-    const obj: any = {};
-    message.sinkDesc !== undefined && (obj.sinkDesc = message.sinkDesc ? SinkDesc.toJSON(message.sinkDesc) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SinkNode>, I>>(object: I): SinkNode {
-    const message = createBaseSinkNode();
-    message.sinkDesc = (object.sinkDesc !== undefined && object.sinkDesc !== null)
-      ? SinkDesc.fromPartial(object.sinkDesc)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseProjectNode(): ProjectNode {
-  return { selectList: [], watermarkInputKey: [], watermarkOutputKey: [] };
-}
-
-export const ProjectNode = {
-  fromJSON(object: any): ProjectNode {
-    return {
-      selectList: Array.isArray(object?.selectList) ? object.selectList.map((e: any) => ExprNode.fromJSON(e)) : [],
-      watermarkInputKey: Array.isArray(object?.watermarkInputKey)
-        ? object.watermarkInputKey.map((e: any) => Number(e))
-        : [],
-      watermarkOutputKey: Array.isArray(object?.watermarkOutputKey)
-        ? object.watermarkOutputKey.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: ProjectNode): unknown {
-    const obj: any = {};
-    if (message.selectList) {
-      obj.selectList = message.selectList.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.selectList = [];
-    }
-    if (message.watermarkInputKey) {
-      obj.watermarkInputKey = message.watermarkInputKey.map((e) => Math.round(e));
-    } else {
-      obj.watermarkInputKey = [];
-    }
-    if (message.watermarkOutputKey) {
-      obj.watermarkOutputKey = message.watermarkOutputKey.map((e) => Math.round(e));
-    } else {
-      obj.watermarkOutputKey = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ProjectNode>, I>>(object: I): ProjectNode {
-    const message = createBaseProjectNode();
-    message.selectList = object.selectList?.map((e) => ExprNode.fromPartial(e)) || [];
-    message.watermarkInputKey = object.watermarkInputKey?.map((e) => e) || [];
-    message.watermarkOutputKey = object.watermarkOutputKey?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseFilterNode(): FilterNode {
-  return { searchCondition: undefined };
-}
-
-export const FilterNode = {
-  fromJSON(object: any): FilterNode {
-    return { searchCondition: isSet(object.searchCondition) ? ExprNode.fromJSON(object.searchCondition) : undefined };
-  },
-
-  toJSON(message: FilterNode): unknown {
-    const obj: any = {};
-    message.searchCondition !== undefined &&
-      (obj.searchCondition = message.searchCondition ? ExprNode.toJSON(message.searchCondition) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<FilterNode>, I>>(object: I): FilterNode {
-    const message = createBaseFilterNode();
-    message.searchCondition = (object.searchCondition !== undefined && object.searchCondition !== null)
-      ? ExprNode.fromPartial(object.searchCondition)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseMaterializeNode(): MaterializeNode {
-  return {
-    tableId: 0,
-    columnOrders: [],
-    table: undefined,
-    handlePkConflictBehavior: HandleConflictBehavior.NO_CHECK_UNSPECIFIED,
-  };
-}
-
-export const MaterializeNode = {
-  fromJSON(object: any): MaterializeNode {
-    return {
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      columnOrders: Array.isArray(object?.columnOrders)
-        ? object.columnOrders.map((e: any) => ColumnOrder.fromJSON(e))
-        : [],
-      table: isSet(object.table) ? Table.fromJSON(object.table) : undefined,
-      handlePkConflictBehavior: isSet(object.handlePkConflictBehavior)
-        ? handleConflictBehaviorFromJSON(object.handlePkConflictBehavior)
-        : HandleConflictBehavior.NO_CHECK_UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: MaterializeNode): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    if (message.columnOrders) {
-      obj.columnOrders = message.columnOrders.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.columnOrders = [];
-    }
-    message.table !== undefined && (obj.table = message.table ? Table.toJSON(message.table) : undefined);
-    message.handlePkConflictBehavior !== undefined &&
-      (obj.handlePkConflictBehavior = handleConflictBehaviorToJSON(message.handlePkConflictBehavior));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MaterializeNode>, I>>(object: I): MaterializeNode {
-    const message = createBaseMaterializeNode();
-    message.tableId = object.tableId ?? 0;
-    message.columnOrders = object.columnOrders?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.table = (object.table !== undefined && object.table !== null) ? Table.fromPartial(object.table) : undefined;
-    message.handlePkConflictBehavior = object.handlePkConflictBehavior ?? HandleConflictBehavior.NO_CHECK_UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseAggCallState(): AggCallState {
-  return { inner: undefined };
-}
-
-export const AggCallState = {
-  fromJSON(object: any): AggCallState {
-    return {
-      inner: isSet(object.resultValueState)
-        ? {
-          $case: "resultValueState",
-          resultValueState: AggCallState_ResultValueState.fromJSON(object.resultValueState),
-        }
-        : isSet(object.tableState)
-        ? { $case: "tableState", tableState: AggCallState_TableState.fromJSON(object.tableState) }
-        : isSet(object.materializedInputState)
-        ? {
-          $case: "materializedInputState",
-          materializedInputState: AggCallState_MaterializedInputState.fromJSON(object.materializedInputState),
-        }
-        : undefined,
-    };
-  },
-
-  toJSON(message: AggCallState): unknown {
-    const obj: any = {};
-    message.inner?.$case === "resultValueState" && (obj.resultValueState = message.inner?.resultValueState
-      ? AggCallState_ResultValueState.toJSON(message.inner?.resultValueState)
-      : undefined);
-    message.inner?.$case === "tableState" && (obj.tableState = message.inner?.tableState
-      ? AggCallState_TableState.toJSON(message.inner?.tableState)
-      : undefined);
-    message.inner?.$case === "materializedInputState" &&
-      (obj.materializedInputState = message.inner?.materializedInputState
-        ? AggCallState_MaterializedInputState.toJSON(message.inner?.materializedInputState)
-        : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AggCallState>, I>>(object: I): AggCallState {
-    const message = createBaseAggCallState();
-    if (
-      object.inner?.$case === "resultValueState" &&
-      object.inner?.resultValueState !== undefined &&
-      object.inner?.resultValueState !== null
-    ) {
-      message.inner = {
-        $case: "resultValueState",
-        resultValueState: AggCallState_ResultValueState.fromPartial(object.inner.resultValueState),
-      };
-    }
-    if (
-      object.inner?.$case === "tableState" &&
-      object.inner?.tableState !== undefined &&
-      object.inner?.tableState !== null
-    ) {
-      message.inner = { $case: "tableState", tableState: AggCallState_TableState.fromPartial(object.inner.tableState) };
-    }
-    if (
-      object.inner?.$case === "materializedInputState" &&
-      object.inner?.materializedInputState !== undefined &&
-      object.inner?.materializedInputState !== null
-    ) {
-      message.inner = {
-        $case: "materializedInputState",
-        materializedInputState: AggCallState_MaterializedInputState.fromPartial(object.inner.materializedInputState),
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseAggCallState_ResultValueState(): AggCallState_ResultValueState {
-  return {};
-}
-
-export const AggCallState_ResultValueState = {
-  fromJSON(_: any): AggCallState_ResultValueState {
-    return {};
-  },
-
-  toJSON(_: AggCallState_ResultValueState): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AggCallState_ResultValueState>, I>>(_: I): AggCallState_ResultValueState {
-    const message = createBaseAggCallState_ResultValueState();
-    return message;
-  },
-};
-
-function createBaseAggCallState_TableState(): AggCallState_TableState {
-  return { table: undefined };
-}
-
-export const AggCallState_TableState = {
-  fromJSON(object: any): AggCallState_TableState {
-    return { table: isSet(object.table) ? Table.fromJSON(object.table) : undefined };
-  },
-
-  toJSON(message: AggCallState_TableState): unknown {
-    const obj: any = {};
-    message.table !== undefined && (obj.table = message.table ? Table.toJSON(message.table) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AggCallState_TableState>, I>>(object: I): AggCallState_TableState {
-    const message = createBaseAggCallState_TableState();
-    message.table = (object.table !== undefined && object.table !== null) ? Table.fromPartial(object.table) : undefined;
-    return message;
-  },
-};
-
-function createBaseAggCallState_MaterializedInputState(): AggCallState_MaterializedInputState {
-  return { table: undefined, includedUpstreamIndices: [], tableValueIndices: [] };
-}
-
-export const AggCallState_MaterializedInputState = {
-  fromJSON(object: any): AggCallState_MaterializedInputState {
-    return {
-      table: isSet(object.table) ? Table.fromJSON(object.table) : undefined,
-      includedUpstreamIndices: Array.isArray(object?.includedUpstreamIndices)
-        ? object.includedUpstreamIndices.map((e: any) => Number(e))
-        : [],
-      tableValueIndices: Array.isArray(object?.tableValueIndices)
-        ? object.tableValueIndices.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: AggCallState_MaterializedInputState): unknown {
-    const obj: any = {};
-    message.table !== undefined && (obj.table = message.table ? Table.toJSON(message.table) : undefined);
-    if (message.includedUpstreamIndices) {
-      obj.includedUpstreamIndices = message.includedUpstreamIndices.map((e) => Math.round(e));
-    } else {
-      obj.includedUpstreamIndices = [];
-    }
-    if (message.tableValueIndices) {
-      obj.tableValueIndices = message.tableValueIndices.map((e) => Math.round(e));
-    } else {
-      obj.tableValueIndices = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AggCallState_MaterializedInputState>, I>>(
-    object: I,
-  ): AggCallState_MaterializedInputState {
-    const message = createBaseAggCallState_MaterializedInputState();
-    message.table = (object.table !== undefined && object.table !== null) ? Table.fromPartial(object.table) : undefined;
-    message.includedUpstreamIndices = object.includedUpstreamIndices?.map((e) => e) || [];
-    message.tableValueIndices = object.tableValueIndices?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseSimpleAggNode(): SimpleAggNode {
-  return {
-    aggCalls: [],
-    distributionKey: [],
-    aggCallStates: [],
-    resultTable: undefined,
-    isAppendOnly: false,
-    distinctDedupTables: {},
-    rowCountIndex: 0,
-  };
-}
-
-export const SimpleAggNode = {
-  fromJSON(object: any): SimpleAggNode {
-    return {
-      aggCalls: Array.isArray(object?.aggCalls) ? object.aggCalls.map((e: any) => AggCall.fromJSON(e)) : [],
-      distributionKey: Array.isArray(object?.distributionKey) ? object.distributionKey.map((e: any) => Number(e)) : [],
-      aggCallStates: Array.isArray(object?.aggCallStates)
-        ? object.aggCallStates.map((e: any) => AggCallState.fromJSON(e))
-        : [],
-      resultTable: isSet(object.resultTable) ? Table.fromJSON(object.resultTable) : undefined,
-      isAppendOnly: isSet(object.isAppendOnly) ? Boolean(object.isAppendOnly) : false,
-      distinctDedupTables: isObject(object.distinctDedupTables)
-        ? Object.entries(object.distinctDedupTables).reduce<{ [key: number]: Table }>((acc, [key, value]) => {
-          acc[Number(key)] = Table.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-      rowCountIndex: isSet(object.rowCountIndex) ? Number(object.rowCountIndex) : 0,
-    };
-  },
-
-  toJSON(message: SimpleAggNode): unknown {
-    const obj: any = {};
-    if (message.aggCalls) {
-      obj.aggCalls = message.aggCalls.map((e) => e ? AggCall.toJSON(e) : undefined);
-    } else {
-      obj.aggCalls = [];
-    }
-    if (message.distributionKey) {
-      obj.distributionKey = message.distributionKey.map((e) => Math.round(e));
-    } else {
-      obj.distributionKey = [];
-    }
-    if (message.aggCallStates) {
-      obj.aggCallStates = message.aggCallStates.map((e) => e ? AggCallState.toJSON(e) : undefined);
-    } else {
-      obj.aggCallStates = [];
-    }
-    message.resultTable !== undefined &&
-      (obj.resultTable = message.resultTable ? Table.toJSON(message.resultTable) : undefined);
-    message.isAppendOnly !== undefined && (obj.isAppendOnly = message.isAppendOnly);
-    obj.distinctDedupTables = {};
-    if (message.distinctDedupTables) {
-      Object.entries(message.distinctDedupTables).forEach(([k, v]) => {
-        obj.distinctDedupTables[k] = Table.toJSON(v);
-      });
-    }
-    message.rowCountIndex !== undefined && (obj.rowCountIndex = Math.round(message.rowCountIndex));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SimpleAggNode>, I>>(object: I): SimpleAggNode {
-    const message = createBaseSimpleAggNode();
-    message.aggCalls = object.aggCalls?.map((e) => AggCall.fromPartial(e)) || [];
-    message.distributionKey = object.distributionKey?.map((e) => e) || [];
-    message.aggCallStates = object.aggCallStates?.map((e) => AggCallState.fromPartial(e)) || [];
-    message.resultTable = (object.resultTable !== undefined && object.resultTable !== null)
-      ? Table.fromPartial(object.resultTable)
-      : undefined;
-    message.isAppendOnly = object.isAppendOnly ?? false;
-    message.distinctDedupTables = Object.entries(object.distinctDedupTables ?? {}).reduce<{ [key: number]: Table }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = Table.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.rowCountIndex = object.rowCountIndex ?? 0;
-    return message;
-  },
-};
-
-function createBaseSimpleAggNode_DistinctDedupTablesEntry(): SimpleAggNode_DistinctDedupTablesEntry {
-  return { key: 0, value: undefined };
-}
-
-export const SimpleAggNode_DistinctDedupTablesEntry = {
-  fromJSON(object: any): SimpleAggNode_DistinctDedupTablesEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? Table.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: SimpleAggNode_DistinctDedupTablesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? Table.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SimpleAggNode_DistinctDedupTablesEntry>, I>>(
-    object: I,
-  ): SimpleAggNode_DistinctDedupTablesEntry {
-    const message = createBaseSimpleAggNode_DistinctDedupTablesEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null) ? Table.fromPartial(object.value) : undefined;
-    return message;
-  },
-};
-
-function createBaseHashAggNode(): HashAggNode {
-  return {
-    groupKey: [],
-    aggCalls: [],
-    aggCallStates: [],
-    resultTable: undefined,
-    isAppendOnly: false,
-    distinctDedupTables: {},
-    rowCountIndex: 0,
-  };
-}
-
-export const HashAggNode = {
-  fromJSON(object: any): HashAggNode {
-    return {
-      groupKey: Array.isArray(object?.groupKey) ? object.groupKey.map((e: any) => Number(e)) : [],
-      aggCalls: Array.isArray(object?.aggCalls) ? object.aggCalls.map((e: any) => AggCall.fromJSON(e)) : [],
-      aggCallStates: Array.isArray(object?.aggCallStates)
-        ? object.aggCallStates.map((e: any) => AggCallState.fromJSON(e))
-        : [],
-      resultTable: isSet(object.resultTable) ? Table.fromJSON(object.resultTable) : undefined,
-      isAppendOnly: isSet(object.isAppendOnly) ? Boolean(object.isAppendOnly) : false,
-      distinctDedupTables: isObject(object.distinctDedupTables)
-        ? Object.entries(object.distinctDedupTables).reduce<{ [key: number]: Table }>((acc, [key, value]) => {
-          acc[Number(key)] = Table.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-      rowCountIndex: isSet(object.rowCountIndex) ? Number(object.rowCountIndex) : 0,
-    };
-  },
-
-  toJSON(message: HashAggNode): unknown {
-    const obj: any = {};
-    if (message.groupKey) {
-      obj.groupKey = message.groupKey.map((e) => Math.round(e));
-    } else {
-      obj.groupKey = [];
-    }
-    if (message.aggCalls) {
-      obj.aggCalls = message.aggCalls.map((e) => e ? AggCall.toJSON(e) : undefined);
-    } else {
-      obj.aggCalls = [];
-    }
-    if (message.aggCallStates) {
-      obj.aggCallStates = message.aggCallStates.map((e) => e ? AggCallState.toJSON(e) : undefined);
-    } else {
-      obj.aggCallStates = [];
-    }
-    message.resultTable !== undefined &&
-      (obj.resultTable = message.resultTable ? Table.toJSON(message.resultTable) : undefined);
-    message.isAppendOnly !== undefined && (obj.isAppendOnly = message.isAppendOnly);
-    obj.distinctDedupTables = {};
-    if (message.distinctDedupTables) {
-      Object.entries(message.distinctDedupTables).forEach(([k, v]) => {
-        obj.distinctDedupTables[k] = Table.toJSON(v);
-      });
-    }
-    message.rowCountIndex !== undefined && (obj.rowCountIndex = Math.round(message.rowCountIndex));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HashAggNode>, I>>(object: I): HashAggNode {
-    const message = createBaseHashAggNode();
-    message.groupKey = object.groupKey?.map((e) => e) || [];
-    message.aggCalls = object.aggCalls?.map((e) => AggCall.fromPartial(e)) || [];
-    message.aggCallStates = object.aggCallStates?.map((e) => AggCallState.fromPartial(e)) || [];
-    message.resultTable = (object.resultTable !== undefined && object.resultTable !== null)
-      ? Table.fromPartial(object.resultTable)
-      : undefined;
-    message.isAppendOnly = object.isAppendOnly ?? false;
-    message.distinctDedupTables = Object.entries(object.distinctDedupTables ?? {}).reduce<{ [key: number]: Table }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = Table.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    message.rowCountIndex = object.rowCountIndex ?? 0;
-    return message;
-  },
-};
-
-function createBaseHashAggNode_DistinctDedupTablesEntry(): HashAggNode_DistinctDedupTablesEntry {
-  return { key: 0, value: undefined };
-}
-
-export const HashAggNode_DistinctDedupTablesEntry = {
-  fromJSON(object: any): HashAggNode_DistinctDedupTablesEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? Table.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: HashAggNode_DistinctDedupTablesEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? Table.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HashAggNode_DistinctDedupTablesEntry>, I>>(
-    object: I,
-  ): HashAggNode_DistinctDedupTablesEntry {
-    const message = createBaseHashAggNode_DistinctDedupTablesEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null) ? Table.fromPartial(object.value) : undefined;
-    return message;
-  },
-};
-
-function createBaseTopNNode(): TopNNode {
-  return { limit: 0, offset: 0, table: undefined, orderBy: [], withTies: false };
-}
-
-export const TopNNode = {
-  fromJSON(object: any): TopNNode {
-    return {
-      limit: isSet(object.limit) ? Number(object.limit) : 0,
-      offset: isSet(object.offset) ? Number(object.offset) : 0,
-      table: isSet(object.table) ? Table.fromJSON(object.table) : undefined,
-      orderBy: Array.isArray(object?.orderBy) ? object.orderBy.map((e: any) => ColumnOrder.fromJSON(e)) : [],
-      withTies: isSet(object.withTies) ? Boolean(object.withTies) : false,
-    };
-  },
-
-  toJSON(message: TopNNode): unknown {
-    const obj: any = {};
-    message.limit !== undefined && (obj.limit = Math.round(message.limit));
-    message.offset !== undefined && (obj.offset = Math.round(message.offset));
-    message.table !== undefined && (obj.table = message.table ? Table.toJSON(message.table) : undefined);
-    if (message.orderBy) {
-      obj.orderBy = message.orderBy.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.orderBy = [];
-    }
-    message.withTies !== undefined && (obj.withTies = message.withTies);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TopNNode>, I>>(object: I): TopNNode {
-    const message = createBaseTopNNode();
-    message.limit = object.limit ?? 0;
-    message.offset = object.offset ?? 0;
-    message.table = (object.table !== undefined && object.table !== null) ? Table.fromPartial(object.table) : undefined;
-    message.orderBy = object.orderBy?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.withTies = object.withTies ?? false;
-    return message;
-  },
-};
-
-function createBaseGroupTopNNode(): GroupTopNNode {
-  return { limit: 0, offset: 0, groupKey: [], table: undefined, orderBy: [], withTies: false };
-}
-
-export const GroupTopNNode = {
-  fromJSON(object: any): GroupTopNNode {
-    return {
-      limit: isSet(object.limit) ? Number(object.limit) : 0,
-      offset: isSet(object.offset) ? Number(object.offset) : 0,
-      groupKey: Array.isArray(object?.groupKey) ? object.groupKey.map((e: any) => Number(e)) : [],
-      table: isSet(object.table) ? Table.fromJSON(object.table) : undefined,
-      orderBy: Array.isArray(object?.orderBy) ? object.orderBy.map((e: any) => ColumnOrder.fromJSON(e)) : [],
-      withTies: isSet(object.withTies) ? Boolean(object.withTies) : false,
-    };
-  },
-
-  toJSON(message: GroupTopNNode): unknown {
-    const obj: any = {};
-    message.limit !== undefined && (obj.limit = Math.round(message.limit));
-    message.offset !== undefined && (obj.offset = Math.round(message.offset));
-    if (message.groupKey) {
-      obj.groupKey = message.groupKey.map((e) => Math.round(e));
-    } else {
-      obj.groupKey = [];
-    }
-    message.table !== undefined && (obj.table = message.table ? Table.toJSON(message.table) : undefined);
-    if (message.orderBy) {
-      obj.orderBy = message.orderBy.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.orderBy = [];
-    }
-    message.withTies !== undefined && (obj.withTies = message.withTies);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GroupTopNNode>, I>>(object: I): GroupTopNNode {
-    const message = createBaseGroupTopNNode();
-    message.limit = object.limit ?? 0;
-    message.offset = object.offset ?? 0;
-    message.groupKey = object.groupKey?.map((e) => e) || [];
-    message.table = (object.table !== undefined && object.table !== null) ? Table.fromPartial(object.table) : undefined;
-    message.orderBy = object.orderBy?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.withTies = object.withTies ?? false;
-    return message;
-  },
-};
-
-function createBaseHashJoinNode(): HashJoinNode {
-  return {
-    joinType: JoinType.UNSPECIFIED,
-    leftKey: [],
-    rightKey: [],
-    condition: undefined,
-    leftTable: undefined,
-    rightTable: undefined,
-    leftDegreeTable: undefined,
-    rightDegreeTable: undefined,
-    outputIndices: [],
-    leftDedupedInputPkIndices: [],
-    rightDedupedInputPkIndices: [],
-    nullSafe: [],
-    isAppendOnly: false,
-  };
-}
-
-export const HashJoinNode = {
-  fromJSON(object: any): HashJoinNode {
-    return {
-      joinType: isSet(object.joinType) ? joinTypeFromJSON(object.joinType) : JoinType.UNSPECIFIED,
-      leftKey: Array.isArray(object?.leftKey) ? object.leftKey.map((e: any) => Number(e)) : [],
-      rightKey: Array.isArray(object?.rightKey) ? object.rightKey.map((e: any) => Number(e)) : [],
-      condition: isSet(object.condition) ? ExprNode.fromJSON(object.condition) : undefined,
-      leftTable: isSet(object.leftTable) ? Table.fromJSON(object.leftTable) : undefined,
-      rightTable: isSet(object.rightTable) ? Table.fromJSON(object.rightTable) : undefined,
-      leftDegreeTable: isSet(object.leftDegreeTable) ? Table.fromJSON(object.leftDegreeTable) : undefined,
-      rightDegreeTable: isSet(object.rightDegreeTable) ? Table.fromJSON(object.rightDegreeTable) : undefined,
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-      leftDedupedInputPkIndices: Array.isArray(object?.leftDedupedInputPkIndices)
-        ? object.leftDedupedInputPkIndices.map((e: any) => Number(e))
-        : [],
-      rightDedupedInputPkIndices: Array.isArray(object?.rightDedupedInputPkIndices)
-        ? object.rightDedupedInputPkIndices.map((e: any) => Number(e))
-        : [],
-      nullSafe: Array.isArray(object?.nullSafe) ? object.nullSafe.map((e: any) => Boolean(e)) : [],
-      isAppendOnly: isSet(object.isAppendOnly) ? Boolean(object.isAppendOnly) : false,
-    };
-  },
-
-  toJSON(message: HashJoinNode): unknown {
-    const obj: any = {};
-    message.joinType !== undefined && (obj.joinType = joinTypeToJSON(message.joinType));
-    if (message.leftKey) {
-      obj.leftKey = message.leftKey.map((e) => Math.round(e));
-    } else {
-      obj.leftKey = [];
-    }
-    if (message.rightKey) {
-      obj.rightKey = message.rightKey.map((e) => Math.round(e));
-    } else {
-      obj.rightKey = [];
-    }
-    message.condition !== undefined &&
-      (obj.condition = message.condition ? ExprNode.toJSON(message.condition) : undefined);
-    message.leftTable !== undefined &&
-      (obj.leftTable = message.leftTable ? Table.toJSON(message.leftTable) : undefined);
-    message.rightTable !== undefined &&
-      (obj.rightTable = message.rightTable ? Table.toJSON(message.rightTable) : undefined);
-    message.leftDegreeTable !== undefined &&
-      (obj.leftDegreeTable = message.leftDegreeTable ? Table.toJSON(message.leftDegreeTable) : undefined);
-    message.rightDegreeTable !== undefined &&
-      (obj.rightDegreeTable = message.rightDegreeTable ? Table.toJSON(message.rightDegreeTable) : undefined);
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    if (message.leftDedupedInputPkIndices) {
-      obj.leftDedupedInputPkIndices = message.leftDedupedInputPkIndices.map((e) => Math.round(e));
-    } else {
-      obj.leftDedupedInputPkIndices = [];
-    }
-    if (message.rightDedupedInputPkIndices) {
-      obj.rightDedupedInputPkIndices = message.rightDedupedInputPkIndices.map((e) => Math.round(e));
-    } else {
-      obj.rightDedupedInputPkIndices = [];
-    }
-    if (message.nullSafe) {
-      obj.nullSafe = message.nullSafe.map((e) => e);
-    } else {
-      obj.nullSafe = [];
-    }
-    message.isAppendOnly !== undefined && (obj.isAppendOnly = message.isAppendOnly);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HashJoinNode>, I>>(object: I): HashJoinNode {
-    const message = createBaseHashJoinNode();
-    message.joinType = object.joinType ?? JoinType.UNSPECIFIED;
-    message.leftKey = object.leftKey?.map((e) => e) || [];
-    message.rightKey = object.rightKey?.map((e) => e) || [];
-    message.condition = (object.condition !== undefined && object.condition !== null)
-      ? ExprNode.fromPartial(object.condition)
-      : undefined;
-    message.leftTable = (object.leftTable !== undefined && object.leftTable !== null)
-      ? Table.fromPartial(object.leftTable)
-      : undefined;
-    message.rightTable = (object.rightTable !== undefined && object.rightTable !== null)
-      ? Table.fromPartial(object.rightTable)
-      : undefined;
-    message.leftDegreeTable = (object.leftDegreeTable !== undefined && object.leftDegreeTable !== null)
-      ? Table.fromPartial(object.leftDegreeTable)
-      : undefined;
-    message.rightDegreeTable = (object.rightDegreeTable !== undefined && object.rightDegreeTable !== null)
-      ? Table.fromPartial(object.rightDegreeTable)
-      : undefined;
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    message.leftDedupedInputPkIndices = object.leftDedupedInputPkIndices?.map((e) => e) || [];
-    message.rightDedupedInputPkIndices = object.rightDedupedInputPkIndices?.map((e) => e) || [];
-    message.nullSafe = object.nullSafe?.map((e) => e) || [];
-    message.isAppendOnly = object.isAppendOnly ?? false;
-    return message;
-  },
-};
-
-function createBaseTemporalJoinNode(): TemporalJoinNode {
-  return {
-    joinType: JoinType.UNSPECIFIED,
-    leftKey: [],
-    rightKey: [],
-    nullSafe: [],
-    condition: undefined,
-    outputIndices: [],
-    tableDesc: undefined,
-    tableOutputIndices: [],
-  };
-}
-
-export const TemporalJoinNode = {
-  fromJSON(object: any): TemporalJoinNode {
-    return {
-      joinType: isSet(object.joinType) ? joinTypeFromJSON(object.joinType) : JoinType.UNSPECIFIED,
-      leftKey: Array.isArray(object?.leftKey) ? object.leftKey.map((e: any) => Number(e)) : [],
-      rightKey: Array.isArray(object?.rightKey) ? object.rightKey.map((e: any) => Number(e)) : [],
-      nullSafe: Array.isArray(object?.nullSafe) ? object.nullSafe.map((e: any) => Boolean(e)) : [],
-      condition: isSet(object.condition) ? ExprNode.fromJSON(object.condition) : undefined,
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-      tableDesc: isSet(object.tableDesc) ? StorageTableDesc.fromJSON(object.tableDesc) : undefined,
-      tableOutputIndices: Array.isArray(object?.tableOutputIndices)
-        ? object.tableOutputIndices.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: TemporalJoinNode): unknown {
-    const obj: any = {};
-    message.joinType !== undefined && (obj.joinType = joinTypeToJSON(message.joinType));
-    if (message.leftKey) {
-      obj.leftKey = message.leftKey.map((e) => Math.round(e));
-    } else {
-      obj.leftKey = [];
-    }
-    if (message.rightKey) {
-      obj.rightKey = message.rightKey.map((e) => Math.round(e));
-    } else {
-      obj.rightKey = [];
-    }
-    if (message.nullSafe) {
-      obj.nullSafe = message.nullSafe.map((e) => e);
-    } else {
-      obj.nullSafe = [];
-    }
-    message.condition !== undefined &&
-      (obj.condition = message.condition ? ExprNode.toJSON(message.condition) : undefined);
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    message.tableDesc !== undefined &&
-      (obj.tableDesc = message.tableDesc ? StorageTableDesc.toJSON(message.tableDesc) : undefined);
-    if (message.tableOutputIndices) {
-      obj.tableOutputIndices = message.tableOutputIndices.map((e) => Math.round(e));
-    } else {
-      obj.tableOutputIndices = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TemporalJoinNode>, I>>(object: I): TemporalJoinNode {
-    const message = createBaseTemporalJoinNode();
-    message.joinType = object.joinType ?? JoinType.UNSPECIFIED;
-    message.leftKey = object.leftKey?.map((e) => e) || [];
-    message.rightKey = object.rightKey?.map((e) => e) || [];
-    message.nullSafe = object.nullSafe?.map((e) => e) || [];
-    message.condition = (object.condition !== undefined && object.condition !== null)
-      ? ExprNode.fromPartial(object.condition)
-      : undefined;
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    message.tableDesc = (object.tableDesc !== undefined && object.tableDesc !== null)
-      ? StorageTableDesc.fromPartial(object.tableDesc)
-      : undefined;
-    message.tableOutputIndices = object.tableOutputIndices?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseDynamicFilterNode(): DynamicFilterNode {
-  return { leftKey: 0, condition: undefined, leftTable: undefined, rightTable: undefined };
-}
-
-export const DynamicFilterNode = {
-  fromJSON(object: any): DynamicFilterNode {
-    return {
-      leftKey: isSet(object.leftKey) ? Number(object.leftKey) : 0,
-      condition: isSet(object.condition) ? ExprNode.fromJSON(object.condition) : undefined,
-      leftTable: isSet(object.leftTable) ? Table.fromJSON(object.leftTable) : undefined,
-      rightTable: isSet(object.rightTable) ? Table.fromJSON(object.rightTable) : undefined,
-    };
-  },
-
-  toJSON(message: DynamicFilterNode): unknown {
-    const obj: any = {};
-    message.leftKey !== undefined && (obj.leftKey = Math.round(message.leftKey));
-    message.condition !== undefined &&
-      (obj.condition = message.condition ? ExprNode.toJSON(message.condition) : undefined);
-    message.leftTable !== undefined &&
-      (obj.leftTable = message.leftTable ? Table.toJSON(message.leftTable) : undefined);
-    message.rightTable !== undefined &&
-      (obj.rightTable = message.rightTable ? Table.toJSON(message.rightTable) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DynamicFilterNode>, I>>(object: I): DynamicFilterNode {
-    const message = createBaseDynamicFilterNode();
-    message.leftKey = object.leftKey ?? 0;
-    message.condition = (object.condition !== undefined && object.condition !== null)
-      ? ExprNode.fromPartial(object.condition)
-      : undefined;
-    message.leftTable = (object.leftTable !== undefined && object.leftTable !== null)
-      ? Table.fromPartial(object.leftTable)
-      : undefined;
-    message.rightTable = (object.rightTable !== undefined && object.rightTable !== null)
-      ? Table.fromPartial(object.rightTable)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseDeltaIndexJoinNode(): DeltaIndexJoinNode {
-  return {
-    joinType: JoinType.UNSPECIFIED,
-    leftKey: [],
-    rightKey: [],
-    condition: undefined,
-    leftTableId: 0,
-    rightTableId: 0,
-    leftInfo: undefined,
-    rightInfo: undefined,
-    outputIndices: [],
-  };
-}
-
-export const DeltaIndexJoinNode = {
-  fromJSON(object: any): DeltaIndexJoinNode {
-    return {
-      joinType: isSet(object.joinType) ? joinTypeFromJSON(object.joinType) : JoinType.UNSPECIFIED,
-      leftKey: Array.isArray(object?.leftKey) ? object.leftKey.map((e: any) => Number(e)) : [],
-      rightKey: Array.isArray(object?.rightKey) ? object.rightKey.map((e: any) => Number(e)) : [],
-      condition: isSet(object.condition) ? ExprNode.fromJSON(object.condition) : undefined,
-      leftTableId: isSet(object.leftTableId) ? Number(object.leftTableId) : 0,
-      rightTableId: isSet(object.rightTableId) ? Number(object.rightTableId) : 0,
-      leftInfo: isSet(object.leftInfo) ? ArrangementInfo.fromJSON(object.leftInfo) : undefined,
-      rightInfo: isSet(object.rightInfo) ? ArrangementInfo.fromJSON(object.rightInfo) : undefined,
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: DeltaIndexJoinNode): unknown {
-    const obj: any = {};
-    message.joinType !== undefined && (obj.joinType = joinTypeToJSON(message.joinType));
-    if (message.leftKey) {
-      obj.leftKey = message.leftKey.map((e) => Math.round(e));
-    } else {
-      obj.leftKey = [];
-    }
-    if (message.rightKey) {
-      obj.rightKey = message.rightKey.map((e) => Math.round(e));
-    } else {
-      obj.rightKey = [];
-    }
-    message.condition !== undefined &&
-      (obj.condition = message.condition ? ExprNode.toJSON(message.condition) : undefined);
-    message.leftTableId !== undefined && (obj.leftTableId = Math.round(message.leftTableId));
-    message.rightTableId !== undefined && (obj.rightTableId = Math.round(message.rightTableId));
-    message.leftInfo !== undefined &&
-      (obj.leftInfo = message.leftInfo ? ArrangementInfo.toJSON(message.leftInfo) : undefined);
-    message.rightInfo !== undefined &&
-      (obj.rightInfo = message.rightInfo ? ArrangementInfo.toJSON(message.rightInfo) : undefined);
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeltaIndexJoinNode>, I>>(object: I): DeltaIndexJoinNode {
-    const message = createBaseDeltaIndexJoinNode();
-    message.joinType = object.joinType ?? JoinType.UNSPECIFIED;
-    message.leftKey = object.leftKey?.map((e) => e) || [];
-    message.rightKey = object.rightKey?.map((e) => e) || [];
-    message.condition = (object.condition !== undefined && object.condition !== null)
-      ? ExprNode.fromPartial(object.condition)
-      : undefined;
-    message.leftTableId = object.leftTableId ?? 0;
-    message.rightTableId = object.rightTableId ?? 0;
-    message.leftInfo = (object.leftInfo !== undefined && object.leftInfo !== null)
-      ? ArrangementInfo.fromPartial(object.leftInfo)
-      : undefined;
-    message.rightInfo = (object.rightInfo !== undefined && object.rightInfo !== null)
-      ? ArrangementInfo.fromPartial(object.rightInfo)
-      : undefined;
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseHopWindowNode(): HopWindowNode {
-  return {
-    timeCol: 0,
-    windowSlide: undefined,
-    windowSize: undefined,
-    outputIndices: [],
-    windowStartExprs: [],
-    windowEndExprs: [],
-  };
-}
-
-export const HopWindowNode = {
-  fromJSON(object: any): HopWindowNode {
-    return {
-      timeCol: isSet(object.timeCol) ? Number(object.timeCol) : 0,
-      windowSlide: isSet(object.windowSlide) ? IntervalUnit.fromJSON(object.windowSlide) : undefined,
-      windowSize: isSet(object.windowSize) ? IntervalUnit.fromJSON(object.windowSize) : undefined,
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-      windowStartExprs: Array.isArray(object?.windowStartExprs)
-        ? object.windowStartExprs.map((e: any) => ExprNode.fromJSON(e))
-        : [],
-      windowEndExprs: Array.isArray(object?.windowEndExprs)
-        ? object.windowEndExprs.map((e: any) => ExprNode.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: HopWindowNode): unknown {
-    const obj: any = {};
-    message.timeCol !== undefined && (obj.timeCol = Math.round(message.timeCol));
-    message.windowSlide !== undefined &&
-      (obj.windowSlide = message.windowSlide ? IntervalUnit.toJSON(message.windowSlide) : undefined);
-    message.windowSize !== undefined &&
-      (obj.windowSize = message.windowSize ? IntervalUnit.toJSON(message.windowSize) : undefined);
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    if (message.windowStartExprs) {
-      obj.windowStartExprs = message.windowStartExprs.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.windowStartExprs = [];
-    }
-    if (message.windowEndExprs) {
-      obj.windowEndExprs = message.windowEndExprs.map((e) => e ? ExprNode.toJSON(e) : undefined);
-    } else {
-      obj.windowEndExprs = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HopWindowNode>, I>>(object: I): HopWindowNode {
-    const message = createBaseHopWindowNode();
-    message.timeCol = object.timeCol ?? 0;
-    message.windowSlide = (object.windowSlide !== undefined && object.windowSlide !== null)
-      ? IntervalUnit.fromPartial(object.windowSlide)
-      : undefined;
-    message.windowSize = (object.windowSize !== undefined && object.windowSize !== null)
-      ? IntervalUnit.fromPartial(object.windowSize)
-      : undefined;
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    message.windowStartExprs = object.windowStartExprs?.map((e) => ExprNode.fromPartial(e)) || [];
-    message.windowEndExprs = object.windowEndExprs?.map((e) => ExprNode.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseMergeNode(): MergeNode {
-  return { upstreamActorId: [], upstreamFragmentId: 0, upstreamDispatcherType: DispatcherType.UNSPECIFIED, fields: [] };
-}
-
-export const MergeNode = {
-  fromJSON(object: any): MergeNode {
-    return {
-      upstreamActorId: Array.isArray(object?.upstreamActorId) ? object.upstreamActorId.map((e: any) => Number(e)) : [],
-      upstreamFragmentId: isSet(object.upstreamFragmentId) ? Number(object.upstreamFragmentId) : 0,
-      upstreamDispatcherType: isSet(object.upstreamDispatcherType)
-        ? dispatcherTypeFromJSON(object.upstreamDispatcherType)
-        : DispatcherType.UNSPECIFIED,
-      fields: Array.isArray(object?.fields) ? object.fields.map((e: any) => Field.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: MergeNode): unknown {
-    const obj: any = {};
-    if (message.upstreamActorId) {
-      obj.upstreamActorId = message.upstreamActorId.map((e) => Math.round(e));
-    } else {
-      obj.upstreamActorId = [];
-    }
-    message.upstreamFragmentId !== undefined && (obj.upstreamFragmentId = Math.round(message.upstreamFragmentId));
-    message.upstreamDispatcherType !== undefined &&
-      (obj.upstreamDispatcherType = dispatcherTypeToJSON(message.upstreamDispatcherType));
-    if (message.fields) {
-      obj.fields = message.fields.map((e) => e ? Field.toJSON(e) : undefined);
-    } else {
-      obj.fields = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<MergeNode>, I>>(object: I): MergeNode {
-    const message = createBaseMergeNode();
-    message.upstreamActorId = object.upstreamActorId?.map((e) => e) || [];
-    message.upstreamFragmentId = object.upstreamFragmentId ?? 0;
-    message.upstreamDispatcherType = object.upstreamDispatcherType ?? DispatcherType.UNSPECIFIED;
-    message.fields = object.fields?.map((e) => Field.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseExchangeNode(): ExchangeNode {
-  return { strategy: undefined };
-}
-
-export const ExchangeNode = {
-  fromJSON(object: any): ExchangeNode {
-    return { strategy: isSet(object.strategy) ? DispatchStrategy.fromJSON(object.strategy) : undefined };
-  },
-
-  toJSON(message: ExchangeNode): unknown {
-    const obj: any = {};
-    message.strategy !== undefined &&
-      (obj.strategy = message.strategy ? DispatchStrategy.toJSON(message.strategy) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExchangeNode>, I>>(object: I): ExchangeNode {
-    const message = createBaseExchangeNode();
-    message.strategy = (object.strategy !== undefined && object.strategy !== null)
-      ? DispatchStrategy.fromPartial(object.strategy)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseChainNode(): ChainNode {
-  return {
-    tableId: 0,
-    upstreamColumnIds: [],
-    outputIndices: [],
-    chainType: ChainType.CHAIN_UNSPECIFIED,
-    tableDesc: undefined,
-  };
-}
-
-export const ChainNode = {
-  fromJSON(object: any): ChainNode {
-    return {
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      upstreamColumnIds: Array.isArray(object?.upstreamColumnIds)
-        ? object.upstreamColumnIds.map((e: any) => Number(e))
-        : [],
-      outputIndices: Array.isArray(object?.outputIndices)
-        ? object.outputIndices.map((e: any) => Number(e))
-        : [],
-      chainType: isSet(object.chainType) ? chainTypeFromJSON(object.chainType) : ChainType.CHAIN_UNSPECIFIED,
-      tableDesc: isSet(object.tableDesc) ? StorageTableDesc.fromJSON(object.tableDesc) : undefined,
-    };
-  },
-
-  toJSON(message: ChainNode): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    if (message.upstreamColumnIds) {
-      obj.upstreamColumnIds = message.upstreamColumnIds.map((e) => Math.round(e));
-    } else {
-      obj.upstreamColumnIds = [];
-    }
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    message.chainType !== undefined && (obj.chainType = chainTypeToJSON(message.chainType));
-    message.tableDesc !== undefined &&
-      (obj.tableDesc = message.tableDesc ? StorageTableDesc.toJSON(message.tableDesc) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ChainNode>, I>>(object: I): ChainNode {
-    const message = createBaseChainNode();
-    message.tableId = object.tableId ?? 0;
-    message.upstreamColumnIds = object.upstreamColumnIds?.map((e) => e) || [];
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    message.chainType = object.chainType ?? ChainType.CHAIN_UNSPECIFIED;
-    message.tableDesc = (object.tableDesc !== undefined && object.tableDesc !== null)
-      ? StorageTableDesc.fromPartial(object.tableDesc)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseBatchPlanNode(): BatchPlanNode {
-  return { tableDesc: undefined, columnIds: [] };
-}
-
-export const BatchPlanNode = {
-  fromJSON(object: any): BatchPlanNode {
-    return {
-      tableDesc: isSet(object.tableDesc) ? StorageTableDesc.fromJSON(object.tableDesc) : undefined,
-      columnIds: Array.isArray(object?.columnIds) ? object.columnIds.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: BatchPlanNode): unknown {
-    const obj: any = {};
-    message.tableDesc !== undefined &&
-      (obj.tableDesc = message.tableDesc ? StorageTableDesc.toJSON(message.tableDesc) : undefined);
-    if (message.columnIds) {
-      obj.columnIds = message.columnIds.map((e) => Math.round(e));
-    } else {
-      obj.columnIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BatchPlanNode>, I>>(object: I): BatchPlanNode {
-    const message = createBaseBatchPlanNode();
-    message.tableDesc = (object.tableDesc !== undefined && object.tableDesc !== null)
-      ? StorageTableDesc.fromPartial(object.tableDesc)
-      : undefined;
-    message.columnIds = object.columnIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseArrangementInfo(): ArrangementInfo {
-  return { arrangeKeyOrders: [], columnDescs: [], tableDesc: undefined };
-}
-
-export const ArrangementInfo = {
-  fromJSON(object: any): ArrangementInfo {
-    return {
-      arrangeKeyOrders: Array.isArray(object?.arrangeKeyOrders)
-        ? object.arrangeKeyOrders.map((e: any) => ColumnOrder.fromJSON(e))
-        : [],
-      columnDescs: Array.isArray(object?.columnDescs)
-        ? object.columnDescs.map((e: any) => ColumnDesc.fromJSON(e))
-        : [],
-      tableDesc: isSet(object.tableDesc) ? StorageTableDesc.fromJSON(object.tableDesc) : undefined,
-    };
-  },
-
-  toJSON(message: ArrangementInfo): unknown {
-    const obj: any = {};
-    if (message.arrangeKeyOrders) {
-      obj.arrangeKeyOrders = message.arrangeKeyOrders.map((e) => e ? ColumnOrder.toJSON(e) : undefined);
-    } else {
-      obj.arrangeKeyOrders = [];
-    }
-    if (message.columnDescs) {
-      obj.columnDescs = message.columnDescs.map((e) => e ? ColumnDesc.toJSON(e) : undefined);
-    } else {
-      obj.columnDescs = [];
-    }
-    message.tableDesc !== undefined &&
-      (obj.tableDesc = message.tableDesc ? StorageTableDesc.toJSON(message.tableDesc) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ArrangementInfo>, I>>(object: I): ArrangementInfo {
-    const message = createBaseArrangementInfo();
-    message.arrangeKeyOrders = object.arrangeKeyOrders?.map((e) => ColumnOrder.fromPartial(e)) || [];
-    message.columnDescs = object.columnDescs?.map((e) => ColumnDesc.fromPartial(e)) || [];
-    message.tableDesc = (object.tableDesc !== undefined && object.tableDesc !== null)
-      ? StorageTableDesc.fromPartial(object.tableDesc)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseArrangeNode(): ArrangeNode {
-  return {
-    tableInfo: undefined,
-    distributionKey: [],
-    table: undefined,
-    handlePkConflictBehavior: HandleConflictBehavior.NO_CHECK_UNSPECIFIED,
-  };
-}
-
-export const ArrangeNode = {
-  fromJSON(object: any): ArrangeNode {
-    return {
-      tableInfo: isSet(object.tableInfo) ? ArrangementInfo.fromJSON(object.tableInfo) : undefined,
-      distributionKey: Array.isArray(object?.distributionKey) ? object.distributionKey.map((e: any) => Number(e)) : [],
-      table: isSet(object.table) ? Table.fromJSON(object.table) : undefined,
-      handlePkConflictBehavior: isSet(object.handlePkConflictBehavior)
-        ? handleConflictBehaviorFromJSON(object.handlePkConflictBehavior)
-        : HandleConflictBehavior.NO_CHECK_UNSPECIFIED,
-    };
-  },
-
-  toJSON(message: ArrangeNode): unknown {
-    const obj: any = {};
-    message.tableInfo !== undefined &&
-      (obj.tableInfo = message.tableInfo ? ArrangementInfo.toJSON(message.tableInfo) : undefined);
-    if (message.distributionKey) {
-      obj.distributionKey = message.distributionKey.map((e) => Math.round(e));
-    } else {
-      obj.distributionKey = [];
-    }
-    message.table !== undefined && (obj.table = message.table ? Table.toJSON(message.table) : undefined);
-    message.handlePkConflictBehavior !== undefined &&
-      (obj.handlePkConflictBehavior = handleConflictBehaviorToJSON(message.handlePkConflictBehavior));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ArrangeNode>, I>>(object: I): ArrangeNode {
-    const message = createBaseArrangeNode();
-    message.tableInfo = (object.tableInfo !== undefined && object.tableInfo !== null)
-      ? ArrangementInfo.fromPartial(object.tableInfo)
-      : undefined;
-    message.distributionKey = object.distributionKey?.map((e) => e) || [];
-    message.table = (object.table !== undefined && object.table !== null) ? Table.fromPartial(object.table) : undefined;
-    message.handlePkConflictBehavior = object.handlePkConflictBehavior ?? HandleConflictBehavior.NO_CHECK_UNSPECIFIED;
-    return message;
-  },
-};
-
-function createBaseLookupNode(): LookupNode {
-  return {
-    arrangeKey: [],
-    streamKey: [],
-    useCurrentEpoch: false,
-    columnMapping: [],
-    arrangementTableId: undefined,
-    arrangementTableInfo: undefined,
-  };
-}
-
-export const LookupNode = {
-  fromJSON(object: any): LookupNode {
-    return {
-      arrangeKey: Array.isArray(object?.arrangeKey) ? object.arrangeKey.map((e: any) => Number(e)) : [],
-      streamKey: Array.isArray(object?.streamKey) ? object.streamKey.map((e: any) => Number(e)) : [],
-      useCurrentEpoch: isSet(object.useCurrentEpoch) ? Boolean(object.useCurrentEpoch) : false,
-      columnMapping: Array.isArray(object?.columnMapping) ? object.columnMapping.map((e: any) => Number(e)) : [],
-      arrangementTableId: isSet(object.tableId)
-        ? { $case: "tableId", tableId: Number(object.tableId) }
-        : isSet(object.indexId)
-        ? { $case: "indexId", indexId: Number(object.indexId) }
-        : undefined,
-      arrangementTableInfo: isSet(object.arrangementTableInfo)
-        ? ArrangementInfo.fromJSON(object.arrangementTableInfo)
-        : undefined,
-    };
-  },
-
-  toJSON(message: LookupNode): unknown {
-    const obj: any = {};
-    if (message.arrangeKey) {
-      obj.arrangeKey = message.arrangeKey.map((e) => Math.round(e));
-    } else {
-      obj.arrangeKey = [];
-    }
-    if (message.streamKey) {
-      obj.streamKey = message.streamKey.map((e) => Math.round(e));
-    } else {
-      obj.streamKey = [];
-    }
-    message.useCurrentEpoch !== undefined && (obj.useCurrentEpoch = message.useCurrentEpoch);
-    if (message.columnMapping) {
-      obj.columnMapping = message.columnMapping.map((e) => Math.round(e));
-    } else {
-      obj.columnMapping = [];
-    }
-    message.arrangementTableId?.$case === "tableId" && (obj.tableId = Math.round(message.arrangementTableId?.tableId));
-    message.arrangementTableId?.$case === "indexId" && (obj.indexId = Math.round(message.arrangementTableId?.indexId));
-    message.arrangementTableInfo !== undefined && (obj.arrangementTableInfo = message.arrangementTableInfo
-      ? ArrangementInfo.toJSON(message.arrangementTableInfo)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<LookupNode>, I>>(object: I): LookupNode {
-    const message = createBaseLookupNode();
-    message.arrangeKey = object.arrangeKey?.map((e) => e) || [];
-    message.streamKey = object.streamKey?.map((e) => e) || [];
-    message.useCurrentEpoch = object.useCurrentEpoch ?? false;
-    message.columnMapping = object.columnMapping?.map((e) => e) || [];
-    if (
-      object.arrangementTableId?.$case === "tableId" &&
-      object.arrangementTableId?.tableId !== undefined &&
-      object.arrangementTableId?.tableId !== null
-    ) {
-      message.arrangementTableId = { $case: "tableId", tableId: object.arrangementTableId.tableId };
-    }
-    if (
-      object.arrangementTableId?.$case === "indexId" &&
-      object.arrangementTableId?.indexId !== undefined &&
-      object.arrangementTableId?.indexId !== null
-    ) {
-      message.arrangementTableId = { $case: "indexId", indexId: object.arrangementTableId.indexId };
-    }
-    message.arrangementTableInfo = (object.arrangementTableInfo !== undefined && object.arrangementTableInfo !== null)
-      ? ArrangementInfo.fromPartial(object.arrangementTableInfo)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseWatermarkFilterNode(): WatermarkFilterNode {
-  return { watermarkDescs: [], tables: [] };
-}
-
-export const WatermarkFilterNode = {
-  fromJSON(object: any): WatermarkFilterNode {
-    return {
-      watermarkDescs: Array.isArray(object?.watermarkDescs)
-        ? object.watermarkDescs.map((e: any) => WatermarkDesc.fromJSON(e))
-        : [],
-      tables: Array.isArray(object?.tables)
-        ? object.tables.map((e: any) => Table.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: WatermarkFilterNode): unknown {
-    const obj: any = {};
-    if (message.watermarkDescs) {
-      obj.watermarkDescs = message.watermarkDescs.map((e) => e ? WatermarkDesc.toJSON(e) : undefined);
-    } else {
-      obj.watermarkDescs = [];
-    }
-    if (message.tables) {
-      obj.tables = message.tables.map((e) => e ? Table.toJSON(e) : undefined);
-    } else {
-      obj.tables = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<WatermarkFilterNode>, I>>(object: I): WatermarkFilterNode {
-    const message = createBaseWatermarkFilterNode();
-    message.watermarkDescs = object.watermarkDescs?.map((e) => WatermarkDesc.fromPartial(e)) || [];
-    message.tables = object.tables?.map((e) => Table.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseUnionNode(): UnionNode {
-  return {};
-}
-
-export const UnionNode = {
-  fromJSON(_: any): UnionNode {
-    return {};
-  },
-
-  toJSON(_: UnionNode): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UnionNode>, I>>(_: I): UnionNode {
-    const message = createBaseUnionNode();
-    return message;
-  },
-};
-
-function createBaseLookupUnionNode(): LookupUnionNode {
-  return { order: [] };
-}
-
-export const LookupUnionNode = {
-  fromJSON(object: any): LookupUnionNode {
-    return { order: Array.isArray(object?.order) ? object.order.map((e: any) => Number(e)) : [] };
-  },
-
-  toJSON(message: LookupUnionNode): unknown {
-    const obj: any = {};
-    if (message.order) {
-      obj.order = message.order.map((e) => Math.round(e));
-    } else {
-      obj.order = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<LookupUnionNode>, I>>(object: I): LookupUnionNode {
-    const message = createBaseLookupUnionNode();
-    message.order = object.order?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseExpandNode(): ExpandNode {
-  return { columnSubsets: [] };
-}
-
-export const ExpandNode = {
-  fromJSON(object: any): ExpandNode {
-    return {
-      columnSubsets: Array.isArray(object?.columnSubsets)
-        ? object.columnSubsets.map((e: any) => ExpandNode_Subset.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: ExpandNode): unknown {
-    const obj: any = {};
-    if (message.columnSubsets) {
-      obj.columnSubsets = message.columnSubsets.map((e) => e ? ExpandNode_Subset.toJSON(e) : undefined);
-    } else {
-      obj.columnSubsets = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExpandNode>, I>>(object: I): ExpandNode {
-    const message = createBaseExpandNode();
-    message.columnSubsets = object.columnSubsets?.map((e) => ExpandNode_Subset.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseExpandNode_Subset(): ExpandNode_Subset {
-  return { columnIndices: [] };
-}
-
-export const ExpandNode_Subset = {
-  fromJSON(object: any): ExpandNode_Subset {
-    return {
-      columnIndices: Array.isArray(object?.columnIndices) ? object.columnIndices.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: ExpandNode_Subset): unknown {
-    const obj: any = {};
-    if (message.columnIndices) {
-      obj.columnIndices = message.columnIndices.map((e) => Math.round(e));
-    } else {
-      obj.columnIndices = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExpandNode_Subset>, I>>(object: I): ExpandNode_Subset {
-    const message = createBaseExpandNode_Subset();
-    message.columnIndices = object.columnIndices?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseProjectSetNode(): ProjectSetNode {
-  return { selectList: [] };
-}
-
-export const ProjectSetNode = {
-  fromJSON(object: any): ProjectSetNode {
-    return {
-      selectList: Array.isArray(object?.selectList)
-        ? object.selectList.map((e: any) => ProjectSetSelectItem.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: ProjectSetNode): unknown {
-    const obj: any = {};
-    if (message.selectList) {
-      obj.selectList = message.selectList.map((e) => e ? ProjectSetSelectItem.toJSON(e) : undefined);
-    } else {
-      obj.selectList = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ProjectSetNode>, I>>(object: I): ProjectSetNode {
-    const message = createBaseProjectSetNode();
-    message.selectList = object.selectList?.map((e) => ProjectSetSelectItem.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseSortNode(): SortNode {
-  return { stateTable: undefined, sortColumnIndex: 0 };
-}
-
-export const SortNode = {
-  fromJSON(object: any): SortNode {
-    return {
-      stateTable: isSet(object.stateTable) ? Table.fromJSON(object.stateTable) : undefined,
-      sortColumnIndex: isSet(object.sortColumnIndex) ? Number(object.sortColumnIndex) : 0,
-    };
-  },
-
-  toJSON(message: SortNode): unknown {
-    const obj: any = {};
-    message.stateTable !== undefined &&
-      (obj.stateTable = message.stateTable ? Table.toJSON(message.stateTable) : undefined);
-    message.sortColumnIndex !== undefined && (obj.sortColumnIndex = Math.round(message.sortColumnIndex));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<SortNode>, I>>(object: I): SortNode {
-    const message = createBaseSortNode();
-    message.stateTable = (object.stateTable !== undefined && object.stateTable !== null)
-      ? Table.fromPartial(object.stateTable)
-      : undefined;
-    message.sortColumnIndex = object.sortColumnIndex ?? 0;
-    return message;
-  },
-};
-
-function createBaseDmlNode(): DmlNode {
-  return { tableId: 0, tableVersionId: 0, columnDescs: [] };
-}
-
-export const DmlNode = {
-  fromJSON(object: any): DmlNode {
-    return {
-      tableId: isSet(object.tableId) ? Number(object.tableId) : 0,
-      tableVersionId: isSet(object.tableVersionId) ? Number(object.tableVersionId) : 0,
-      columnDescs: Array.isArray(object?.columnDescs) ? object.columnDescs.map((e: any) => ColumnDesc.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: DmlNode): unknown {
-    const obj: any = {};
-    message.tableId !== undefined && (obj.tableId = Math.round(message.tableId));
-    message.tableVersionId !== undefined && (obj.tableVersionId = Math.round(message.tableVersionId));
-    if (message.columnDescs) {
-      obj.columnDescs = message.columnDescs.map((e) => e ? ColumnDesc.toJSON(e) : undefined);
-    } else {
-      obj.columnDescs = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DmlNode>, I>>(object: I): DmlNode {
-    const message = createBaseDmlNode();
-    message.tableId = object.tableId ?? 0;
-    message.tableVersionId = object.tableVersionId ?? 0;
-    message.columnDescs = object.columnDescs?.map((e) => ColumnDesc.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseRowIdGenNode(): RowIdGenNode {
-  return { rowIdIndex: 0 };
-}
-
-export const RowIdGenNode = {
-  fromJSON(object: any): RowIdGenNode {
-    return { rowIdIndex: isSet(object.rowIdIndex) ? Number(object.rowIdIndex) : 0 };
-  },
-
-  toJSON(message: RowIdGenNode): unknown {
-    const obj: any = {};
-    message.rowIdIndex !== undefined && (obj.rowIdIndex = Math.round(message.rowIdIndex));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RowIdGenNode>, I>>(object: I): RowIdGenNode {
-    const message = createBaseRowIdGenNode();
-    message.rowIdIndex = object.rowIdIndex ?? 0;
-    return message;
-  },
-};
-
-function createBaseNowNode(): NowNode {
-  return { stateTable: undefined };
-}
-
-export const NowNode = {
-  fromJSON(object: any): NowNode {
-    return { stateTable: isSet(object.stateTable) ? Table.fromJSON(object.stateTable) : undefined };
-  },
-
-  toJSON(message: NowNode): unknown {
-    const obj: any = {};
-    message.stateTable !== undefined &&
-      (obj.stateTable = message.stateTable ? Table.toJSON(message.stateTable) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<NowNode>, I>>(object: I): NowNode {
-    const message = createBaseNowNode();
-    message.stateTable = (object.stateTable !== undefined && object.stateTable !== null)
-      ? Table.fromPartial(object.stateTable)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseStreamNode(): StreamNode {
-  return { nodeBody: undefined, operatorId: 0, input: [], streamKey: [], appendOnly: false, identity: "", fields: [] };
-}
-
-export const StreamNode = {
-  fromJSON(object: any): StreamNode {
-    return {
-      nodeBody: isSet(object.source)
-        ? { $case: "source", source: SourceNode.fromJSON(object.source) }
-        : isSet(object.project)
-        ? { $case: "project", project: ProjectNode.fromJSON(object.project) }
-        : isSet(object.filter)
-        ? { $case: "filter", filter: FilterNode.fromJSON(object.filter) }
-        : isSet(object.materialize)
-        ? { $case: "materialize", materialize: MaterializeNode.fromJSON(object.materialize) }
-        : isSet(object.localSimpleAgg)
-        ? { $case: "localSimpleAgg", localSimpleAgg: SimpleAggNode.fromJSON(object.localSimpleAgg) }
-        : isSet(object.globalSimpleAgg)
-        ? { $case: "globalSimpleAgg", globalSimpleAgg: SimpleAggNode.fromJSON(object.globalSimpleAgg) }
-        : isSet(object.hashAgg)
-        ? { $case: "hashAgg", hashAgg: HashAggNode.fromJSON(object.hashAgg) }
-        : isSet(object.appendOnlyTopN)
-        ? { $case: "appendOnlyTopN", appendOnlyTopN: TopNNode.fromJSON(object.appendOnlyTopN) }
-        : isSet(object.hashJoin)
-        ? { $case: "hashJoin", hashJoin: HashJoinNode.fromJSON(object.hashJoin) }
-        : isSet(object.topN)
-        ? { $case: "topN", topN: TopNNode.fromJSON(object.topN) }
-        : isSet(object.hopWindow)
-        ? { $case: "hopWindow", hopWindow: HopWindowNode.fromJSON(object.hopWindow) }
-        : isSet(object.merge)
-        ? { $case: "merge", merge: MergeNode.fromJSON(object.merge) }
-        : isSet(object.exchange)
-        ? { $case: "exchange", exchange: ExchangeNode.fromJSON(object.exchange) }
-        : isSet(object.chain)
-        ? { $case: "chain", chain: ChainNode.fromJSON(object.chain) }
-        : isSet(object.batchPlan)
-        ? { $case: "batchPlan", batchPlan: BatchPlanNode.fromJSON(object.batchPlan) }
-        : isSet(object.lookup)
-        ? { $case: "lookup", lookup: LookupNode.fromJSON(object.lookup) }
-        : isSet(object.arrange)
-        ? { $case: "arrange", arrange: ArrangeNode.fromJSON(object.arrange) }
-        : isSet(object.lookupUnion)
-        ? { $case: "lookupUnion", lookupUnion: LookupUnionNode.fromJSON(object.lookupUnion) }
-        : isSet(object.union)
-        ? { $case: "union", union: UnionNode.fromJSON(object.union) }
-        : isSet(object.deltaIndexJoin)
-        ? { $case: "deltaIndexJoin", deltaIndexJoin: DeltaIndexJoinNode.fromJSON(object.deltaIndexJoin) }
-        : isSet(object.sink)
-        ? { $case: "sink", sink: SinkNode.fromJSON(object.sink) }
-        : isSet(object.expand)
-        ? { $case: "expand", expand: ExpandNode.fromJSON(object.expand) }
-        : isSet(object.dynamicFilter)
-        ? { $case: "dynamicFilter", dynamicFilter: DynamicFilterNode.fromJSON(object.dynamicFilter) }
-        : isSet(object.projectSet)
-        ? { $case: "projectSet", projectSet: ProjectSetNode.fromJSON(object.projectSet) }
-        : isSet(object.groupTopN)
-        ? { $case: "groupTopN", groupTopN: GroupTopNNode.fromJSON(object.groupTopN) }
-        : isSet(object.sort)
-        ? { $case: "sort", sort: SortNode.fromJSON(object.sort) }
-        : isSet(object.watermarkFilter)
-        ? { $case: "watermarkFilter", watermarkFilter: WatermarkFilterNode.fromJSON(object.watermarkFilter) }
-        : isSet(object.dml)
-        ? { $case: "dml", dml: DmlNode.fromJSON(object.dml) }
-        : isSet(object.rowIdGen)
-        ? { $case: "rowIdGen", rowIdGen: RowIdGenNode.fromJSON(object.rowIdGen) }
-        : isSet(object.now)
-        ? { $case: "now", now: NowNode.fromJSON(object.now) }
-        : isSet(object.appendOnlyGroupTopN)
-        ? { $case: "appendOnlyGroupTopN", appendOnlyGroupTopN: GroupTopNNode.fromJSON(object.appendOnlyGroupTopN) }
-        : isSet(object.temporalJoin)
-        ? { $case: "temporalJoin", temporalJoin: TemporalJoinNode.fromJSON(object.temporalJoin) }
-        : isSet(object.barrierRecv)
-        ? { $case: "barrierRecv", barrierRecv: BarrierRecvNode.fromJSON(object.barrierRecv) }
-        : undefined,
-      operatorId: isSet(object.operatorId) ? Number(object.operatorId) : 0,
-      input: Array.isArray(object?.input)
-        ? object.input.map((e: any) => StreamNode.fromJSON(e))
-        : [],
-      streamKey: Array.isArray(object?.streamKey) ? object.streamKey.map((e: any) => Number(e)) : [],
-      appendOnly: isSet(object.appendOnly) ? Boolean(object.appendOnly) : false,
-      identity: isSet(object.identity) ? String(object.identity) : "",
-      fields: Array.isArray(object?.fields) ? object.fields.map((e: any) => Field.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: StreamNode): unknown {
-    const obj: any = {};
-    message.nodeBody?.$case === "source" &&
-      (obj.source = message.nodeBody?.source ? SourceNode.toJSON(message.nodeBody?.source) : undefined);
-    message.nodeBody?.$case === "project" &&
-      (obj.project = message.nodeBody?.project ? ProjectNode.toJSON(message.nodeBody?.project) : undefined);
-    message.nodeBody?.$case === "filter" &&
-      (obj.filter = message.nodeBody?.filter ? FilterNode.toJSON(message.nodeBody?.filter) : undefined);
-    message.nodeBody?.$case === "materialize" && (obj.materialize = message.nodeBody?.materialize
-      ? MaterializeNode.toJSON(message.nodeBody?.materialize)
-      : undefined);
-    message.nodeBody?.$case === "localSimpleAgg" && (obj.localSimpleAgg = message.nodeBody?.localSimpleAgg
-      ? SimpleAggNode.toJSON(message.nodeBody?.localSimpleAgg)
-      : undefined);
-    message.nodeBody?.$case === "globalSimpleAgg" && (obj.globalSimpleAgg = message.nodeBody?.globalSimpleAgg
-      ? SimpleAggNode.toJSON(message.nodeBody?.globalSimpleAgg)
-      : undefined);
-    message.nodeBody?.$case === "hashAgg" &&
-      (obj.hashAgg = message.nodeBody?.hashAgg ? HashAggNode.toJSON(message.nodeBody?.hashAgg) : undefined);
-    message.nodeBody?.$case === "appendOnlyTopN" && (obj.appendOnlyTopN = message.nodeBody?.appendOnlyTopN
-      ? TopNNode.toJSON(message.nodeBody?.appendOnlyTopN)
-      : undefined);
-    message.nodeBody?.$case === "hashJoin" &&
-      (obj.hashJoin = message.nodeBody?.hashJoin ? HashJoinNode.toJSON(message.nodeBody?.hashJoin) : undefined);
-    message.nodeBody?.$case === "topN" &&
-      (obj.topN = message.nodeBody?.topN ? TopNNode.toJSON(message.nodeBody?.topN) : undefined);
-    message.nodeBody?.$case === "hopWindow" &&
-      (obj.hopWindow = message.nodeBody?.hopWindow ? HopWindowNode.toJSON(message.nodeBody?.hopWindow) : undefined);
-    message.nodeBody?.$case === "merge" &&
-      (obj.merge = message.nodeBody?.merge ? MergeNode.toJSON(message.nodeBody?.merge) : undefined);
-    message.nodeBody?.$case === "exchange" &&
-      (obj.exchange = message.nodeBody?.exchange ? ExchangeNode.toJSON(message.nodeBody?.exchange) : undefined);
-    message.nodeBody?.$case === "chain" &&
-      (obj.chain = message.nodeBody?.chain ? ChainNode.toJSON(message.nodeBody?.chain) : undefined);
-    message.nodeBody?.$case === "batchPlan" &&
-      (obj.batchPlan = message.nodeBody?.batchPlan ? BatchPlanNode.toJSON(message.nodeBody?.batchPlan) : undefined);
-    message.nodeBody?.$case === "lookup" &&
-      (obj.lookup = message.nodeBody?.lookup ? LookupNode.toJSON(message.nodeBody?.lookup) : undefined);
-    message.nodeBody?.$case === "arrange" &&
-      (obj.arrange = message.nodeBody?.arrange ? ArrangeNode.toJSON(message.nodeBody?.arrange) : undefined);
-    message.nodeBody?.$case === "lookupUnion" && (obj.lookupUnion = message.nodeBody?.lookupUnion
-      ? LookupUnionNode.toJSON(message.nodeBody?.lookupUnion)
-      : undefined);
-    message.nodeBody?.$case === "union" &&
-      (obj.union = message.nodeBody?.union ? UnionNode.toJSON(message.nodeBody?.union) : undefined);
-    message.nodeBody?.$case === "deltaIndexJoin" && (obj.deltaIndexJoin = message.nodeBody?.deltaIndexJoin
-      ? DeltaIndexJoinNode.toJSON(message.nodeBody?.deltaIndexJoin)
-      : undefined);
-    message.nodeBody?.$case === "sink" &&
-      (obj.sink = message.nodeBody?.sink ? SinkNode.toJSON(message.nodeBody?.sink) : undefined);
-    message.nodeBody?.$case === "expand" &&
-      (obj.expand = message.nodeBody?.expand ? ExpandNode.toJSON(message.nodeBody?.expand) : undefined);
-    message.nodeBody?.$case === "dynamicFilter" && (obj.dynamicFilter = message.nodeBody?.dynamicFilter
-      ? DynamicFilterNode.toJSON(message.nodeBody?.dynamicFilter)
-      : undefined);
-    message.nodeBody?.$case === "projectSet" &&
-      (obj.projectSet = message.nodeBody?.projectSet ? ProjectSetNode.toJSON(message.nodeBody?.projectSet) : undefined);
-    message.nodeBody?.$case === "groupTopN" &&
-      (obj.groupTopN = message.nodeBody?.groupTopN ? GroupTopNNode.toJSON(message.nodeBody?.groupTopN) : undefined);
-    message.nodeBody?.$case === "sort" &&
-      (obj.sort = message.nodeBody?.sort ? SortNode.toJSON(message.nodeBody?.sort) : undefined);
-    message.nodeBody?.$case === "watermarkFilter" && (obj.watermarkFilter = message.nodeBody?.watermarkFilter
-      ? WatermarkFilterNode.toJSON(message.nodeBody?.watermarkFilter)
-      : undefined);
-    message.nodeBody?.$case === "dml" &&
-      (obj.dml = message.nodeBody?.dml ? DmlNode.toJSON(message.nodeBody?.dml) : undefined);
-    message.nodeBody?.$case === "rowIdGen" &&
-      (obj.rowIdGen = message.nodeBody?.rowIdGen ? RowIdGenNode.toJSON(message.nodeBody?.rowIdGen) : undefined);
-    message.nodeBody?.$case === "now" &&
-      (obj.now = message.nodeBody?.now ? NowNode.toJSON(message.nodeBody?.now) : undefined);
-    message.nodeBody?.$case === "appendOnlyGroupTopN" &&
-      (obj.appendOnlyGroupTopN = message.nodeBody?.appendOnlyGroupTopN
-        ? GroupTopNNode.toJSON(message.nodeBody?.appendOnlyGroupTopN)
-        : undefined);
-    message.nodeBody?.$case === "temporalJoin" && (obj.temporalJoin = message.nodeBody?.temporalJoin
-      ? TemporalJoinNode.toJSON(message.nodeBody?.temporalJoin)
-      : undefined);
-    message.nodeBody?.$case === "barrierRecv" && (obj.barrierRecv = message.nodeBody?.barrierRecv
-      ? BarrierRecvNode.toJSON(message.nodeBody?.barrierRecv)
-      : undefined);
-    message.operatorId !== undefined && (obj.operatorId = Math.round(message.operatorId));
-    if (message.input) {
-      obj.input = message.input.map((e) =>
-        e ? StreamNode.toJSON(e) : undefined
-      );
-    } else {
-      obj.input = [];
-    }
-    if (message.streamKey) {
-      obj.streamKey = message.streamKey.map((e) =>
-        Math.round(e)
-      );
-    } else {
-      obj.streamKey = [];
-    }
-    message.appendOnly !== undefined && (obj.appendOnly = message.appendOnly);
-    message.identity !== undefined && (obj.identity = message.identity);
-    if (message.fields) {
-      obj.fields = message.fields.map((e) =>
-        e ? Field.toJSON(e) : undefined
-      );
-    } else {
-      obj.fields = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamNode>, I>>(object: I): StreamNode {
-    const message = createBaseStreamNode();
-    if (
-      object.nodeBody?.$case === "source" && object.nodeBody?.source !== undefined && object.nodeBody?.source !== null
-    ) {
-      message.nodeBody = { $case: "source", source: SourceNode.fromPartial(object.nodeBody.source) };
-    }
-    if (
-      object.nodeBody?.$case === "project" &&
-      object.nodeBody?.project !== undefined &&
-      object.nodeBody?.project !== null
-    ) {
-      message.nodeBody = { $case: "project", project: ProjectNode.fromPartial(object.nodeBody.project) };
-    }
-    if (
-      object.nodeBody?.$case === "filter" && object.nodeBody?.filter !== undefined && object.nodeBody?.filter !== null
-    ) {
-      message.nodeBody = { $case: "filter", filter: FilterNode.fromPartial(object.nodeBody.filter) };
-    }
-    if (
-      object.nodeBody?.$case === "materialize" &&
-      object.nodeBody?.materialize !== undefined &&
-      object.nodeBody?.materialize !== null
-    ) {
-      message.nodeBody = {
-        $case: "materialize",
-        materialize: MaterializeNode.fromPartial(object.nodeBody.materialize),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "localSimpleAgg" &&
-      object.nodeBody?.localSimpleAgg !== undefined &&
-      object.nodeBody?.localSimpleAgg !== null
-    ) {
-      message.nodeBody = {
-        $case: "localSimpleAgg",
-        localSimpleAgg: SimpleAggNode.fromPartial(object.nodeBody.localSimpleAgg),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "globalSimpleAgg" &&
-      object.nodeBody?.globalSimpleAgg !== undefined &&
-      object.nodeBody?.globalSimpleAgg !== null
-    ) {
-      message.nodeBody = {
-        $case: "globalSimpleAgg",
-        globalSimpleAgg: SimpleAggNode.fromPartial(object.nodeBody.globalSimpleAgg),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "hashAgg" &&
-      object.nodeBody?.hashAgg !== undefined &&
-      object.nodeBody?.hashAgg !== null
-    ) {
-      message.nodeBody = { $case: "hashAgg", hashAgg: HashAggNode.fromPartial(object.nodeBody.hashAgg) };
-    }
-    if (
-      object.nodeBody?.$case === "appendOnlyTopN" &&
-      object.nodeBody?.appendOnlyTopN !== undefined &&
-      object.nodeBody?.appendOnlyTopN !== null
-    ) {
-      message.nodeBody = {
-        $case: "appendOnlyTopN",
-        appendOnlyTopN: TopNNode.fromPartial(object.nodeBody.appendOnlyTopN),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "hashJoin" &&
-      object.nodeBody?.hashJoin !== undefined &&
-      object.nodeBody?.hashJoin !== null
-    ) {
-      message.nodeBody = { $case: "hashJoin", hashJoin: HashJoinNode.fromPartial(object.nodeBody.hashJoin) };
-    }
-    if (object.nodeBody?.$case === "topN" && object.nodeBody?.topN !== undefined && object.nodeBody?.topN !== null) {
-      message.nodeBody = { $case: "topN", topN: TopNNode.fromPartial(object.nodeBody.topN) };
-    }
-    if (
-      object.nodeBody?.$case === "hopWindow" &&
-      object.nodeBody?.hopWindow !== undefined &&
-      object.nodeBody?.hopWindow !== null
-    ) {
-      message.nodeBody = { $case: "hopWindow", hopWindow: HopWindowNode.fromPartial(object.nodeBody.hopWindow) };
-    }
-    if (object.nodeBody?.$case === "merge" && object.nodeBody?.merge !== undefined && object.nodeBody?.merge !== null) {
-      message.nodeBody = { $case: "merge", merge: MergeNode.fromPartial(object.nodeBody.merge) };
-    }
-    if (
-      object.nodeBody?.$case === "exchange" &&
-      object.nodeBody?.exchange !== undefined &&
-      object.nodeBody?.exchange !== null
-    ) {
-      message.nodeBody = { $case: "exchange", exchange: ExchangeNode.fromPartial(object.nodeBody.exchange) };
-    }
-    if (object.nodeBody?.$case === "chain" && object.nodeBody?.chain !== undefined && object.nodeBody?.chain !== null) {
-      message.nodeBody = { $case: "chain", chain: ChainNode.fromPartial(object.nodeBody.chain) };
-    }
-    if (
-      object.nodeBody?.$case === "batchPlan" &&
-      object.nodeBody?.batchPlan !== undefined &&
-      object.nodeBody?.batchPlan !== null
-    ) {
-      message.nodeBody = { $case: "batchPlan", batchPlan: BatchPlanNode.fromPartial(object.nodeBody.batchPlan) };
-    }
-    if (
-      object.nodeBody?.$case === "lookup" && object.nodeBody?.lookup !== undefined && object.nodeBody?.lookup !== null
-    ) {
-      message.nodeBody = { $case: "lookup", lookup: LookupNode.fromPartial(object.nodeBody.lookup) };
-    }
-    if (
-      object.nodeBody?.$case === "arrange" &&
-      object.nodeBody?.arrange !== undefined &&
-      object.nodeBody?.arrange !== null
-    ) {
-      message.nodeBody = { $case: "arrange", arrange: ArrangeNode.fromPartial(object.nodeBody.arrange) };
-    }
-    if (
-      object.nodeBody?.$case === "lookupUnion" &&
-      object.nodeBody?.lookupUnion !== undefined &&
-      object.nodeBody?.lookupUnion !== null
-    ) {
-      message.nodeBody = {
-        $case: "lookupUnion",
-        lookupUnion: LookupUnionNode.fromPartial(object.nodeBody.lookupUnion),
-      };
-    }
-    if (object.nodeBody?.$case === "union" && object.nodeBody?.union !== undefined && object.nodeBody?.union !== null) {
-      message.nodeBody = { $case: "union", union: UnionNode.fromPartial(object.nodeBody.union) };
-    }
-    if (
-      object.nodeBody?.$case === "deltaIndexJoin" &&
-      object.nodeBody?.deltaIndexJoin !== undefined &&
-      object.nodeBody?.deltaIndexJoin !== null
-    ) {
-      message.nodeBody = {
-        $case: "deltaIndexJoin",
-        deltaIndexJoin: DeltaIndexJoinNode.fromPartial(object.nodeBody.deltaIndexJoin),
-      };
-    }
-    if (object.nodeBody?.$case === "sink" && object.nodeBody?.sink !== undefined && object.nodeBody?.sink !== null) {
-      message.nodeBody = { $case: "sink", sink: SinkNode.fromPartial(object.nodeBody.sink) };
-    }
-    if (
-      object.nodeBody?.$case === "expand" && object.nodeBody?.expand !== undefined && object.nodeBody?.expand !== null
-    ) {
-      message.nodeBody = { $case: "expand", expand: ExpandNode.fromPartial(object.nodeBody.expand) };
-    }
-    if (
-      object.nodeBody?.$case === "dynamicFilter" &&
-      object.nodeBody?.dynamicFilter !== undefined &&
-      object.nodeBody?.dynamicFilter !== null
-    ) {
-      message.nodeBody = {
-        $case: "dynamicFilter",
-        dynamicFilter: DynamicFilterNode.fromPartial(object.nodeBody.dynamicFilter),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "projectSet" &&
-      object.nodeBody?.projectSet !== undefined &&
-      object.nodeBody?.projectSet !== null
-    ) {
-      message.nodeBody = { $case: "projectSet", projectSet: ProjectSetNode.fromPartial(object.nodeBody.projectSet) };
-    }
-    if (
-      object.nodeBody?.$case === "groupTopN" &&
-      object.nodeBody?.groupTopN !== undefined &&
-      object.nodeBody?.groupTopN !== null
-    ) {
-      message.nodeBody = { $case: "groupTopN", groupTopN: GroupTopNNode.fromPartial(object.nodeBody.groupTopN) };
-    }
-    if (object.nodeBody?.$case === "sort" && object.nodeBody?.sort !== undefined && object.nodeBody?.sort !== null) {
-      message.nodeBody = { $case: "sort", sort: SortNode.fromPartial(object.nodeBody.sort) };
-    }
-    if (
-      object.nodeBody?.$case === "watermarkFilter" &&
-      object.nodeBody?.watermarkFilter !== undefined &&
-      object.nodeBody?.watermarkFilter !== null
-    ) {
-      message.nodeBody = {
-        $case: "watermarkFilter",
-        watermarkFilter: WatermarkFilterNode.fromPartial(object.nodeBody.watermarkFilter),
-      };
-    }
-    if (object.nodeBody?.$case === "dml" && object.nodeBody?.dml !== undefined && object.nodeBody?.dml !== null) {
-      message.nodeBody = { $case: "dml", dml: DmlNode.fromPartial(object.nodeBody.dml) };
-    }
-    if (
-      object.nodeBody?.$case === "rowIdGen" &&
-      object.nodeBody?.rowIdGen !== undefined &&
-      object.nodeBody?.rowIdGen !== null
-    ) {
-      message.nodeBody = { $case: "rowIdGen", rowIdGen: RowIdGenNode.fromPartial(object.nodeBody.rowIdGen) };
-    }
-    if (object.nodeBody?.$case === "now" && object.nodeBody?.now !== undefined && object.nodeBody?.now !== null) {
-      message.nodeBody = { $case: "now", now: NowNode.fromPartial(object.nodeBody.now) };
-    }
-    if (
-      object.nodeBody?.$case === "appendOnlyGroupTopN" &&
-      object.nodeBody?.appendOnlyGroupTopN !== undefined &&
-      object.nodeBody?.appendOnlyGroupTopN !== null
-    ) {
-      message.nodeBody = {
-        $case: "appendOnlyGroupTopN",
-        appendOnlyGroupTopN: GroupTopNNode.fromPartial(object.nodeBody.appendOnlyGroupTopN),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "temporalJoin" &&
-      object.nodeBody?.temporalJoin !== undefined &&
-      object.nodeBody?.temporalJoin !== null
-    ) {
-      message.nodeBody = {
-        $case: "temporalJoin",
-        temporalJoin: TemporalJoinNode.fromPartial(object.nodeBody.temporalJoin),
-      };
-    }
-    if (
-      object.nodeBody?.$case === "barrierRecv" &&
-      object.nodeBody?.barrierRecv !== undefined &&
-      object.nodeBody?.barrierRecv !== null
-    ) {
-      message.nodeBody = {
-        $case: "barrierRecv",
-        barrierRecv: BarrierRecvNode.fromPartial(object.nodeBody.barrierRecv),
-      };
-    }
-    message.operatorId = object.operatorId ?? 0;
-    message.input = object.input?.map((e) => StreamNode.fromPartial(e)) || [];
-    message.streamKey = object.streamKey?.map((e) => e) || [];
-    message.appendOnly = object.appendOnly ?? false;
-    message.identity = object.identity ?? "";
-    message.fields = object.fields?.map((e) => Field.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseDispatchStrategy(): DispatchStrategy {
-  return { type: DispatcherType.UNSPECIFIED, distKeyIndices: [], outputIndices: [] };
-}
-
-export const DispatchStrategy = {
-  fromJSON(object: any): DispatchStrategy {
-    return {
-      type: isSet(object.type) ? dispatcherTypeFromJSON(object.type) : DispatcherType.UNSPECIFIED,
-      distKeyIndices: Array.isArray(object?.distKeyIndices) ? object.distKeyIndices.map((e: any) => Number(e)) : [],
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: DispatchStrategy): unknown {
-    const obj: any = {};
-    message.type !== undefined && (obj.type = dispatcherTypeToJSON(message.type));
-    if (message.distKeyIndices) {
-      obj.distKeyIndices = message.distKeyIndices.map((e) => Math.round(e));
-    } else {
-      obj.distKeyIndices = [];
-    }
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DispatchStrategy>, I>>(object: I): DispatchStrategy {
-    const message = createBaseDispatchStrategy();
-    message.type = object.type ?? DispatcherType.UNSPECIFIED;
-    message.distKeyIndices = object.distKeyIndices?.map((e) => e) || [];
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseDispatcher(): Dispatcher {
-  return {
-    type: DispatcherType.UNSPECIFIED,
-    distKeyIndices: [],
-    outputIndices: [],
-    hashMapping: undefined,
-    dispatcherId: 0,
-    downstreamActorId: [],
-  };
-}
-
-export const Dispatcher = {
-  fromJSON(object: any): Dispatcher {
-    return {
-      type: isSet(object.type) ? dispatcherTypeFromJSON(object.type) : DispatcherType.UNSPECIFIED,
-      distKeyIndices: Array.isArray(object?.distKeyIndices) ? object.distKeyIndices.map((e: any) => Number(e)) : [],
-      outputIndices: Array.isArray(object?.outputIndices) ? object.outputIndices.map((e: any) => Number(e)) : [],
-      hashMapping: isSet(object.hashMapping) ? ActorMapping.fromJSON(object.hashMapping) : undefined,
-      dispatcherId: isSet(object.dispatcherId) ? Number(object.dispatcherId) : 0,
-      downstreamActorId: Array.isArray(object?.downstreamActorId)
-        ? object.downstreamActorId.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: Dispatcher): unknown {
-    const obj: any = {};
-    message.type !== undefined && (obj.type = dispatcherTypeToJSON(message.type));
-    if (message.distKeyIndices) {
-      obj.distKeyIndices = message.distKeyIndices.map((e) => Math.round(e));
-    } else {
-      obj.distKeyIndices = [];
-    }
-    if (message.outputIndices) {
-      obj.outputIndices = message.outputIndices.map((e) => Math.round(e));
-    } else {
-      obj.outputIndices = [];
-    }
-    message.hashMapping !== undefined &&
-      (obj.hashMapping = message.hashMapping ? ActorMapping.toJSON(message.hashMapping) : undefined);
-    message.dispatcherId !== undefined && (obj.dispatcherId = Math.round(message.dispatcherId));
-    if (message.downstreamActorId) {
-      obj.downstreamActorId = message.downstreamActorId.map((e) => Math.round(e));
-    } else {
-      obj.downstreamActorId = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<Dispatcher>, I>>(object: I): Dispatcher {
-    const message = createBaseDispatcher();
-    message.type = object.type ?? DispatcherType.UNSPECIFIED;
-    message.distKeyIndices = object.distKeyIndices?.map((e) => e) || [];
-    message.outputIndices = object.outputIndices?.map((e) => e) || [];
-    message.hashMapping = (object.hashMapping !== undefined && object.hashMapping !== null)
-      ? ActorMapping.fromPartial(object.hashMapping)
-      : undefined;
-    message.dispatcherId = object.dispatcherId ?? 0;
-    message.downstreamActorId = object.downstreamActorId?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseStreamActor(): StreamActor {
-  return {
-    actorId: 0,
-    fragmentId: 0,
-    nodes: undefined,
-    dispatcher: [],
-    upstreamActorId: [],
-    vnodeBitmap: undefined,
-    mviewDefinition: "",
-  };
-}
-
-export const StreamActor = {
-  fromJSON(object: any): StreamActor {
-    return {
-      actorId: isSet(object.actorId) ? Number(object.actorId) : 0,
-      fragmentId: isSet(object.fragmentId) ? Number(object.fragmentId) : 0,
-      nodes: isSet(object.nodes) ? StreamNode.fromJSON(object.nodes) : undefined,
-      dispatcher: Array.isArray(object?.dispatcher) ? object.dispatcher.map((e: any) => Dispatcher.fromJSON(e)) : [],
-      upstreamActorId: Array.isArray(object?.upstreamActorId) ? object.upstreamActorId.map((e: any) => Number(e)) : [],
-      vnodeBitmap: isSet(object.vnodeBitmap) ? Buffer.fromJSON(object.vnodeBitmap) : undefined,
-      mviewDefinition: isSet(object.mviewDefinition) ? String(object.mviewDefinition) : "",
-    };
-  },
-
-  toJSON(message: StreamActor): unknown {
-    const obj: any = {};
-    message.actorId !== undefined && (obj.actorId = Math.round(message.actorId));
-    message.fragmentId !== undefined && (obj.fragmentId = Math.round(message.fragmentId));
-    message.nodes !== undefined && (obj.nodes = message.nodes ? StreamNode.toJSON(message.nodes) : undefined);
-    if (message.dispatcher) {
-      obj.dispatcher = message.dispatcher.map((e) => e ? Dispatcher.toJSON(e) : undefined);
-    } else {
-      obj.dispatcher = [];
-    }
-    if (message.upstreamActorId) {
-      obj.upstreamActorId = message.upstreamActorId.map((e) => Math.round(e));
-    } else {
-      obj.upstreamActorId = [];
-    }
-    message.vnodeBitmap !== undefined &&
-      (obj.vnodeBitmap = message.vnodeBitmap ? Buffer.toJSON(message.vnodeBitmap) : undefined);
-    message.mviewDefinition !== undefined && (obj.mviewDefinition = message.mviewDefinition);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamActor>, I>>(object: I): StreamActor {
-    const message = createBaseStreamActor();
-    message.actorId = object.actorId ?? 0;
-    message.fragmentId = object.fragmentId ?? 0;
-    message.nodes = (object.nodes !== undefined && object.nodes !== null)
-      ? StreamNode.fromPartial(object.nodes)
-      : undefined;
-    message.dispatcher = object.dispatcher?.map((e) => Dispatcher.fromPartial(e)) || [];
-    message.upstreamActorId = object.upstreamActorId?.map((e) => e) || [];
-    message.vnodeBitmap = (object.vnodeBitmap !== undefined && object.vnodeBitmap !== null)
-      ? Buffer.fromPartial(object.vnodeBitmap)
-      : undefined;
-    message.mviewDefinition = object.mviewDefinition ?? "";
-    return message;
-  },
-};
-
-function createBaseStreamEnvironment(): StreamEnvironment {
-  return { timezone: "" };
-}
-
-export const StreamEnvironment = {
-  fromJSON(object: any): StreamEnvironment {
-    return { timezone: isSet(object.timezone) ? String(object.timezone) : "" };
-  },
-
-  toJSON(message: StreamEnvironment): unknown {
-    const obj: any = {};
-    message.timezone !== undefined && (obj.timezone = message.timezone);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamEnvironment>, I>>(object: I): StreamEnvironment {
-    const message = createBaseStreamEnvironment();
-    message.timezone = object.timezone ?? "";
-    return message;
-  },
-};
-
-function createBaseStreamFragmentGraph(): StreamFragmentGraph {
-  return { fragments: {}, edges: [], dependentRelationIds: [], tableIdsCnt: 0, env: undefined, parallelism: undefined };
-}
-
-export const StreamFragmentGraph = {
-  fromJSON(object: any): StreamFragmentGraph {
-    return {
-      fragments: isObject(object.fragments)
-        ? Object.entries(object.fragments).reduce<{ [key: number]: StreamFragmentGraph_StreamFragment }>(
-          (acc, [key, value]) => {
-            acc[Number(key)] = StreamFragmentGraph_StreamFragment.fromJSON(value);
-            return acc;
-          },
-          {},
-        )
-        : {},
-      edges: Array.isArray(object?.edges)
-        ? object.edges.map((e: any) => StreamFragmentGraph_StreamFragmentEdge.fromJSON(e))
-        : [],
-      dependentRelationIds: Array.isArray(object?.dependentRelationIds)
-        ? object.dependentRelationIds.map((e: any) => Number(e))
-        : [],
-      tableIdsCnt: isSet(object.tableIdsCnt) ? Number(object.tableIdsCnt) : 0,
-      env: isSet(object.env) ? StreamEnvironment.fromJSON(object.env) : undefined,
-      parallelism: isSet(object.parallelism) ? StreamFragmentGraph_Parallelism.fromJSON(object.parallelism) : undefined,
-    };
-  },
-
-  toJSON(message: StreamFragmentGraph): unknown {
-    const obj: any = {};
-    obj.fragments = {};
-    if (message.fragments) {
-      Object.entries(message.fragments).forEach(([k, v]) => {
-        obj.fragments[k] = StreamFragmentGraph_StreamFragment.toJSON(v);
-      });
-    }
-    if (message.edges) {
-      obj.edges = message.edges.map((e) => e ? StreamFragmentGraph_StreamFragmentEdge.toJSON(e) : undefined);
-    } else {
-      obj.edges = [];
-    }
-    if (message.dependentRelationIds) {
-      obj.dependentRelationIds = message.dependentRelationIds.map((e) => Math.round(e));
-    } else {
-      obj.dependentRelationIds = [];
-    }
-    message.tableIdsCnt !== undefined && (obj.tableIdsCnt = Math.round(message.tableIdsCnt));
-    message.env !== undefined && (obj.env = message.env ? StreamEnvironment.toJSON(message.env) : undefined);
-    message.parallelism !== undefined &&
-      (obj.parallelism = message.parallelism ? StreamFragmentGraph_Parallelism.toJSON(message.parallelism) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamFragmentGraph>, I>>(object: I): StreamFragmentGraph {
-    const message = createBaseStreamFragmentGraph();
-    message.fragments = Object.entries(object.fragments ?? {}).reduce<
-      { [key: number]: StreamFragmentGraph_StreamFragment }
-    >((acc, [key, value]) => {
-      if (value !== undefined) {
-        acc[Number(key)] = StreamFragmentGraph_StreamFragment.fromPartial(value);
-      }
-      return acc;
-    }, {});
-    message.edges = object.edges?.map((e) => StreamFragmentGraph_StreamFragmentEdge.fromPartial(e)) || [];
-    message.dependentRelationIds = object.dependentRelationIds?.map((e) => e) || [];
-    message.tableIdsCnt = object.tableIdsCnt ?? 0;
-    message.env = (object.env !== undefined && object.env !== null)
-      ? StreamEnvironment.fromPartial(object.env)
-      : undefined;
-    message.parallelism = (object.parallelism !== undefined && object.parallelism !== null)
-      ? StreamFragmentGraph_Parallelism.fromPartial(object.parallelism)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseStreamFragmentGraph_StreamFragment(): StreamFragmentGraph_StreamFragment {
-  return {
-    fragmentId: 0,
-    node: undefined,
-    fragmentTypeMask: 0,
-    requiresSingleton: false,
-    tableIdsCnt: 0,
-    upstreamTableIds: [],
-  };
-}
-
-export const StreamFragmentGraph_StreamFragment = {
-  fromJSON(object: any): StreamFragmentGraph_StreamFragment {
-    return {
-      fragmentId: isSet(object.fragmentId) ? Number(object.fragmentId) : 0,
-      node: isSet(object.node) ? StreamNode.fromJSON(object.node) : undefined,
-      fragmentTypeMask: isSet(object.fragmentTypeMask) ? Number(object.fragmentTypeMask) : 0,
-      requiresSingleton: isSet(object.requiresSingleton) ? Boolean(object.requiresSingleton) : false,
-      tableIdsCnt: isSet(object.tableIdsCnt) ? Number(object.tableIdsCnt) : 0,
-      upstreamTableIds: Array.isArray(object?.upstreamTableIds)
-        ? object.upstreamTableIds.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: StreamFragmentGraph_StreamFragment): unknown {
-    const obj: any = {};
-    message.fragmentId !== undefined && (obj.fragmentId = Math.round(message.fragmentId));
-    message.node !== undefined && (obj.node = message.node ? StreamNode.toJSON(message.node) : undefined);
-    message.fragmentTypeMask !== undefined && (obj.fragmentTypeMask = Math.round(message.fragmentTypeMask));
-    message.requiresSingleton !== undefined && (obj.requiresSingleton = message.requiresSingleton);
-    message.tableIdsCnt !== undefined && (obj.tableIdsCnt = Math.round(message.tableIdsCnt));
-    if (message.upstreamTableIds) {
-      obj.upstreamTableIds = message.upstreamTableIds.map((e) => Math.round(e));
-    } else {
-      obj.upstreamTableIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamFragmentGraph_StreamFragment>, I>>(
-    object: I,
-  ): StreamFragmentGraph_StreamFragment {
-    const message = createBaseStreamFragmentGraph_StreamFragment();
-    message.fragmentId = object.fragmentId ?? 0;
-    message.node = (object.node !== undefined && object.node !== null)
-      ? StreamNode.fromPartial(object.node)
-      : undefined;
-    message.fragmentTypeMask = object.fragmentTypeMask ?? 0;
-    message.requiresSingleton = object.requiresSingleton ?? false;
-    message.tableIdsCnt = object.tableIdsCnt ?? 0;
-    message.upstreamTableIds = object.upstreamTableIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseStreamFragmentGraph_StreamFragmentEdge(): StreamFragmentGraph_StreamFragmentEdge {
-  return { dispatchStrategy: undefined, linkId: 0, upstreamId: 0, downstreamId: 0 };
-}
-
-export const StreamFragmentGraph_StreamFragmentEdge = {
-  fromJSON(object: any): StreamFragmentGraph_StreamFragmentEdge {
-    return {
-      dispatchStrategy: isSet(object.dispatchStrategy) ? DispatchStrategy.fromJSON(object.dispatchStrategy) : undefined,
-      linkId: isSet(object.linkId) ? Number(object.linkId) : 0,
-      upstreamId: isSet(object.upstreamId) ? Number(object.upstreamId) : 0,
-      downstreamId: isSet(object.downstreamId) ? Number(object.downstreamId) : 0,
-    };
-  },
-
-  toJSON(message: StreamFragmentGraph_StreamFragmentEdge): unknown {
-    const obj: any = {};
-    message.dispatchStrategy !== undefined &&
-      (obj.dispatchStrategy = message.dispatchStrategy ? DispatchStrategy.toJSON(message.dispatchStrategy) : undefined);
-    message.linkId !== undefined && (obj.linkId = Math.round(message.linkId));
-    message.upstreamId !== undefined && (obj.upstreamId = Math.round(message.upstreamId));
-    message.downstreamId !== undefined && (obj.downstreamId = Math.round(message.downstreamId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamFragmentGraph_StreamFragmentEdge>, I>>(
-    object: I,
-  ): StreamFragmentGraph_StreamFragmentEdge {
-    const message = createBaseStreamFragmentGraph_StreamFragmentEdge();
-    message.dispatchStrategy = (object.dispatchStrategy !== undefined && object.dispatchStrategy !== null)
-      ? DispatchStrategy.fromPartial(object.dispatchStrategy)
-      : undefined;
-    message.linkId = object.linkId ?? 0;
-    message.upstreamId = object.upstreamId ?? 0;
-    message.downstreamId = object.downstreamId ?? 0;
-    return message;
-  },
-};
-
-function createBaseStreamFragmentGraph_Parallelism(): StreamFragmentGraph_Parallelism {
-  return { parallelism: 0 };
-}
-
-export const StreamFragmentGraph_Parallelism = {
-  fromJSON(object: any): StreamFragmentGraph_Parallelism {
-    return { parallelism: isSet(object.parallelism) ? Number(object.parallelism) : 0 };
-  },
-
-  toJSON(message: StreamFragmentGraph_Parallelism): unknown {
-    const obj: any = {};
-    message.parallelism !== undefined && (obj.parallelism = Math.round(message.parallelism));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamFragmentGraph_Parallelism>, I>>(
-    object: I,
-  ): StreamFragmentGraph_Parallelism {
-    const message = createBaseStreamFragmentGraph_Parallelism();
-    message.parallelism = object.parallelism ?? 0;
-    return message;
-  },
-};
-
-function createBaseStreamFragmentGraph_FragmentsEntry(): StreamFragmentGraph_FragmentsEntry {
-  return { key: 0, value: undefined };
-}
-
-export const StreamFragmentGraph_FragmentsEntry = {
-  fromJSON(object: any): StreamFragmentGraph_FragmentsEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? StreamFragmentGraph_StreamFragment.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: StreamFragmentGraph_FragmentsEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined &&
-      (obj.value = message.value ? StreamFragmentGraph_StreamFragment.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<StreamFragmentGraph_FragmentsEntry>, I>>(
-    object: I,
-  ): StreamFragmentGraph_FragmentsEntry {
-    const message = createBaseStreamFragmentGraph_FragmentsEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? StreamFragmentGraph_StreamFragment.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-declare var self: any | undefined;
-declare var window: any | undefined;
-declare var global: any | undefined;
-var globalThis: any = (() => {
-  if (typeof globalThis !== "undefined") {
-    return globalThis;
-  }
-  if (typeof self !== "undefined") {
-    return self;
-  }
-  if (typeof window !== "undefined") {
-    return window;
-  }
-  if (typeof global !== "undefined") {
-    return global;
-  }
-  throw "Unable to locate global object";
-})();
-
-function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-
-function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin: string[] = [];
-    arr.forEach((byte) => {
-      bin.push(String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null;
-}
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/stream_service.ts b/dashboard/proto/gen/stream_service.ts
deleted file mode 100644
index 2740cb287c6b2..0000000000000
--- a/dashboard/proto/gen/stream_service.ts
+++ /dev/null
@@ -1,725 +0,0 @@
-/* eslint-disable */
-import { ActorInfo, Status } from "./common";
-import { SstableInfo, TableStats } from "./hummock";
-import { Barrier, StreamActor } from "./stream_plan";
-
-export const protobufPackage = "stream_service";
-
-/** Describe the fragments which will be running on this node */
-export interface UpdateActorsRequest {
-  requestId: string;
-  actors: StreamActor[];
-}
-
-export interface UpdateActorsResponse {
-  status: Status | undefined;
-}
-
-export interface BroadcastActorInfoTableRequest {
-  info: ActorInfo[];
-}
-
-/** Create channels and gRPC connections for a fragment */
-export interface BuildActorsRequest {
-  requestId: string;
-  actorId: number[];
-}
-
-export interface BuildActorsResponse {
-  requestId: string;
-  status: Status | undefined;
-}
-
-export interface DropActorsRequest {
-  requestId: string;
-  actorIds: number[];
-}
-
-export interface DropActorsResponse {
-  requestId: string;
-  status: Status | undefined;
-}
-
-export interface ForceStopActorsRequest {
-  requestId: string;
-}
-
-export interface ForceStopActorsResponse {
-  requestId: string;
-  status: Status | undefined;
-}
-
-export interface InjectBarrierRequest {
-  requestId: string;
-  barrier: Barrier | undefined;
-  actorIdsToSend: number[];
-  actorIdsToCollect: number[];
-}
-
-export interface InjectBarrierResponse {
-  requestId: string;
-  status: Status | undefined;
-}
-
-export interface BarrierCompleteRequest {
-  requestId: string;
-  prevEpoch: number;
-}
-
-export interface BarrierCompleteResponse {
-  requestId: string;
-  status: Status | undefined;
-  createMviewProgress: BarrierCompleteResponse_CreateMviewProgress[];
-  syncedSstables: BarrierCompleteResponse_GroupedSstableInfo[];
-  workerId: number;
-}
-
-export interface BarrierCompleteResponse_CreateMviewProgress {
-  chainActorId: number;
-  done: boolean;
-  consumedEpoch: number;
-  consumedRows: number;
-}
-
-export interface BarrierCompleteResponse_GroupedSstableInfo {
-  compactionGroupId: number;
-  sst: SstableInfo | undefined;
-  tableStatsMap: { [key: number]: TableStats };
-}
-
-export interface BarrierCompleteResponse_GroupedSstableInfo_TableStatsMapEntry {
-  key: number;
-  value: TableStats | undefined;
-}
-
-/** Before starting streaming, the leader node broadcast the actor-host table to needed workers. */
-export interface BroadcastActorInfoTableResponse {
-  status: Status | undefined;
-}
-
-export interface WaitEpochCommitRequest {
-  epoch: number;
-}
-
-export interface WaitEpochCommitResponse {
-  status: Status | undefined;
-}
-
-function createBaseUpdateActorsRequest(): UpdateActorsRequest {
-  return { requestId: "", actors: [] };
-}
-
-export const UpdateActorsRequest = {
-  fromJSON(object: any): UpdateActorsRequest {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      actors: Array.isArray(object?.actors) ? object.actors.map((e: any) => StreamActor.fromJSON(e)) : [],
-    };
-  },
-
-  toJSON(message: UpdateActorsRequest): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    if (message.actors) {
-      obj.actors = message.actors.map((e) => e ? StreamActor.toJSON(e) : undefined);
-    } else {
-      obj.actors = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateActorsRequest>, I>>(object: I): UpdateActorsRequest {
-    const message = createBaseUpdateActorsRequest();
-    message.requestId = object.requestId ?? "";
-    message.actors = object.actors?.map((e) => StreamActor.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseUpdateActorsResponse(): UpdateActorsResponse {
-  return { status: undefined };
-}
-
-export const UpdateActorsResponse = {
-  fromJSON(object: any): UpdateActorsResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: UpdateActorsResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateActorsResponse>, I>>(object: I): UpdateActorsResponse {
-    const message = createBaseUpdateActorsResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseBroadcastActorInfoTableRequest(): BroadcastActorInfoTableRequest {
-  return { info: [] };
-}
-
-export const BroadcastActorInfoTableRequest = {
-  fromJSON(object: any): BroadcastActorInfoTableRequest {
-    return { info: Array.isArray(object?.info) ? object.info.map((e: any) => ActorInfo.fromJSON(e)) : [] };
-  },
-
-  toJSON(message: BroadcastActorInfoTableRequest): unknown {
-    const obj: any = {};
-    if (message.info) {
-      obj.info = message.info.map((e) => e ? ActorInfo.toJSON(e) : undefined);
-    } else {
-      obj.info = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BroadcastActorInfoTableRequest>, I>>(
-    object: I,
-  ): BroadcastActorInfoTableRequest {
-    const message = createBaseBroadcastActorInfoTableRequest();
-    message.info = object.info?.map((e) => ActorInfo.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseBuildActorsRequest(): BuildActorsRequest {
-  return { requestId: "", actorId: [] };
-}
-
-export const BuildActorsRequest = {
-  fromJSON(object: any): BuildActorsRequest {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      actorId: Array.isArray(object?.actorId) ? object.actorId.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: BuildActorsRequest): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    if (message.actorId) {
-      obj.actorId = message.actorId.map((e) => Math.round(e));
-    } else {
-      obj.actorId = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BuildActorsRequest>, I>>(object: I): BuildActorsRequest {
-    const message = createBaseBuildActorsRequest();
-    message.requestId = object.requestId ?? "";
-    message.actorId = object.actorId?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseBuildActorsResponse(): BuildActorsResponse {
-  return { requestId: "", status: undefined };
-}
-
-export const BuildActorsResponse = {
-  fromJSON(object: any): BuildActorsResponse {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-    };
-  },
-
-  toJSON(message: BuildActorsResponse): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BuildActorsResponse>, I>>(object: I): BuildActorsResponse {
-    const message = createBaseBuildActorsResponse();
-    message.requestId = object.requestId ?? "";
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseDropActorsRequest(): DropActorsRequest {
-  return { requestId: "", actorIds: [] };
-}
-
-export const DropActorsRequest = {
-  fromJSON(object: any): DropActorsRequest {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      actorIds: Array.isArray(object?.actorIds) ? object.actorIds.map((e: any) => Number(e)) : [],
-    };
-  },
-
-  toJSON(message: DropActorsRequest): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    if (message.actorIds) {
-      obj.actorIds = message.actorIds.map((e) => Math.round(e));
-    } else {
-      obj.actorIds = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropActorsRequest>, I>>(object: I): DropActorsRequest {
-    const message = createBaseDropActorsRequest();
-    message.requestId = object.requestId ?? "";
-    message.actorIds = object.actorIds?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseDropActorsResponse(): DropActorsResponse {
-  return { requestId: "", status: undefined };
-}
-
-export const DropActorsResponse = {
-  fromJSON(object: any): DropActorsResponse {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-    };
-  },
-
-  toJSON(message: DropActorsResponse): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropActorsResponse>, I>>(object: I): DropActorsResponse {
-    const message = createBaseDropActorsResponse();
-    message.requestId = object.requestId ?? "";
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseForceStopActorsRequest(): ForceStopActorsRequest {
-  return { requestId: "" };
-}
-
-export const ForceStopActorsRequest = {
-  fromJSON(object: any): ForceStopActorsRequest {
-    return { requestId: isSet(object.requestId) ? String(object.requestId) : "" };
-  },
-
-  toJSON(message: ForceStopActorsRequest): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ForceStopActorsRequest>, I>>(object: I): ForceStopActorsRequest {
-    const message = createBaseForceStopActorsRequest();
-    message.requestId = object.requestId ?? "";
-    return message;
-  },
-};
-
-function createBaseForceStopActorsResponse(): ForceStopActorsResponse {
-  return { requestId: "", status: undefined };
-}
-
-export const ForceStopActorsResponse = {
-  fromJSON(object: any): ForceStopActorsResponse {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-    };
-  },
-
-  toJSON(message: ForceStopActorsResponse): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ForceStopActorsResponse>, I>>(object: I): ForceStopActorsResponse {
-    const message = createBaseForceStopActorsResponse();
-    message.requestId = object.requestId ?? "";
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseInjectBarrierRequest(): InjectBarrierRequest {
-  return { requestId: "", barrier: undefined, actorIdsToSend: [], actorIdsToCollect: [] };
-}
-
-export const InjectBarrierRequest = {
-  fromJSON(object: any): InjectBarrierRequest {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      barrier: isSet(object.barrier) ? Barrier.fromJSON(object.barrier) : undefined,
-      actorIdsToSend: Array.isArray(object?.actorIdsToSend) ? object.actorIdsToSend.map((e: any) => Number(e)) : [],
-      actorIdsToCollect: Array.isArray(object?.actorIdsToCollect)
-        ? object.actorIdsToCollect.map((e: any) => Number(e))
-        : [],
-    };
-  },
-
-  toJSON(message: InjectBarrierRequest): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    message.barrier !== undefined && (obj.barrier = message.barrier ? Barrier.toJSON(message.barrier) : undefined);
-    if (message.actorIdsToSend) {
-      obj.actorIdsToSend = message.actorIdsToSend.map((e) => Math.round(e));
-    } else {
-      obj.actorIdsToSend = [];
-    }
-    if (message.actorIdsToCollect) {
-      obj.actorIdsToCollect = message.actorIdsToCollect.map((e) => Math.round(e));
-    } else {
-      obj.actorIdsToCollect = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<InjectBarrierRequest>, I>>(object: I): InjectBarrierRequest {
-    const message = createBaseInjectBarrierRequest();
-    message.requestId = object.requestId ?? "";
-    message.barrier = (object.barrier !== undefined && object.barrier !== null)
-      ? Barrier.fromPartial(object.barrier)
-      : undefined;
-    message.actorIdsToSend = object.actorIdsToSend?.map((e) => e) || [];
-    message.actorIdsToCollect = object.actorIdsToCollect?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseInjectBarrierResponse(): InjectBarrierResponse {
-  return { requestId: "", status: undefined };
-}
-
-export const InjectBarrierResponse = {
-  fromJSON(object: any): InjectBarrierResponse {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-    };
-  },
-
-  toJSON(message: InjectBarrierResponse): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<InjectBarrierResponse>, I>>(object: I): InjectBarrierResponse {
-    const message = createBaseInjectBarrierResponse();
-    message.requestId = object.requestId ?? "";
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseBarrierCompleteRequest(): BarrierCompleteRequest {
-  return { requestId: "", prevEpoch: 0 };
-}
-
-export const BarrierCompleteRequest = {
-  fromJSON(object: any): BarrierCompleteRequest {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      prevEpoch: isSet(object.prevEpoch) ? Number(object.prevEpoch) : 0,
-    };
-  },
-
-  toJSON(message: BarrierCompleteRequest): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    message.prevEpoch !== undefined && (obj.prevEpoch = Math.round(message.prevEpoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BarrierCompleteRequest>, I>>(object: I): BarrierCompleteRequest {
-    const message = createBaseBarrierCompleteRequest();
-    message.requestId = object.requestId ?? "";
-    message.prevEpoch = object.prevEpoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseBarrierCompleteResponse(): BarrierCompleteResponse {
-  return { requestId: "", status: undefined, createMviewProgress: [], syncedSstables: [], workerId: 0 };
-}
-
-export const BarrierCompleteResponse = {
-  fromJSON(object: any): BarrierCompleteResponse {
-    return {
-      requestId: isSet(object.requestId) ? String(object.requestId) : "",
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      createMviewProgress: Array.isArray(object?.createMviewProgress)
-        ? object.createMviewProgress.map((e: any) => BarrierCompleteResponse_CreateMviewProgress.fromJSON(e))
-        : [],
-      syncedSstables: Array.isArray(object?.syncedSstables)
-        ? object.syncedSstables.map((e: any) => BarrierCompleteResponse_GroupedSstableInfo.fromJSON(e))
-        : [],
-      workerId: isSet(object.workerId) ? Number(object.workerId) : 0,
-    };
-  },
-
-  toJSON(message: BarrierCompleteResponse): unknown {
-    const obj: any = {};
-    message.requestId !== undefined && (obj.requestId = message.requestId);
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    if (message.createMviewProgress) {
-      obj.createMviewProgress = message.createMviewProgress.map((e) =>
-        e ? BarrierCompleteResponse_CreateMviewProgress.toJSON(e) : undefined
-      );
-    } else {
-      obj.createMviewProgress = [];
-    }
-    if (message.syncedSstables) {
-      obj.syncedSstables = message.syncedSstables.map((e) =>
-        e ? BarrierCompleteResponse_GroupedSstableInfo.toJSON(e) : undefined
-      );
-    } else {
-      obj.syncedSstables = [];
-    }
-    message.workerId !== undefined && (obj.workerId = Math.round(message.workerId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BarrierCompleteResponse>, I>>(object: I): BarrierCompleteResponse {
-    const message = createBaseBarrierCompleteResponse();
-    message.requestId = object.requestId ?? "";
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.createMviewProgress =
-      object.createMviewProgress?.map((e) => BarrierCompleteResponse_CreateMviewProgress.fromPartial(e)) || [];
-    message.syncedSstables =
-      object.syncedSstables?.map((e) => BarrierCompleteResponse_GroupedSstableInfo.fromPartial(e)) || [];
-    message.workerId = object.workerId ?? 0;
-    return message;
-  },
-};
-
-function createBaseBarrierCompleteResponse_CreateMviewProgress(): BarrierCompleteResponse_CreateMviewProgress {
-  return { chainActorId: 0, done: false, consumedEpoch: 0, consumedRows: 0 };
-}
-
-export const BarrierCompleteResponse_CreateMviewProgress = {
-  fromJSON(object: any): BarrierCompleteResponse_CreateMviewProgress {
-    return {
-      chainActorId: isSet(object.chainActorId) ? Number(object.chainActorId) : 0,
-      done: isSet(object.done) ? Boolean(object.done) : false,
-      consumedEpoch: isSet(object.consumedEpoch) ? Number(object.consumedEpoch) : 0,
-      consumedRows: isSet(object.consumedRows) ? Number(object.consumedRows) : 0,
-    };
-  },
-
-  toJSON(message: BarrierCompleteResponse_CreateMviewProgress): unknown {
-    const obj: any = {};
-    message.chainActorId !== undefined && (obj.chainActorId = Math.round(message.chainActorId));
-    message.done !== undefined && (obj.done = message.done);
-    message.consumedEpoch !== undefined && (obj.consumedEpoch = Math.round(message.consumedEpoch));
-    message.consumedRows !== undefined && (obj.consumedRows = Math.round(message.consumedRows));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BarrierCompleteResponse_CreateMviewProgress>, I>>(
-    object: I,
-  ): BarrierCompleteResponse_CreateMviewProgress {
-    const message = createBaseBarrierCompleteResponse_CreateMviewProgress();
-    message.chainActorId = object.chainActorId ?? 0;
-    message.done = object.done ?? false;
-    message.consumedEpoch = object.consumedEpoch ?? 0;
-    message.consumedRows = object.consumedRows ?? 0;
-    return message;
-  },
-};
-
-function createBaseBarrierCompleteResponse_GroupedSstableInfo(): BarrierCompleteResponse_GroupedSstableInfo {
-  return { compactionGroupId: 0, sst: undefined, tableStatsMap: {} };
-}
-
-export const BarrierCompleteResponse_GroupedSstableInfo = {
-  fromJSON(object: any): BarrierCompleteResponse_GroupedSstableInfo {
-    return {
-      compactionGroupId: isSet(object.compactionGroupId) ? Number(object.compactionGroupId) : 0,
-      sst: isSet(object.sst) ? SstableInfo.fromJSON(object.sst) : undefined,
-      tableStatsMap: isObject(object.tableStatsMap)
-        ? Object.entries(object.tableStatsMap).reduce<{ [key: number]: TableStats }>((acc, [key, value]) => {
-          acc[Number(key)] = TableStats.fromJSON(value);
-          return acc;
-        }, {})
-        : {},
-    };
-  },
-
-  toJSON(message: BarrierCompleteResponse_GroupedSstableInfo): unknown {
-    const obj: any = {};
-    message.compactionGroupId !== undefined && (obj.compactionGroupId = Math.round(message.compactionGroupId));
-    message.sst !== undefined && (obj.sst = message.sst ? SstableInfo.toJSON(message.sst) : undefined);
-    obj.tableStatsMap = {};
-    if (message.tableStatsMap) {
-      Object.entries(message.tableStatsMap).forEach(([k, v]) => {
-        obj.tableStatsMap[k] = TableStats.toJSON(v);
-      });
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BarrierCompleteResponse_GroupedSstableInfo>, I>>(
-    object: I,
-  ): BarrierCompleteResponse_GroupedSstableInfo {
-    const message = createBaseBarrierCompleteResponse_GroupedSstableInfo();
-    message.compactionGroupId = object.compactionGroupId ?? 0;
-    message.sst = (object.sst !== undefined && object.sst !== null) ? SstableInfo.fromPartial(object.sst) : undefined;
-    message.tableStatsMap = Object.entries(object.tableStatsMap ?? {}).reduce<{ [key: number]: TableStats }>(
-      (acc, [key, value]) => {
-        if (value !== undefined) {
-          acc[Number(key)] = TableStats.fromPartial(value);
-        }
-        return acc;
-      },
-      {},
-    );
-    return message;
-  },
-};
-
-function createBaseBarrierCompleteResponse_GroupedSstableInfo_TableStatsMapEntry(): BarrierCompleteResponse_GroupedSstableInfo_TableStatsMapEntry {
-  return { key: 0, value: undefined };
-}
-
-export const BarrierCompleteResponse_GroupedSstableInfo_TableStatsMapEntry = {
-  fromJSON(object: any): BarrierCompleteResponse_GroupedSstableInfo_TableStatsMapEntry {
-    return {
-      key: isSet(object.key) ? Number(object.key) : 0,
-      value: isSet(object.value) ? TableStats.fromJSON(object.value) : undefined,
-    };
-  },
-
-  toJSON(message: BarrierCompleteResponse_GroupedSstableInfo_TableStatsMapEntry): unknown {
-    const obj: any = {};
-    message.key !== undefined && (obj.key = Math.round(message.key));
-    message.value !== undefined && (obj.value = message.value ? TableStats.toJSON(message.value) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BarrierCompleteResponse_GroupedSstableInfo_TableStatsMapEntry>, I>>(
-    object: I,
-  ): BarrierCompleteResponse_GroupedSstableInfo_TableStatsMapEntry {
-    const message = createBaseBarrierCompleteResponse_GroupedSstableInfo_TableStatsMapEntry();
-    message.key = object.key ?? 0;
-    message.value = (object.value !== undefined && object.value !== null)
-      ? TableStats.fromPartial(object.value)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseBroadcastActorInfoTableResponse(): BroadcastActorInfoTableResponse {
-  return { status: undefined };
-}
-
-export const BroadcastActorInfoTableResponse = {
-  fromJSON(object: any): BroadcastActorInfoTableResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: BroadcastActorInfoTableResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<BroadcastActorInfoTableResponse>, I>>(
-    object: I,
-  ): BroadcastActorInfoTableResponse {
-    const message = createBaseBroadcastActorInfoTableResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseWaitEpochCommitRequest(): WaitEpochCommitRequest {
-  return { epoch: 0 };
-}
-
-export const WaitEpochCommitRequest = {
-  fromJSON(object: any): WaitEpochCommitRequest {
-    return { epoch: isSet(object.epoch) ? Number(object.epoch) : 0 };
-  },
-
-  toJSON(message: WaitEpochCommitRequest): unknown {
-    const obj: any = {};
-    message.epoch !== undefined && (obj.epoch = Math.round(message.epoch));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<WaitEpochCommitRequest>, I>>(object: I): WaitEpochCommitRequest {
-    const message = createBaseWaitEpochCommitRequest();
-    message.epoch = object.epoch ?? 0;
-    return message;
-  },
-};
-
-function createBaseWaitEpochCommitResponse(): WaitEpochCommitResponse {
-  return { status: undefined };
-}
-
-export const WaitEpochCommitResponse = {
-  fromJSON(object: any): WaitEpochCommitResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: WaitEpochCommitResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<WaitEpochCommitResponse>, I>>(object: I): WaitEpochCommitResponse {
-    const message = createBaseWaitEpochCommitResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isObject(value: any): boolean {
-  return typeof value === "object" && value !== null;
-}
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/task_service.ts b/dashboard/proto/gen/task_service.ts
deleted file mode 100644
index 2cfcb1d49bf04..0000000000000
--- a/dashboard/proto/gen/task_service.ts
+++ /dev/null
@@ -1,544 +0,0 @@
-/* eslint-disable */
-import { PlanFragment, TaskId as TaskId1, TaskOutputId } from "./batch_plan";
-import { BatchQueryEpoch, Status } from "./common";
-import { DataChunk } from "./data";
-import { StreamMessage } from "./stream_plan";
-
-export const protobufPackage = "task_service";
-
-/** Task is a running instance of Stage. */
-export interface TaskId {
-  queryId: string;
-  stageId: number;
-  taskId: number;
-}
-
-export interface TaskInfoResponse {
-  taskId: TaskId1 | undefined;
-  taskStatus: TaskInfoResponse_TaskStatus;
-  /** Optional error message for failed task. */
-  errorMessage: string;
-}
-
-export const TaskInfoResponse_TaskStatus = {
-  /** UNSPECIFIED - Note: Requirement of proto3: first enum must be 0. */
-  UNSPECIFIED: "UNSPECIFIED",
-  PENDING: "PENDING",
-  RUNNING: "RUNNING",
-  FINISHED: "FINISHED",
-  FAILED: "FAILED",
-  ABORTED: "ABORTED",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type TaskInfoResponse_TaskStatus = typeof TaskInfoResponse_TaskStatus[keyof typeof TaskInfoResponse_TaskStatus];
-
-export function taskInfoResponse_TaskStatusFromJSON(object: any): TaskInfoResponse_TaskStatus {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return TaskInfoResponse_TaskStatus.UNSPECIFIED;
-    case 2:
-    case "PENDING":
-      return TaskInfoResponse_TaskStatus.PENDING;
-    case 3:
-    case "RUNNING":
-      return TaskInfoResponse_TaskStatus.RUNNING;
-    case 6:
-    case "FINISHED":
-      return TaskInfoResponse_TaskStatus.FINISHED;
-    case 7:
-    case "FAILED":
-      return TaskInfoResponse_TaskStatus.FAILED;
-    case 8:
-    case "ABORTED":
-      return TaskInfoResponse_TaskStatus.ABORTED;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return TaskInfoResponse_TaskStatus.UNRECOGNIZED;
-  }
-}
-
-export function taskInfoResponse_TaskStatusToJSON(object: TaskInfoResponse_TaskStatus): string {
-  switch (object) {
-    case TaskInfoResponse_TaskStatus.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case TaskInfoResponse_TaskStatus.PENDING:
-      return "PENDING";
-    case TaskInfoResponse_TaskStatus.RUNNING:
-      return "RUNNING";
-    case TaskInfoResponse_TaskStatus.FINISHED:
-      return "FINISHED";
-    case TaskInfoResponse_TaskStatus.FAILED:
-      return "FAILED";
-    case TaskInfoResponse_TaskStatus.ABORTED:
-      return "ABORTED";
-    case TaskInfoResponse_TaskStatus.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface CreateTaskRequest {
-  taskId: TaskId1 | undefined;
-  plan: PlanFragment | undefined;
-  epoch: BatchQueryEpoch | undefined;
-}
-
-export interface AbortTaskRequest {
-  taskId: TaskId1 | undefined;
-}
-
-export interface AbortTaskResponse {
-  status: Status | undefined;
-}
-
-export interface GetTaskInfoRequest {
-  taskId: TaskId1 | undefined;
-}
-
-export interface GetDataResponse {
-  recordBatch: DataChunk | undefined;
-}
-
-export interface ExecuteRequest {
-  taskId: TaskId1 | undefined;
-  plan: PlanFragment | undefined;
-  epoch: BatchQueryEpoch | undefined;
-}
-
-export interface GetDataRequest {
-  taskOutputId: TaskOutputId | undefined;
-}
-
-export interface GetStreamRequest {
-  value?: { $case: "get"; get: GetStreamRequest_Get } | {
-    $case: "addPermits";
-    addPermits: GetStreamRequest_AddPermits;
-  };
-}
-
-/** The first message, which tells the upstream which channel this exchange stream is for. */
-export interface GetStreamRequest_Get {
-  upActorId: number;
-  downActorId: number;
-  upFragmentId: number;
-  downFragmentId: number;
-}
-
-/** The following messages, which adds the permits back to the upstream to achieve back-pressure. */
-export interface GetStreamRequest_AddPermits {
-  permits: number;
-}
-
-export interface GetStreamResponse {
-  message:
-    | StreamMessage
-    | undefined;
-  /** The number of permits acquired for this message, which should be sent back to the upstream with `AddPermits`. */
-  permits: number;
-}
-
-function createBaseTaskId(): TaskId {
-  return { queryId: "", stageId: 0, taskId: 0 };
-}
-
-export const TaskId = {
-  fromJSON(object: any): TaskId {
-    return {
-      queryId: isSet(object.queryId) ? String(object.queryId) : "",
-      stageId: isSet(object.stageId) ? Number(object.stageId) : 0,
-      taskId: isSet(object.taskId) ? Number(object.taskId) : 0,
-    };
-  },
-
-  toJSON(message: TaskId): unknown {
-    const obj: any = {};
-    message.queryId !== undefined && (obj.queryId = message.queryId);
-    message.stageId !== undefined && (obj.stageId = Math.round(message.stageId));
-    message.taskId !== undefined && (obj.taskId = Math.round(message.taskId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TaskId>, I>>(object: I): TaskId {
-    const message = createBaseTaskId();
-    message.queryId = object.queryId ?? "";
-    message.stageId = object.stageId ?? 0;
-    message.taskId = object.taskId ?? 0;
-    return message;
-  },
-};
-
-function createBaseTaskInfoResponse(): TaskInfoResponse {
-  return { taskId: undefined, taskStatus: TaskInfoResponse_TaskStatus.UNSPECIFIED, errorMessage: "" };
-}
-
-export const TaskInfoResponse = {
-  fromJSON(object: any): TaskInfoResponse {
-    return {
-      taskId: isSet(object.taskId) ? TaskId1.fromJSON(object.taskId) : undefined,
-      taskStatus: isSet(object.taskStatus)
-        ? taskInfoResponse_TaskStatusFromJSON(object.taskStatus)
-        : TaskInfoResponse_TaskStatus.UNSPECIFIED,
-      errorMessage: isSet(object.errorMessage) ? String(object.errorMessage) : "",
-    };
-  },
-
-  toJSON(message: TaskInfoResponse): unknown {
-    const obj: any = {};
-    message.taskId !== undefined && (obj.taskId = message.taskId ? TaskId1.toJSON(message.taskId) : undefined);
-    message.taskStatus !== undefined && (obj.taskStatus = taskInfoResponse_TaskStatusToJSON(message.taskStatus));
-    message.errorMessage !== undefined && (obj.errorMessage = message.errorMessage);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<TaskInfoResponse>, I>>(object: I): TaskInfoResponse {
-    const message = createBaseTaskInfoResponse();
-    message.taskId = (object.taskId !== undefined && object.taskId !== null)
-      ? TaskId1.fromPartial(object.taskId)
-      : undefined;
-    message.taskStatus = object.taskStatus ?? TaskInfoResponse_TaskStatus.UNSPECIFIED;
-    message.errorMessage = object.errorMessage ?? "";
-    return message;
-  },
-};
-
-function createBaseCreateTaskRequest(): CreateTaskRequest {
-  return { taskId: undefined, plan: undefined, epoch: undefined };
-}
-
-export const CreateTaskRequest = {
-  fromJSON(object: any): CreateTaskRequest {
-    return {
-      taskId: isSet(object.taskId) ? TaskId1.fromJSON(object.taskId) : undefined,
-      plan: isSet(object.plan) ? PlanFragment.fromJSON(object.plan) : undefined,
-      epoch: isSet(object.epoch) ? BatchQueryEpoch.fromJSON(object.epoch) : undefined,
-    };
-  },
-
-  toJSON(message: CreateTaskRequest): unknown {
-    const obj: any = {};
-    message.taskId !== undefined && (obj.taskId = message.taskId ? TaskId1.toJSON(message.taskId) : undefined);
-    message.plan !== undefined && (obj.plan = message.plan ? PlanFragment.toJSON(message.plan) : undefined);
-    message.epoch !== undefined && (obj.epoch = message.epoch ? BatchQueryEpoch.toJSON(message.epoch) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateTaskRequest>, I>>(object: I): CreateTaskRequest {
-    const message = createBaseCreateTaskRequest();
-    message.taskId = (object.taskId !== undefined && object.taskId !== null)
-      ? TaskId1.fromPartial(object.taskId)
-      : undefined;
-    message.plan = (object.plan !== undefined && object.plan !== null)
-      ? PlanFragment.fromPartial(object.plan)
-      : undefined;
-    message.epoch = (object.epoch !== undefined && object.epoch !== null)
-      ? BatchQueryEpoch.fromPartial(object.epoch)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseAbortTaskRequest(): AbortTaskRequest {
-  return { taskId: undefined };
-}
-
-export const AbortTaskRequest = {
-  fromJSON(object: any): AbortTaskRequest {
-    return { taskId: isSet(object.taskId) ? TaskId1.fromJSON(object.taskId) : undefined };
-  },
-
-  toJSON(message: AbortTaskRequest): unknown {
-    const obj: any = {};
-    message.taskId !== undefined && (obj.taskId = message.taskId ? TaskId1.toJSON(message.taskId) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AbortTaskRequest>, I>>(object: I): AbortTaskRequest {
-    const message = createBaseAbortTaskRequest();
-    message.taskId = (object.taskId !== undefined && object.taskId !== null)
-      ? TaskId1.fromPartial(object.taskId)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseAbortTaskResponse(): AbortTaskResponse {
-  return { status: undefined };
-}
-
-export const AbortTaskResponse = {
-  fromJSON(object: any): AbortTaskResponse {
-    return { status: isSet(object.status) ? Status.fromJSON(object.status) : undefined };
-  },
-
-  toJSON(message: AbortTaskResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AbortTaskResponse>, I>>(object: I): AbortTaskResponse {
-    const message = createBaseAbortTaskResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseGetTaskInfoRequest(): GetTaskInfoRequest {
-  return { taskId: undefined };
-}
-
-export const GetTaskInfoRequest = {
-  fromJSON(object: any): GetTaskInfoRequest {
-    return { taskId: isSet(object.taskId) ? TaskId1.fromJSON(object.taskId) : undefined };
-  },
-
-  toJSON(message: GetTaskInfoRequest): unknown {
-    const obj: any = {};
-    message.taskId !== undefined && (obj.taskId = message.taskId ? TaskId1.toJSON(message.taskId) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetTaskInfoRequest>, I>>(object: I): GetTaskInfoRequest {
-    const message = createBaseGetTaskInfoRequest();
-    message.taskId = (object.taskId !== undefined && object.taskId !== null)
-      ? TaskId1.fromPartial(object.taskId)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseGetDataResponse(): GetDataResponse {
-  return { recordBatch: undefined };
-}
-
-export const GetDataResponse = {
-  fromJSON(object: any): GetDataResponse {
-    return { recordBatch: isSet(object.recordBatch) ? DataChunk.fromJSON(object.recordBatch) : undefined };
-  },
-
-  toJSON(message: GetDataResponse): unknown {
-    const obj: any = {};
-    message.recordBatch !== undefined &&
-      (obj.recordBatch = message.recordBatch ? DataChunk.toJSON(message.recordBatch) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetDataResponse>, I>>(object: I): GetDataResponse {
-    const message = createBaseGetDataResponse();
-    message.recordBatch = (object.recordBatch !== undefined && object.recordBatch !== null)
-      ? DataChunk.fromPartial(object.recordBatch)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseExecuteRequest(): ExecuteRequest {
-  return { taskId: undefined, plan: undefined, epoch: undefined };
-}
-
-export const ExecuteRequest = {
-  fromJSON(object: any): ExecuteRequest {
-    return {
-      taskId: isSet(object.taskId) ? TaskId1.fromJSON(object.taskId) : undefined,
-      plan: isSet(object.plan) ? PlanFragment.fromJSON(object.plan) : undefined,
-      epoch: isSet(object.epoch) ? BatchQueryEpoch.fromJSON(object.epoch) : undefined,
-    };
-  },
-
-  toJSON(message: ExecuteRequest): unknown {
-    const obj: any = {};
-    message.taskId !== undefined && (obj.taskId = message.taskId ? TaskId1.toJSON(message.taskId) : undefined);
-    message.plan !== undefined && (obj.plan = message.plan ? PlanFragment.toJSON(message.plan) : undefined);
-    message.epoch !== undefined && (obj.epoch = message.epoch ? BatchQueryEpoch.toJSON(message.epoch) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ExecuteRequest>, I>>(object: I): ExecuteRequest {
-    const message = createBaseExecuteRequest();
-    message.taskId = (object.taskId !== undefined && object.taskId !== null)
-      ? TaskId1.fromPartial(object.taskId)
-      : undefined;
-    message.plan = (object.plan !== undefined && object.plan !== null)
-      ? PlanFragment.fromPartial(object.plan)
-      : undefined;
-    message.epoch = (object.epoch !== undefined && object.epoch !== null)
-      ? BatchQueryEpoch.fromPartial(object.epoch)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseGetDataRequest(): GetDataRequest {
-  return { taskOutputId: undefined };
-}
-
-export const GetDataRequest = {
-  fromJSON(object: any): GetDataRequest {
-    return { taskOutputId: isSet(object.taskOutputId) ? TaskOutputId.fromJSON(object.taskOutputId) : undefined };
-  },
-
-  toJSON(message: GetDataRequest): unknown {
-    const obj: any = {};
-    message.taskOutputId !== undefined &&
-      (obj.taskOutputId = message.taskOutputId ? TaskOutputId.toJSON(message.taskOutputId) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetDataRequest>, I>>(object: I): GetDataRequest {
-    const message = createBaseGetDataRequest();
-    message.taskOutputId = (object.taskOutputId !== undefined && object.taskOutputId !== null)
-      ? TaskOutputId.fromPartial(object.taskOutputId)
-      : undefined;
-    return message;
-  },
-};
-
-function createBaseGetStreamRequest(): GetStreamRequest {
-  return { value: undefined };
-}
-
-export const GetStreamRequest = {
-  fromJSON(object: any): GetStreamRequest {
-    return {
-      value: isSet(object.get)
-        ? { $case: "get", get: GetStreamRequest_Get.fromJSON(object.get) }
-        : isSet(object.addPermits)
-        ? { $case: "addPermits", addPermits: GetStreamRequest_AddPermits.fromJSON(object.addPermits) }
-        : undefined,
-    };
-  },
-
-  toJSON(message: GetStreamRequest): unknown {
-    const obj: any = {};
-    message.value?.$case === "get" &&
-      (obj.get = message.value?.get ? GetStreamRequest_Get.toJSON(message.value?.get) : undefined);
-    message.value?.$case === "addPermits" && (obj.addPermits = message.value?.addPermits
-      ? GetStreamRequest_AddPermits.toJSON(message.value?.addPermits)
-      : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetStreamRequest>, I>>(object: I): GetStreamRequest {
-    const message = createBaseGetStreamRequest();
-    if (object.value?.$case === "get" && object.value?.get !== undefined && object.value?.get !== null) {
-      message.value = { $case: "get", get: GetStreamRequest_Get.fromPartial(object.value.get) };
-    }
-    if (
-      object.value?.$case === "addPermits" &&
-      object.value?.addPermits !== undefined &&
-      object.value?.addPermits !== null
-    ) {
-      message.value = {
-        $case: "addPermits",
-        addPermits: GetStreamRequest_AddPermits.fromPartial(object.value.addPermits),
-      };
-    }
-    return message;
-  },
-};
-
-function createBaseGetStreamRequest_Get(): GetStreamRequest_Get {
-  return { upActorId: 0, downActorId: 0, upFragmentId: 0, downFragmentId: 0 };
-}
-
-export const GetStreamRequest_Get = {
-  fromJSON(object: any): GetStreamRequest_Get {
-    return {
-      upActorId: isSet(object.upActorId) ? Number(object.upActorId) : 0,
-      downActorId: isSet(object.downActorId) ? Number(object.downActorId) : 0,
-      upFragmentId: isSet(object.upFragmentId) ? Number(object.upFragmentId) : 0,
-      downFragmentId: isSet(object.downFragmentId) ? Number(object.downFragmentId) : 0,
-    };
-  },
-
-  toJSON(message: GetStreamRequest_Get): unknown {
-    const obj: any = {};
-    message.upActorId !== undefined && (obj.upActorId = Math.round(message.upActorId));
-    message.downActorId !== undefined && (obj.downActorId = Math.round(message.downActorId));
-    message.upFragmentId !== undefined && (obj.upFragmentId = Math.round(message.upFragmentId));
-    message.downFragmentId !== undefined && (obj.downFragmentId = Math.round(message.downFragmentId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetStreamRequest_Get>, I>>(object: I): GetStreamRequest_Get {
-    const message = createBaseGetStreamRequest_Get();
-    message.upActorId = object.upActorId ?? 0;
-    message.downActorId = object.downActorId ?? 0;
-    message.upFragmentId = object.upFragmentId ?? 0;
-    message.downFragmentId = object.downFragmentId ?? 0;
-    return message;
-  },
-};
-
-function createBaseGetStreamRequest_AddPermits(): GetStreamRequest_AddPermits {
-  return { permits: 0 };
-}
-
-export const GetStreamRequest_AddPermits = {
-  fromJSON(object: any): GetStreamRequest_AddPermits {
-    return { permits: isSet(object.permits) ? Number(object.permits) : 0 };
-  },
-
-  toJSON(message: GetStreamRequest_AddPermits): unknown {
-    const obj: any = {};
-    message.permits !== undefined && (obj.permits = Math.round(message.permits));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetStreamRequest_AddPermits>, I>>(object: I): GetStreamRequest_AddPermits {
-    const message = createBaseGetStreamRequest_AddPermits();
-    message.permits = object.permits ?? 0;
-    return message;
-  },
-};
-
-function createBaseGetStreamResponse(): GetStreamResponse {
-  return { message: undefined, permits: 0 };
-}
-
-export const GetStreamResponse = {
-  fromJSON(object: any): GetStreamResponse {
-    return {
-      message: isSet(object.message) ? StreamMessage.fromJSON(object.message) : undefined,
-      permits: isSet(object.permits) ? Number(object.permits) : 0,
-    };
-  },
-
-  toJSON(message: GetStreamResponse): unknown {
-    const obj: any = {};
-    message.message !== undefined &&
-      (obj.message = message.message ? StreamMessage.toJSON(message.message) : undefined);
-    message.permits !== undefined && (obj.permits = Math.round(message.permits));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GetStreamResponse>, I>>(object: I): GetStreamResponse {
-    const message = createBaseGetStreamResponse();
-    message.message = (object.message !== undefined && object.message !== null)
-      ? StreamMessage.fromPartial(object.message)
-      : undefined;
-    message.permits = object.permits ?? 0;
-    return message;
-  },
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/proto/gen/user.ts b/dashboard/proto/gen/user.ts
deleted file mode 100644
index cdf9070d84258..0000000000000
--- a/dashboard/proto/gen/user.ts
+++ /dev/null
@@ -1,889 +0,0 @@
-/* eslint-disable */
-import { Status } from "./common";
-
-export const protobufPackage = "user";
-
-/** AuthInfo is the information required to login to a server. */
-export interface AuthInfo {
-  encryptionType: AuthInfo_EncryptionType;
-  encryptedValue: Uint8Array;
-}
-
-export const AuthInfo_EncryptionType = {
-  UNSPECIFIED: "UNSPECIFIED",
-  PLAINTEXT: "PLAINTEXT",
-  SHA256: "SHA256",
-  MD5: "MD5",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type AuthInfo_EncryptionType = typeof AuthInfo_EncryptionType[keyof typeof AuthInfo_EncryptionType];
-
-export function authInfo_EncryptionTypeFromJSON(object: any): AuthInfo_EncryptionType {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return AuthInfo_EncryptionType.UNSPECIFIED;
-    case 1:
-    case "PLAINTEXT":
-      return AuthInfo_EncryptionType.PLAINTEXT;
-    case 2:
-    case "SHA256":
-      return AuthInfo_EncryptionType.SHA256;
-    case 3:
-    case "MD5":
-      return AuthInfo_EncryptionType.MD5;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return AuthInfo_EncryptionType.UNRECOGNIZED;
-  }
-}
-
-export function authInfo_EncryptionTypeToJSON(object: AuthInfo_EncryptionType): string {
-  switch (object) {
-    case AuthInfo_EncryptionType.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case AuthInfo_EncryptionType.PLAINTEXT:
-      return "PLAINTEXT";
-    case AuthInfo_EncryptionType.SHA256:
-      return "SHA256";
-    case AuthInfo_EncryptionType.MD5:
-      return "MD5";
-    case AuthInfo_EncryptionType.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-/** User defines a user in the system. */
-export interface UserInfo {
-  id: number;
-  name: string;
-  isSuper: boolean;
-  canCreateDb: boolean;
-  canCreateUser: boolean;
-  canLogin: boolean;
-  authInfo:
-    | AuthInfo
-    | undefined;
-  /** / Granted privileges will be only updated through the command of GRANT/REVOKE. */
-  grantPrivileges: GrantPrivilege[];
-}
-
-/** GrantPrivilege defines a privilege granted to a user. */
-export interface GrantPrivilege {
-  object?:
-    | { $case: "databaseId"; databaseId: number }
-    | { $case: "schemaId"; schemaId: number }
-    | { $case: "tableId"; tableId: number }
-    | { $case: "sourceId"; sourceId: number }
-    | { $case: "sinkId"; sinkId: number }
-    | { $case: "viewId"; viewId: number }
-    | { $case: "functionId"; functionId: number }
-    | { $case: "allTablesSchemaId"; allTablesSchemaId: number }
-    | { $case: "allSourcesSchemaId"; allSourcesSchemaId: number };
-  actionWithOpts: GrantPrivilege_ActionWithGrantOption[];
-}
-
-export const GrantPrivilege_Action = {
-  UNSPECIFIED: "UNSPECIFIED",
-  SELECT: "SELECT",
-  INSERT: "INSERT",
-  UPDATE: "UPDATE",
-  DELETE: "DELETE",
-  CREATE: "CREATE",
-  CONNECT: "CONNECT",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type GrantPrivilege_Action = typeof GrantPrivilege_Action[keyof typeof GrantPrivilege_Action];
-
-export function grantPrivilege_ActionFromJSON(object: any): GrantPrivilege_Action {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return GrantPrivilege_Action.UNSPECIFIED;
-    case 1:
-    case "SELECT":
-      return GrantPrivilege_Action.SELECT;
-    case 2:
-    case "INSERT":
-      return GrantPrivilege_Action.INSERT;
-    case 3:
-    case "UPDATE":
-      return GrantPrivilege_Action.UPDATE;
-    case 4:
-    case "DELETE":
-      return GrantPrivilege_Action.DELETE;
-    case 5:
-    case "CREATE":
-      return GrantPrivilege_Action.CREATE;
-    case 6:
-    case "CONNECT":
-      return GrantPrivilege_Action.CONNECT;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return GrantPrivilege_Action.UNRECOGNIZED;
-  }
-}
-
-export function grantPrivilege_ActionToJSON(object: GrantPrivilege_Action): string {
-  switch (object) {
-    case GrantPrivilege_Action.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case GrantPrivilege_Action.SELECT:
-      return "SELECT";
-    case GrantPrivilege_Action.INSERT:
-      return "INSERT";
-    case GrantPrivilege_Action.UPDATE:
-      return "UPDATE";
-    case GrantPrivilege_Action.DELETE:
-      return "DELETE";
-    case GrantPrivilege_Action.CREATE:
-      return "CREATE";
-    case GrantPrivilege_Action.CONNECT:
-      return "CONNECT";
-    case GrantPrivilege_Action.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface GrantPrivilege_ActionWithGrantOption {
-  action: GrantPrivilege_Action;
-  withGrantOption: boolean;
-  grantedBy: number;
-}
-
-export interface CreateUserRequest {
-  user: UserInfo | undefined;
-}
-
-export interface CreateUserResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface DropUserRequest {
-  userId: number;
-}
-
-export interface DropUserResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface UpdateUserRequest {
-  user: UserInfo | undefined;
-  updateFields: UpdateUserRequest_UpdateField[];
-}
-
-export const UpdateUserRequest_UpdateField = {
-  UNSPECIFIED: "UNSPECIFIED",
-  SUPER: "SUPER",
-  LOGIN: "LOGIN",
-  CREATE_DB: "CREATE_DB",
-  AUTH_INFO: "AUTH_INFO",
-  RENAME: "RENAME",
-  CREATE_USER: "CREATE_USER",
-  UNRECOGNIZED: "UNRECOGNIZED",
-} as const;
-
-export type UpdateUserRequest_UpdateField =
-  typeof UpdateUserRequest_UpdateField[keyof typeof UpdateUserRequest_UpdateField];
-
-export function updateUserRequest_UpdateFieldFromJSON(object: any): UpdateUserRequest_UpdateField {
-  switch (object) {
-    case 0:
-    case "UNSPECIFIED":
-      return UpdateUserRequest_UpdateField.UNSPECIFIED;
-    case 1:
-    case "SUPER":
-      return UpdateUserRequest_UpdateField.SUPER;
-    case 2:
-    case "LOGIN":
-      return UpdateUserRequest_UpdateField.LOGIN;
-    case 3:
-    case "CREATE_DB":
-      return UpdateUserRequest_UpdateField.CREATE_DB;
-    case 4:
-    case "AUTH_INFO":
-      return UpdateUserRequest_UpdateField.AUTH_INFO;
-    case 5:
-    case "RENAME":
-      return UpdateUserRequest_UpdateField.RENAME;
-    case 6:
-    case "CREATE_USER":
-      return UpdateUserRequest_UpdateField.CREATE_USER;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return UpdateUserRequest_UpdateField.UNRECOGNIZED;
-  }
-}
-
-export function updateUserRequest_UpdateFieldToJSON(object: UpdateUserRequest_UpdateField): string {
-  switch (object) {
-    case UpdateUserRequest_UpdateField.UNSPECIFIED:
-      return "UNSPECIFIED";
-    case UpdateUserRequest_UpdateField.SUPER:
-      return "SUPER";
-    case UpdateUserRequest_UpdateField.LOGIN:
-      return "LOGIN";
-    case UpdateUserRequest_UpdateField.CREATE_DB:
-      return "CREATE_DB";
-    case UpdateUserRequest_UpdateField.AUTH_INFO:
-      return "AUTH_INFO";
-    case UpdateUserRequest_UpdateField.RENAME:
-      return "RENAME";
-    case UpdateUserRequest_UpdateField.CREATE_USER:
-      return "CREATE_USER";
-    case UpdateUserRequest_UpdateField.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-export interface UpdateUserResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface GrantPrivilegeRequest {
-  userIds: number[];
-  privileges: GrantPrivilege[];
-  withGrantOption: boolean;
-  grantedBy: number;
-}
-
-export interface GrantPrivilegeResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-export interface RevokePrivilegeRequest {
-  userIds: number[];
-  privileges: GrantPrivilege[];
-  grantedBy: number;
-  revokeBy: number;
-  revokeGrantOption: boolean;
-  cascade: boolean;
-}
-
-export interface RevokePrivilegeResponse {
-  status: Status | undefined;
-  version: number;
-}
-
-function createBaseAuthInfo(): AuthInfo {
-  return { encryptionType: AuthInfo_EncryptionType.UNSPECIFIED, encryptedValue: new Uint8Array() };
-}
-
-export const AuthInfo = {
-  fromJSON(object: any): AuthInfo {
-    return {
-      encryptionType: isSet(object.encryptionType)
-        ? authInfo_EncryptionTypeFromJSON(object.encryptionType)
-        : AuthInfo_EncryptionType.UNSPECIFIED,
-      encryptedValue: isSet(object.encryptedValue) ? bytesFromBase64(object.encryptedValue) : new Uint8Array(),
-    };
-  },
-
-  toJSON(message: AuthInfo): unknown {
-    const obj: any = {};
-    message.encryptionType !== undefined &&
-      (obj.encryptionType = authInfo_EncryptionTypeToJSON(message.encryptionType));
-    message.encryptedValue !== undefined &&
-      (obj.encryptedValue = base64FromBytes(
-        message.encryptedValue !== undefined ? message.encryptedValue : new Uint8Array(),
-      ));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AuthInfo>, I>>(object: I): AuthInfo {
-    const message = createBaseAuthInfo();
-    message.encryptionType = object.encryptionType ?? AuthInfo_EncryptionType.UNSPECIFIED;
-    message.encryptedValue = object.encryptedValue ?? new Uint8Array();
-    return message;
-  },
-};
-
-function createBaseUserInfo(): UserInfo {
-  return {
-    id: 0,
-    name: "",
-    isSuper: false,
-    canCreateDb: false,
-    canCreateUser: false,
-    canLogin: false,
-    authInfo: undefined,
-    grantPrivileges: [],
-  };
-}
-
-export const UserInfo = {
-  fromJSON(object: any): UserInfo {
-    return {
-      id: isSet(object.id) ? Number(object.id) : 0,
-      name: isSet(object.name) ? String(object.name) : "",
-      isSuper: isSet(object.isSuper) ? Boolean(object.isSuper) : false,
-      canCreateDb: isSet(object.canCreateDb) ? Boolean(object.canCreateDb) : false,
-      canCreateUser: isSet(object.canCreateUser) ? Boolean(object.canCreateUser) : false,
-      canLogin: isSet(object.canLogin) ? Boolean(object.canLogin) : false,
-      authInfo: isSet(object.authInfo) ? AuthInfo.fromJSON(object.authInfo) : undefined,
-      grantPrivileges: Array.isArray(object?.grantPrivileges)
-        ? object.grantPrivileges.map((e: any) => GrantPrivilege.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: UserInfo): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = Math.round(message.id));
-    message.name !== undefined && (obj.name = message.name);
-    message.isSuper !== undefined && (obj.isSuper = message.isSuper);
-    message.canCreateDb !== undefined && (obj.canCreateDb = message.canCreateDb);
-    message.canCreateUser !== undefined && (obj.canCreateUser = message.canCreateUser);
-    message.canLogin !== undefined && (obj.canLogin = message.canLogin);
-    message.authInfo !== undefined && (obj.authInfo = message.authInfo ? AuthInfo.toJSON(message.authInfo) : undefined);
-    if (message.grantPrivileges) {
-      obj.grantPrivileges = message.grantPrivileges.map((e) => e ? GrantPrivilege.toJSON(e) : undefined);
-    } else {
-      obj.grantPrivileges = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UserInfo>, I>>(object: I): UserInfo {
-    const message = createBaseUserInfo();
-    message.id = object.id ?? 0;
-    message.name = object.name ?? "";
-    message.isSuper = object.isSuper ?? false;
-    message.canCreateDb = object.canCreateDb ?? false;
-    message.canCreateUser = object.canCreateUser ?? false;
-    message.canLogin = object.canLogin ?? false;
-    message.authInfo = (object.authInfo !== undefined && object.authInfo !== null)
-      ? AuthInfo.fromPartial(object.authInfo)
-      : undefined;
-    message.grantPrivileges = object.grantPrivileges?.map((e) => GrantPrivilege.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseGrantPrivilege(): GrantPrivilege {
-  return { object: undefined, actionWithOpts: [] };
-}
-
-export const GrantPrivilege = {
-  fromJSON(object: any): GrantPrivilege {
-    return {
-      object: isSet(object.databaseId)
-        ? { $case: "databaseId", databaseId: Number(object.databaseId) }
-        : isSet(object.schemaId)
-        ? { $case: "schemaId", schemaId: Number(object.schemaId) }
-        : isSet(object.tableId)
-        ? { $case: "tableId", tableId: Number(object.tableId) }
-        : isSet(object.sourceId)
-        ? { $case: "sourceId", sourceId: Number(object.sourceId) }
-        : isSet(object.sinkId)
-        ? { $case: "sinkId", sinkId: Number(object.sinkId) }
-        : isSet(object.viewId)
-        ? { $case: "viewId", viewId: Number(object.viewId) }
-        : isSet(object.functionId)
-        ? { $case: "functionId", functionId: Number(object.functionId) }
-        : isSet(object.allTablesSchemaId)
-        ? { $case: "allTablesSchemaId", allTablesSchemaId: Number(object.allTablesSchemaId) }
-        : isSet(object.allSourcesSchemaId)
-        ? { $case: "allSourcesSchemaId", allSourcesSchemaId: Number(object.allSourcesSchemaId) }
-        : undefined,
-      actionWithOpts: Array.isArray(object?.actionWithOpts)
-        ? object.actionWithOpts.map((e: any) => GrantPrivilege_ActionWithGrantOption.fromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: GrantPrivilege): unknown {
-    const obj: any = {};
-    message.object?.$case === "databaseId" && (obj.databaseId = Math.round(message.object?.databaseId));
-    message.object?.$case === "schemaId" && (obj.schemaId = Math.round(message.object?.schemaId));
-    message.object?.$case === "tableId" && (obj.tableId = Math.round(message.object?.tableId));
-    message.object?.$case === "sourceId" && (obj.sourceId = Math.round(message.object?.sourceId));
-    message.object?.$case === "sinkId" && (obj.sinkId = Math.round(message.object?.sinkId));
-    message.object?.$case === "viewId" && (obj.viewId = Math.round(message.object?.viewId));
-    message.object?.$case === "functionId" && (obj.functionId = Math.round(message.object?.functionId));
-    message.object?.$case === "allTablesSchemaId" &&
-      (obj.allTablesSchemaId = Math.round(message.object?.allTablesSchemaId));
-    message.object?.$case === "allSourcesSchemaId" &&
-      (obj.allSourcesSchemaId = Math.round(message.object?.allSourcesSchemaId));
-    if (message.actionWithOpts) {
-      obj.actionWithOpts = message.actionWithOpts.map((e) =>
-        e ? GrantPrivilege_ActionWithGrantOption.toJSON(e) : undefined
-      );
-    } else {
-      obj.actionWithOpts = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GrantPrivilege>, I>>(object: I): GrantPrivilege {
-    const message = createBaseGrantPrivilege();
-    if (
-      object.object?.$case === "databaseId" &&
-      object.object?.databaseId !== undefined &&
-      object.object?.databaseId !== null
-    ) {
-      message.object = { $case: "databaseId", databaseId: object.object.databaseId };
-    }
-    if (
-      object.object?.$case === "schemaId" && object.object?.schemaId !== undefined && object.object?.schemaId !== null
-    ) {
-      message.object = { $case: "schemaId", schemaId: object.object.schemaId };
-    }
-    if (object.object?.$case === "tableId" && object.object?.tableId !== undefined && object.object?.tableId !== null) {
-      message.object = { $case: "tableId", tableId: object.object.tableId };
-    }
-    if (
-      object.object?.$case === "sourceId" && object.object?.sourceId !== undefined && object.object?.sourceId !== null
-    ) {
-      message.object = { $case: "sourceId", sourceId: object.object.sourceId };
-    }
-    if (object.object?.$case === "sinkId" && object.object?.sinkId !== undefined && object.object?.sinkId !== null) {
-      message.object = { $case: "sinkId", sinkId: object.object.sinkId };
-    }
-    if (object.object?.$case === "viewId" && object.object?.viewId !== undefined && object.object?.viewId !== null) {
-      message.object = { $case: "viewId", viewId: object.object.viewId };
-    }
-    if (
-      object.object?.$case === "functionId" &&
-      object.object?.functionId !== undefined &&
-      object.object?.functionId !== null
-    ) {
-      message.object = { $case: "functionId", functionId: object.object.functionId };
-    }
-    if (
-      object.object?.$case === "allTablesSchemaId" &&
-      object.object?.allTablesSchemaId !== undefined &&
-      object.object?.allTablesSchemaId !== null
-    ) {
-      message.object = { $case: "allTablesSchemaId", allTablesSchemaId: object.object.allTablesSchemaId };
-    }
-    if (
-      object.object?.$case === "allSourcesSchemaId" &&
-      object.object?.allSourcesSchemaId !== undefined &&
-      object.object?.allSourcesSchemaId !== null
-    ) {
-      message.object = { $case: "allSourcesSchemaId", allSourcesSchemaId: object.object.allSourcesSchemaId };
-    }
-    message.actionWithOpts = object.actionWithOpts?.map((e) => GrantPrivilege_ActionWithGrantOption.fromPartial(e)) ||
-      [];
-    return message;
-  },
-};
-
-function createBaseGrantPrivilege_ActionWithGrantOption(): GrantPrivilege_ActionWithGrantOption {
-  return { action: GrantPrivilege_Action.UNSPECIFIED, withGrantOption: false, grantedBy: 0 };
-}
-
-export const GrantPrivilege_ActionWithGrantOption = {
-  fromJSON(object: any): GrantPrivilege_ActionWithGrantOption {
-    return {
-      action: isSet(object.action) ? grantPrivilege_ActionFromJSON(object.action) : GrantPrivilege_Action.UNSPECIFIED,
-      withGrantOption: isSet(object.withGrantOption) ? Boolean(object.withGrantOption) : false,
-      grantedBy: isSet(object.grantedBy) ? Number(object.grantedBy) : 0,
-    };
-  },
-
-  toJSON(message: GrantPrivilege_ActionWithGrantOption): unknown {
-    const obj: any = {};
-    message.action !== undefined && (obj.action = grantPrivilege_ActionToJSON(message.action));
-    message.withGrantOption !== undefined && (obj.withGrantOption = message.withGrantOption);
-    message.grantedBy !== undefined && (obj.grantedBy = Math.round(message.grantedBy));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GrantPrivilege_ActionWithGrantOption>, I>>(
-    object: I,
-  ): GrantPrivilege_ActionWithGrantOption {
-    const message = createBaseGrantPrivilege_ActionWithGrantOption();
-    message.action = object.action ?? GrantPrivilege_Action.UNSPECIFIED;
-    message.withGrantOption = object.withGrantOption ?? false;
-    message.grantedBy = object.grantedBy ?? 0;
-    return message;
-  },
-};
-
-function createBaseCreateUserRequest(): CreateUserRequest {
-  return { user: undefined };
-}
-
-export const CreateUserRequest = {
-  fromJSON(object: any): CreateUserRequest {
-    return { user: isSet(object.user) ? UserInfo.fromJSON(object.user) : undefined };
-  },
-
-  toJSON(message: CreateUserRequest): unknown {
-    const obj: any = {};
-    message.user !== undefined && (obj.user = message.user ? UserInfo.toJSON(message.user) : undefined);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateUserRequest>, I>>(object: I): CreateUserRequest {
-    const message = createBaseCreateUserRequest();
-    message.user = (object.user !== undefined && object.user !== null) ? UserInfo.fromPartial(object.user) : undefined;
-    return message;
-  },
-};
-
-function createBaseCreateUserResponse(): CreateUserResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const CreateUserResponse = {
-  fromJSON(object: any): CreateUserResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: CreateUserResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<CreateUserResponse>, I>>(object: I): CreateUserResponse {
-    const message = createBaseCreateUserResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropUserRequest(): DropUserRequest {
-  return { userId: 0 };
-}
-
-export const DropUserRequest = {
-  fromJSON(object: any): DropUserRequest {
-    return { userId: isSet(object.userId) ? Number(object.userId) : 0 };
-  },
-
-  toJSON(message: DropUserRequest): unknown {
-    const obj: any = {};
-    message.userId !== undefined && (obj.userId = Math.round(message.userId));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropUserRequest>, I>>(object: I): DropUserRequest {
-    const message = createBaseDropUserRequest();
-    message.userId = object.userId ?? 0;
-    return message;
-  },
-};
-
-function createBaseDropUserResponse(): DropUserResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const DropUserResponse = {
-  fromJSON(object: any): DropUserResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: DropUserResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DropUserResponse>, I>>(object: I): DropUserResponse {
-    const message = createBaseDropUserResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseUpdateUserRequest(): UpdateUserRequest {
-  return { user: undefined, updateFields: [] };
-}
-
-export const UpdateUserRequest = {
-  fromJSON(object: any): UpdateUserRequest {
-    return {
-      user: isSet(object.user) ? UserInfo.fromJSON(object.user) : undefined,
-      updateFields: Array.isArray(object?.updateFields)
-        ? object.updateFields.map((e: any) => updateUserRequest_UpdateFieldFromJSON(e))
-        : [],
-    };
-  },
-
-  toJSON(message: UpdateUserRequest): unknown {
-    const obj: any = {};
-    message.user !== undefined && (obj.user = message.user ? UserInfo.toJSON(message.user) : undefined);
-    if (message.updateFields) {
-      obj.updateFields = message.updateFields.map((e) => updateUserRequest_UpdateFieldToJSON(e));
-    } else {
-      obj.updateFields = [];
-    }
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateUserRequest>, I>>(object: I): UpdateUserRequest {
-    const message = createBaseUpdateUserRequest();
-    message.user = (object.user !== undefined && object.user !== null) ? UserInfo.fromPartial(object.user) : undefined;
-    message.updateFields = object.updateFields?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseUpdateUserResponse(): UpdateUserResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const UpdateUserResponse = {
-  fromJSON(object: any): UpdateUserResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: UpdateUserResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<UpdateUserResponse>, I>>(object: I): UpdateUserResponse {
-    const message = createBaseUpdateUserResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseGrantPrivilegeRequest(): GrantPrivilegeRequest {
-  return { userIds: [], privileges: [], withGrantOption: false, grantedBy: 0 };
-}
-
-export const GrantPrivilegeRequest = {
-  fromJSON(object: any): GrantPrivilegeRequest {
-    return {
-      userIds: Array.isArray(object?.userIds) ? object.userIds.map((e: any) => Number(e)) : [],
-      privileges: Array.isArray(object?.privileges)
-        ? object.privileges.map((e: any) => GrantPrivilege.fromJSON(e))
-        : [],
-      withGrantOption: isSet(object.withGrantOption) ? Boolean(object.withGrantOption) : false,
-      grantedBy: isSet(object.grantedBy) ? Number(object.grantedBy) : 0,
-    };
-  },
-
-  toJSON(message: GrantPrivilegeRequest): unknown {
-    const obj: any = {};
-    if (message.userIds) {
-      obj.userIds = message.userIds.map((e) => Math.round(e));
-    } else {
-      obj.userIds = [];
-    }
-    if (message.privileges) {
-      obj.privileges = message.privileges.map((e) => e ? GrantPrivilege.toJSON(e) : undefined);
-    } else {
-      obj.privileges = [];
-    }
-    message.withGrantOption !== undefined && (obj.withGrantOption = message.withGrantOption);
-    message.grantedBy !== undefined && (obj.grantedBy = Math.round(message.grantedBy));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GrantPrivilegeRequest>, I>>(object: I): GrantPrivilegeRequest {
-    const message = createBaseGrantPrivilegeRequest();
-    message.userIds = object.userIds?.map((e) => e) || [];
-    message.privileges = object.privileges?.map((e) => GrantPrivilege.fromPartial(e)) || [];
-    message.withGrantOption = object.withGrantOption ?? false;
-    message.grantedBy = object.grantedBy ?? 0;
-    return message;
-  },
-};
-
-function createBaseGrantPrivilegeResponse(): GrantPrivilegeResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const GrantPrivilegeResponse = {
-  fromJSON(object: any): GrantPrivilegeResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: GrantPrivilegeResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<GrantPrivilegeResponse>, I>>(object: I): GrantPrivilegeResponse {
-    const message = createBaseGrantPrivilegeResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-function createBaseRevokePrivilegeRequest(): RevokePrivilegeRequest {
-  return { userIds: [], privileges: [], grantedBy: 0, revokeBy: 0, revokeGrantOption: false, cascade: false };
-}
-
-export const RevokePrivilegeRequest = {
-  fromJSON(object: any): RevokePrivilegeRequest {
-    return {
-      userIds: Array.isArray(object?.userIds) ? object.userIds.map((e: any) => Number(e)) : [],
-      privileges: Array.isArray(object?.privileges)
-        ? object.privileges.map((e: any) => GrantPrivilege.fromJSON(e))
-        : [],
-      grantedBy: isSet(object.grantedBy) ? Number(object.grantedBy) : 0,
-      revokeBy: isSet(object.revokeBy) ? Number(object.revokeBy) : 0,
-      revokeGrantOption: isSet(object.revokeGrantOption) ? Boolean(object.revokeGrantOption) : false,
-      cascade: isSet(object.cascade) ? Boolean(object.cascade) : false,
-    };
-  },
-
-  toJSON(message: RevokePrivilegeRequest): unknown {
-    const obj: any = {};
-    if (message.userIds) {
-      obj.userIds = message.userIds.map((e) => Math.round(e));
-    } else {
-      obj.userIds = [];
-    }
-    if (message.privileges) {
-      obj.privileges = message.privileges.map((e) => e ? GrantPrivilege.toJSON(e) : undefined);
-    } else {
-      obj.privileges = [];
-    }
-    message.grantedBy !== undefined && (obj.grantedBy = Math.round(message.grantedBy));
-    message.revokeBy !== undefined && (obj.revokeBy = Math.round(message.revokeBy));
-    message.revokeGrantOption !== undefined && (obj.revokeGrantOption = message.revokeGrantOption);
-    message.cascade !== undefined && (obj.cascade = message.cascade);
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RevokePrivilegeRequest>, I>>(object: I): RevokePrivilegeRequest {
-    const message = createBaseRevokePrivilegeRequest();
-    message.userIds = object.userIds?.map((e) => e) || [];
-    message.privileges = object.privileges?.map((e) => GrantPrivilege.fromPartial(e)) || [];
-    message.grantedBy = object.grantedBy ?? 0;
-    message.revokeBy = object.revokeBy ?? 0;
-    message.revokeGrantOption = object.revokeGrantOption ?? false;
-    message.cascade = object.cascade ?? false;
-    return message;
-  },
-};
-
-function createBaseRevokePrivilegeResponse(): RevokePrivilegeResponse {
-  return { status: undefined, version: 0 };
-}
-
-export const RevokePrivilegeResponse = {
-  fromJSON(object: any): RevokePrivilegeResponse {
-    return {
-      status: isSet(object.status) ? Status.fromJSON(object.status) : undefined,
-      version: isSet(object.version) ? Number(object.version) : 0,
-    };
-  },
-
-  toJSON(message: RevokePrivilegeResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = message.status ? Status.toJSON(message.status) : undefined);
-    message.version !== undefined && (obj.version = Math.round(message.version));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<RevokePrivilegeResponse>, I>>(object: I): RevokePrivilegeResponse {
-    const message = createBaseRevokePrivilegeResponse();
-    message.status = (object.status !== undefined && object.status !== null)
-      ? Status.fromPartial(object.status)
-      : undefined;
-    message.version = object.version ?? 0;
-    return message;
-  },
-};
-
-declare var self: any | undefined;
-declare var window: any | undefined;
-declare var global: any | undefined;
-var globalThis: any = (() => {
-  if (typeof globalThis !== "undefined") {
-    return globalThis;
-  }
-  if (typeof self !== "undefined") {
-    return self;
-  }
-  if (typeof window !== "undefined") {
-    return window;
-  }
-  if (typeof global !== "undefined") {
-    return global;
-  }
-  throw "Unable to locate global object";
-})();
-
-function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-
-function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin: string[] = [];
-    arr.forEach((byte) => {
-      bin.push(String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
diff --git a/dashboard/scripts/generate_proto.sh b/dashboard/scripts/generate_proto.sh
index 860820d56fea1..0ce74084a42aa 100755
--- a/dashboard/scripts/generate_proto.sh
+++ b/dashboard/scripts/generate_proto.sh
@@ -8,11 +8,13 @@ cp -a ../proto/*.proto tmp_gen
 
 # Array in proto will conflict with JavaScript's Array, so we replace it with RwArray.
 if [[ "$OSTYPE" == "darwin"* ]]; then
-    sed -i "" -e "s/Array/RwArray/" "tmp_gen/data.proto" 
+    sed -i "" -e "s/Array/RwArray/" "tmp_gen/data.proto"
 else
-    sed -i -e "s/Array/RwArray/" "tmp_gen/data.proto" 
+    sed -i -e "s/Array/RwArray/" "tmp_gen/data.proto"
 fi
 
+mkdir -p proto/gen
+
 protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto \
     --experimental_allow_proto3_optional \
     --ts_proto_out=proto/gen/ \
diff --git a/docker/Dockerfile b/docker/Dockerfile
index eeb2e8a746185..ed5f0c9e27fcc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -34,8 +34,9 @@ RUN rustup self update \
 
 RUN cargo fetch
 
-RUN cargo build -p risingwave_cmd_all --release --features "static-link static-log-level" && \
+RUN cargo build -p risingwave_cmd_all -p risingwave_java_binding --release --features "static-link static-log-level" && \
   mkdir -p /risingwave/bin && mv /risingwave/target/release/risingwave /risingwave/bin/ && \
+  mkdir -p /risingwave/lib && mv /risingwave/target/release/librisingwave_java_binding.so /risingwave/lib && \
   cargo clean
 
 RUN cd /risingwave/java && mvn -B package -Dmaven.test.skip=true && \
@@ -47,10 +48,13 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install ca-certi
 
 FROM image-base as risingwave
 LABEL org.opencontainers.image.source https://github.com/risingwavelabs/risingwave
-RUN mkdir -p /risingwave/bin/connector-node
+RUN mkdir -p /risingwave/bin/connector-node && mkdir -p /risingwave/lib
 COPY --from=builder /risingwave/bin/risingwave /risingwave/bin/risingwave
 COPY --from=builder /risingwave/bin/connector-node /risingwave/bin/connector-node
 COPY --from=builder /risingwave/ui /risingwave/ui
+COPY --from=builder /risingwave/lib/librisingwave_java_binding.so /risingwave/lib/librisingwave_java_binding.so
+# Set java.library.path env to /risingwave/lib
+ENV RW_JAVA_BINDING_LIB_PATH /risingwave/lib
 # Set default playground mode to docker-playground profile
 ENV PLAYGROUND_PROFILE docker-playground
 # Set default dashboard UI to local path instead of github proxy
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 461cad59cb2ab..3a422809599fc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -13,8 +13,6 @@ services:
       - "0.0.0.0:1260"
       - "--metrics-level"
       - "1"
-      - "--state-store"
-      - "hummock+minio://hummockadmin:hummockadmin@minio-0:9301/hummock001"
       - "--meta-address"
       - "http://meta-node-0:5690"
       - "--config-path"
@@ -30,6 +28,8 @@ services:
       - "./risingwave.toml:/risingwave.toml"
     environment:
       RUST_BACKTRACE: "1"
+      # If ENABLE_TELEMETRY is not set, telemetry will start by default
+      ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
     container_name: compactor-0
     healthcheck:
       test:
@@ -52,8 +52,6 @@ services:
       - "0.0.0.0:1222"
       - "--metrics-level"
       - "1"
-      - "--state-store"
-      - "hummock+minio://hummockadmin:hummockadmin@minio-0:9301/hummock001"
       - "--meta-address"
       - "http://meta-node-0:5690"
       - "--connector-rpc-endpoint"
@@ -71,6 +69,8 @@ services:
       - "./risingwave.toml:/risingwave.toml"
     environment:
       RUST_BACKTRACE: "1"
+      # If ENABLE_TELEMETRY is not set, telemetry will start by default
+      ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
     container_name: compute-node-0
     healthcheck:
       test:
@@ -150,6 +150,8 @@ services:
       - "./risingwave.toml:/risingwave.toml"
     environment:
       RUST_BACKTRACE: "1"
+      # If ENABLE_TELEMETRY is not set, telemetry will start by default
+      ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
     container_name: frontend-node-0
     healthcheck:
       test:
@@ -203,6 +205,8 @@ services:
       - "etcd-0:2388"
       - "--connector-rpc-endpoint"
       - "connector-node:50051"
+      - "--state-store"
+      - "hummock+minio://hummockadmin:hummockadmin@minio-0:9301/hummock001"
       - "--config-path"
       - /risingwave.toml
     expose:
@@ -218,6 +222,8 @@ services:
       - "./risingwave.toml:/risingwave.toml"
     environment:
       RUST_BACKTRACE: "1"
+      # If ENABLE_TELEMETRY is not set, telemetry will start by default
+      ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
     container_name: meta-node-0
     healthcheck:
       test:
@@ -246,7 +252,17 @@ services:
     depends_on: []
     volumes:
       - "minio-0:/data"
-    entrypoint: "\n/bin/sh -c '\nset -e\nmkdir -p \"/data/hummock001\"\n/usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\"\n'"
+    entrypoint: "
+
+      /bin/sh -c '
+
+      set -e
+
+      mkdir -p \"/data/hummock001\"
+
+      /usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\"
+
+      '"
     environment:
       MINIO_CI_CD: "1"
       MINIO_PROMETHEUS_AUTH_TYPE: public
diff --git a/docs/developer-guide.md b/docs/developer-guide.md
index ba144ea04d983..2d517092682c8 100644
--- a/docs/developer-guide.md
+++ b/docs/developer-guide.md
@@ -72,7 +72,7 @@ RiseDev is the development mode of RisingWave. To develop RisingWave, you need t
 * OpenSSL
 * PostgreSQL (psql) (>= 14.1)
 * Tmux (>= v3.2a)
-* LLVM 15 (To workaround some bugs in macOS toolchain, see https://github.com/risingwavelabs/risingwave/issues/6205).
+* LLVM 15 (For macOS only, to workaround some bugs in macOS toolchain. See https://github.com/risingwavelabs/risingwave/issues/6205).
 
 To install the dependencies on macOS, run:
 
@@ -90,6 +90,10 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 
 Then you'll be able to compile and start RiseDev!
 
+> **Note**
+>
+> `.cargo/config.toml` contains `rustflags` configurations like `-Clink-arg` and `-Ctarget-feature`. Since it will be [merged](https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure) with `$HOME/.cargo/config.toml`, check the config files and make sure they don't conflict if you have global `rustflags` configurations for e.g. linker there.
+
 ## Start and monitor a dev cluster
 
 You can now build RiseDev and start a dev cluster. It is as simple as:
diff --git a/e2e_test/batch/aggregate/array_agg.slt.part b/e2e_test/batch/aggregate/array_agg.slt.part
index 4403d8089aa56..537af2eab3dc0 100644
--- a/e2e_test/batch/aggregate/array_agg.slt.part
+++ b/e2e_test/batch/aggregate/array_agg.slt.part
@@ -2,7 +2,7 @@ statement ok
 SET RW_IMPLICIT_FLUSH TO true;
 
 statement ok
-create table t(v1 varchar, v2 int, v3 int)
+create table t(v1 varchar, v2 int, v3 int);
 
 query T
 select array_agg(v1) from t;
@@ -18,10 +18,7 @@ select array_agg(v1) from t;
 {NULL}
 
 statement ok
-delete from t;
-
-statement ok
-insert into t values ('aaa', 1, 1), ('bbb', 0, 2), ('ccc', 0, 5), ('ddd', 1, 4)
+insert into t values ('aaa', 1, 1), ('bbb', 0, 2), ('ccc', 0, 5), ('ddd', 1, 4);
 
 query T
 select b from (select unnest(a) from (select array_agg(v3) as v3_arr from t) g(a)) p(b) order by b;
@@ -30,16 +27,22 @@ select b from (select unnest(a) from (select array_agg(v3) as v3_arr from t) g(a
 2
 4
 5
+NULL
+
+query T
+select array_agg(v1 order by v3 asc nulls first) from t;
+----
+{NULL,aaa,bbb,ddd,ccc}
 
 query T
-select array_agg(v1 order by v3 desc) from t
+select array_agg(v1 order by v3 desc) from t;
 ----
-{ccc,ddd,bbb,aaa}
+{NULL,ccc,ddd,bbb,aaa}
 
 query T
-select array_agg(v1 order by v2 asc, v3 desc) from t
+select array_agg(v1 order by v2 asc nulls last, v3 desc) from t;
 ----
-{ccc,bbb,ddd,aaa}
+{ccc,bbb,ddd,aaa,NULL}
 
 statement ok
-drop table t
+drop table t;
diff --git a/e2e_test/batch/aggregate/sum.slt.part b/e2e_test/batch/aggregate/sum.slt.part
index 7d847e4a2f81a..dd5529e3f8bfa 100644
--- a/e2e_test/batch/aggregate/sum.slt.part
+++ b/e2e_test/batch/aggregate/sum.slt.part
@@ -77,7 +77,7 @@ select sum(d) from t;
 statement ok
 insert into t values (9000000000000000000000000000);
 
-statement error QueryError: Expr error: Numeric out of range
+statement error Expr error: Numeric out of range
 select sum(d) from t;
 
 statement ok
diff --git a/e2e_test/batch/basic/func.slt.part b/e2e_test/batch/basic/func.slt.part
index b928c1b0ded0e..f7b57ae0d41e1 100644
--- a/e2e_test/batch/basic/func.slt.part
+++ b/e2e_test/batch/basic/func.slt.part
@@ -284,6 +284,9 @@ select pg_typeof(array[array[1, 2], array[3, 4]]);
 ----
 integer[][]
 
+query error unexpected arguments number
+select pg_typeof();
+
 query I
 select count(current_database());
 ----
diff --git a/e2e_test/batch/basic/generate_series.slt.part b/e2e_test/batch/basic/generate_series.slt.part
index c65272bdbd44c..28420214d37c7 100644
--- a/e2e_test/batch/basic/generate_series.slt.part
+++ b/e2e_test/batch/basic/generate_series.slt.part
@@ -87,3 +87,7 @@ SELECT * FROM generate_series('2'::INT,'10'::INT,'0'::INT);
 query I
 SELECT * FROM generate_series('2'::INT,'10'::INT,'-2'::INT);
 ----
+
+query I
+SELECT * FROM generate_series(1, 100000000, 1) where 1=0;
+----
diff --git a/e2e_test/batch/basic/index.slt.part b/e2e_test/batch/basic/index.slt.part
index 0077867023710..a45cd724bb451 100644
--- a/e2e_test/batch/basic/index.slt.part
+++ b/e2e_test/batch/basic/index.slt.part
@@ -11,23 +11,23 @@ statement ok
 create index idx2 on t1(v2);
 
 statement ok
-insert into t1 values(1, 2),(3,4),(5,6);
+insert into t1 values (1, 2), (3, 4), (5, 6);
 
 statement ok
-explain select v1,v2 from t1 where v1 = 1;
+explain select v1, v2 from t1 where v1 = 1;
 
 query II
-select v1,v2 from t1 where v1 = 1;
+select v1, v2 from t1 where v1 = 1;
 ----
 1 2
 
 query II
-select v1,v2 from t1 where v2 = 4;
+select v1, v2 from t1 where v2 = 4;
 ----
 3 4
 
 query II
-select v1,v2 from t1 where v1 = 1 or v2 = 4 order by v1, v2;
+select v1, v2 from t1 where v1 = 1 or v2 = 4 order by v1, v2;
 ----
 1 2
 3 4
@@ -36,10 +36,57 @@ statement ok
 delete from t1 where v1 = 1;
 
 query II
-select v1,v2 from t1 order by v1, v2;
+select v1, v2 from t1 order by v1, v2;
 ----
 3 4
 5 6
 
+statement ok
+insert into t1 values (NULL, 5);
+
+statement ok
+create index idx3 on t1(v1 desc);
+
+statement ok
+create index idx4 on t1(v1 nulls first);
+
+statement ok
+create index idx5 on t1(v1 desc nulls last);
+
+query II
+select v1, v2 from t1 order by v1;
+----
+3    4
+5    6
+NULL 5
+
+query II
+select v1, v2 from t1 order by v1 desc;
+----
+NULL 5
+5    6
+3    4
+
+query II
+select v1, v2 from t1 order by v1 asc nulls first;
+----
+NULL 5
+3    4
+5    6
+
+query II
+select v1, v2 from t1 order by v1 desc nulls last;
+----
+5    6
+3    4
+NULL 5
+
+query II
+select v1, v2 from t1 order by v1 desc nulls first;
+----
+NULL 5
+5    6
+3    4
+
 statement ok
 drop table t1;
diff --git a/e2e_test/batch/basic/join.slt.part b/e2e_test/batch/basic/join.slt.part
index feeb793ba9e36..cf2ae46dd0772 100644
--- a/e2e_test/batch/basic/join.slt.part
+++ b/e2e_test/batch/basic/join.slt.part
@@ -92,7 +92,7 @@ statement ok
 insert into t values (1),(2),(3),(4),(5);
 
 query I rowsort
-Select * from t join i using(x)
+select * from t join i using(x)
 ----
 1
 2
@@ -100,6 +100,11 @@ Select * from t join i using(x)
 4
 5
 
+query I
+select * from t natural join (select * from t where 1=0);
+----
+
+
 statement ok
 drop index i;
 
diff --git a/e2e_test/batch/basic/order_by.slt.part b/e2e_test/batch/basic/order_by.slt.part
index 670280e8f5fff..3fae22b6386d2 100644
--- a/e2e_test/batch/basic/order_by.slt.part
+++ b/e2e_test/batch/basic/order_by.slt.part
@@ -5,10 +5,10 @@ statement ok
 create table t (v1 int, v2 int, v3 int);
 
 statement ok
-insert into t values (1,4,2), (2,3,3), (3,4,4), (4,3,5)
+insert into t values (1,4,2), (2,3,3), (3,4,4), (4,3,5);
 
 query III rowsort
-select * from t
+select * from t;
 ----
 1 4 2
 2 3 3
@@ -16,7 +16,7 @@ select * from t
 4 3 5
 
 query III
-select * from t order by v1 desc
+select * from t order by v1 desc;
 ----
 4 3 5
 3 4 4
@@ -48,17 +48,17 @@ select * from t order by v1 + v2, v1;
 4 3 5
 
 query III
-select * from t order by v1 desc limit 1
+select * from t order by v1 desc limit 1;
 ----
 4 3 5
 
 query III
-select * from t order by v1 desc limit 1 offset 1
+select * from t order by v1 desc limit 1 offset 1;
 ----
 3 4 4
 
 query III
-select * from t order by v2, v1
+select * from t order by v2, v1;
 ----
 2 3 3
 4 3 5
@@ -66,13 +66,13 @@ select * from t order by v2, v1
 3 4 4
 
 query III
-select * from t order by v2, v1 limit 2
+select * from t order by v2, v1 limit 2;
 ----
 2 3 3
 4 3 5
 
 query III
-select * from t order by v2, v1 limit 10
+select * from t order by v2, v1 limit 10;
 ----
 2 3 3
 4 3 5
@@ -80,7 +80,7 @@ select * from t order by v2, v1 limit 10
 3 4 4
 
 query III
-select * from t order by v2 desc, v1 limit 2
+select * from t order by v2 desc, v1 limit 2;
 ----
 1 4 2
 3 4 4
@@ -94,6 +94,24 @@ select * from t order by v1 limit 2;
 1 4 2
 2 3 3
 
+query III
+select * from t order by v1 asc limit 2;
+----
+1 4 2
+2 3 3
+
+query III
+select * from t order by v1 nulls first limit 2;
+----
+NULL 7 NULL
+1 4 2
+
+query III
+select * from t order by v1 asc nulls last limit 2;
+----
+1 4 2
+2 3 3
+
 query III
 select * from t order by v1 desc limit 7;
 ----
@@ -103,5 +121,23 @@ NULL 7 NULL
 2 3 3
 1 4 2
 
+query III
+select * from t order by v1 desc nulls first limit 7;
+----
+NULL 7 NULL
+4 3 5
+3 4 4
+2 3 3
+1 4 2
+
+query III
+select * from t order by v1 desc nulls last limit 7;
+----
+4 3 5
+3 4 4
+2 3 3
+1 4 2
+NULL 7 NULL
+
 statement ok
 drop table t;
diff --git a/e2e_test/batch/catalog/issue_8791.slt.part b/e2e_test/batch/catalog/issue_8791.slt.part
new file mode 100644
index 0000000000000..b8339c44a23f4
--- /dev/null
+++ b/e2e_test/batch/catalog/issue_8791.slt.part
@@ -0,0 +1,16 @@
+# UNION and other complex queries should also be in local mode
+query I
+SELECT name FROM pg_catalog.pg_settings union select 'a';
+----
+a
+
+query T
+SELECT name FROM  (SELECT pg_catalog.lower(name) AS name FROM pg_catalog.pg_settings UNION ALL SELECT 'session authorization'   UNION ALL SELECT 'all') ss  WHERE substring(name,1,0)=''
+LIMIT 1000
+----
+session authorization
+all
+
+query I
+with q as ( select name FROM pg_catalog.pg_settings ) select * from q;
+----
diff --git a/e2e_test/batch/catalog/sysinfo.slt.part b/e2e_test/batch/catalog/sysinfo.slt.part
index 84dd4ce52a111..9ea526c594e6d 100644
--- a/e2e_test/batch/catalog/sysinfo.slt.part
+++ b/e2e_test/batch/catalog/sysinfo.slt.part
@@ -7,3 +7,8 @@ query T
 SELECT pg_catalog.pg_get_userbyid(1);
 ----
 root
+
+query T
+select (SELECT pg_catalog.pg_get_userbyid(1));
+----
+root
diff --git a/e2e_test/batch/explain.slt b/e2e_test/batch/explain.slt
index 00e735d360aa0..cff6af31f2470 100644
--- a/e2e_test/batch/explain.slt
+++ b/e2e_test/batch/explain.slt
@@ -5,7 +5,7 @@ statement ok
 explain create index i on t(v);
 
 statement ok
-explain create sink sink_t from t with ( connector = 'kafka', format = 'append_only' )
+explain create sink sink_t from t with ( connector = 'kafka', type = 'append-only' )
 
 statement ok
 drop table t;
diff --git a/e2e_test/batch/types/interval.slt.part b/e2e_test/batch/types/interval.slt.part
index bd8972d3167e8..84e436a838087 100644
--- a/e2e_test/batch/types/interval.slt.part
+++ b/e2e_test/batch/types/interval.slt.part
@@ -150,3 +150,18 @@ select '-2562047788:00:54.775808'::interval;
 
 statement error
 select '-2562047788:00:54.775809'::interval;
+
+query T
+select interval '3 mons -3 days' / 2;
+----
+1 mon 14 days -12:00:00
+
+# The following is an overflow bug present in PostgreSQL 15.2
+# Their `days` overflows to a negative value, leading to the latter smaller
+# than the former. We report an error in this case.
+
+statement ok
+select interval '2147483647 mons 2147483647 days' * 0.999999991;
+
+statement error out of range
+select interval '2147483647 mons 2147483647 days' * 0.999999992;
diff --git a/e2e_test/batch/types/temporal_arithmetic.slt.part b/e2e_test/batch/types/temporal_arithmetic.slt.part
index 34e4f40ecc19c..80ef05e1310ab 100644
--- a/e2e_test/batch/types/temporal_arithmetic.slt.part
+++ b/e2e_test/batch/types/temporal_arithmetic.slt.part
@@ -151,7 +151,7 @@ select real '0' * interval '1' second;
 query T
 select real '86' * interval '849884';
 ----
-2 years 4 mons 5 days 22:47:04
+20302:47:04
 
 query T
 select interval '1' second * real '6.1';
@@ -176,7 +176,7 @@ select interval '1' second * real '0';
 query T
 select interval '849884' * real '86';
 ----
-2 years 4 mons 5 days 22:47:04
+20302:47:04
 
 query T
 select '12:30:00'::time * 2;
diff --git a/e2e_test/ddl/alter_rename_relation.slt b/e2e_test/ddl/alter_rename_relation.slt
new file mode 100644
index 0000000000000..486f19713ae19
--- /dev/null
+++ b/e2e_test/ddl/alter_rename_relation.slt
@@ -0,0 +1,175 @@
+statement ok
+SET RW_IMPLICIT_FLUSH TO true;
+
+statement ok
+CREATE TABLE t (v1 INT primary key, v2 STRUCT<v1 INT, v2 STRUCT<v1 INT, v2 INT>>);
+
+statement ok
+CREATE TABLE t_as AS ( WITH source_data AS ( SELECT 1 AS id) SELECT * FROM source_data);
+
+statement ok
+CREATE MATERIALIZED VIEW mv AS SELECT v1, (t.v2).v1 AS v21 FROM t;
+
+statement ok
+CREATE SINK sink AS SELECT mv3.v1 AS v1, mv3.v21 AS v2 FROM mv AS mv3 WITH (
+    connector = 'blackhole'
+);
+
+statement ok
+CREATE SOURCE src (v INT) WITH (
+    connector = 'datagen',
+    fields.v.kind = 'sequence',
+    fields.v.start = '1',
+    fields.v.end  = '10',
+    datagen.rows.per.second='15',
+    datagen.split.num = '1'
+) ROW FORMAT JSON;
+
+statement ok
+CREATE VIEW v1 AS ( SELECT * FROM t_as WHERE id = 1);
+
+statement ok
+CREATE VIEW v2 AS (SELECT COUNT(*) FROM t, t AS t2 WHERE t.v1 = t2.v1);
+
+statement ok
+CREATE VIEW v3 AS (SELECT MAX((t.v2).v1) FROM t AS t);
+
+statement ok
+CREATE VIEW v4 AS (SELECT * FROM t join t as t2 on (t.v1 = t2.v1) ORDER BY t.v1, t2.v1);
+
+statement ok
+CREATE index idx ON t(v1);
+
+query TT
+SHOW CREATE TABLE t;
+----
+public.t CREATE TABLE t (v1 INT PRIMARY KEY, v2 STRUCT<v1 INT, v2 STRUCT<v1 INT, v2 INT>>)
+
+# alter table rename with alias conflict
+statement ok
+ALTER TABLE t RENAME TO t2;
+
+query TT
+SHOW CREATE TABLE t2;
+----
+public.t2 CREATE TABLE t2 (v1 INT PRIMARY KEY, v2 STRUCT<v1 INT, v2 STRUCT<v1 INT, v2 INT>>)
+
+query TT
+SHOW CREATE VIEW v2;
+----
+public.v2 CREATE VIEW v2 AS (SELECT COUNT(*) FROM t2 AS t, t2 AS t2 WHERE t.v1 = t2.v1)
+
+query TT
+SHOW CREATE VIEW v3;
+----
+public.v3 CREATE VIEW v3 AS (SELECT MAX((t.v2).v1) FROM t2 AS t)
+
+query TT
+SHOW CREATE VIEW v4;
+----
+public.v4 CREATE VIEW v4 AS (SELECT * FROM t2 AS t JOIN t2 AS t2 ON (t.v1 = t2.v1) ORDER BY t.v1, t2.v1)
+
+query TT
+SHOW CREATE MATERIALIZED VIEW mv;
+----
+public.mv CREATE MATERIALIZED VIEW mv AS SELECT v1, (t.v2).v1 AS v21 FROM t2 AS t
+
+# alter mview rename
+statement ok
+ALTER MATERIALIZED VIEW mv RENAME TO mv2;
+
+query TT
+SHOW CREATE MATERIALIZED VIEW mv2;
+----
+public.mv2 CREATE MATERIALIZED VIEW mv2 AS SELECT v1, (t.v2).v1 AS v21 FROM t2 AS t
+
+statement ok
+ALTER SINK sink RENAME TO sink1;
+
+# alter mview rename with alias conflict, used by sink1
+statement ok
+ALTER MATERIALIZED VIEW mv2 RENAME TO mv3;
+
+statement ok
+ALTER TABLE t_as RENAME TO t_as_1;
+
+# alter view rename
+statement ok
+ALTER VIEW v1 RENAME TO v5;
+
+query TT
+SHOW CREATE VIEW v5;
+----
+public.v5 CREATE VIEW v5 AS (SELECT * FROM t_as_1 AS t_as WHERE id = 1)
+
+statement ok
+ALTER INDEX idx RENAME TO idx1;
+
+statement ok
+INSERT INTO t2 VALUES(1,(1,(1,2)));
+
+statement ok
+INSERT INTO t2 VALUES(2,(2,(2,4)));
+
+query II rowsort
+SELECT * from mv3
+----
+1 1
+2 2
+
+query I
+SELECT * from v2
+----
+2
+
+query I
+SELECT * from v3
+----
+2
+
+query IIII rowsort
+SELECT * from v4
+----
+1 (1,(1,2)) 1 (1,(1,2))
+2 (2,(2,4)) 2 (2,(2,4))
+
+statement ok
+CREATE MATERIALIZED VIEW mv4 AS SELECT * FROM src;
+
+statement ok
+ALTER SOURCE src RENAME TO src1;
+
+query TT
+SHOW CREATE MATERIALIZED VIEW mv4;
+----
+public.mv4 CREATE MATERIALIZED VIEW mv4 AS SELECT * FROM src1 AS src
+
+statement ok
+DROP SINK sink1;
+
+statement ok
+DROP VIEW v5;
+
+statement ok
+DROP VIEW v4;
+
+statement ok
+DROP VIEW v3;
+
+statement ok
+DROP VIEW v2;
+
+statement ok
+DROP MATERIALIZED VIEW mv4;
+
+statement ok
+DROP SOURCE src1;
+
+statement ok
+DROP MATERIALIZED VIEW mv3;
+
+statement ok
+DROP TABLE t2;
+
+statement ok
+DROP TABLE t_as_1;
diff --git a/e2e_test/ddl/alter_table_column.slt b/e2e_test/ddl/alter_table_column.slt
index 7cad432aa3197..fc142e1510191 100644
--- a/e2e_test/ddl/alter_table_column.slt
+++ b/e2e_test/ddl/alter_table_column.slt
@@ -209,3 +209,35 @@ drop materialized view mv;
 
 statement ok
 drop table t;
+
+# Test the consistency of tables and indexes #https://github.com/risingwavelabs/risingwave/issues/8649
+statement ok
+create table t(id int primary key, a int, b varchar);
+
+statement ok
+create index idx on t(a);
+
+statement ok
+alter table t add column c int;
+
+query IITI rowsort
+select * from t;
+----
+
+statement ok
+drop table t;
+
+statement ok
+create table t(id int primary key, a int, b varchar);
+
+statement ok
+create index idx on t(b) include(b);
+
+statement ok
+alter table t drop column a;
+
+query II rowsort
+select * from t where b = '1';
+
+statement ok
+drop table t;
\ No newline at end of file
diff --git a/e2e_test/ddl/show.slt b/e2e_test/ddl/show.slt
index 5c1a69d2c9930..0b6b17f63a5c6 100644
--- a/e2e_test/ddl/show.slt
+++ b/e2e_test/ddl/show.slt
@@ -10,17 +10,17 @@ create view v3 as select sum(v2) as sum_v2 from t3;
 query TT
 describe t3;
 ----
-v1 Int32
-v2 Int32
-v3 Int32
+v1 integer
+v2 integer
+v3 integer
 primary key _row_id
 
 query TT
 show columns from t3;
 ----
-v1 Int32
-v2 Int32
-v3 Int32
+v1 integer
+v2 integer
+v3 integer
 
 statement ok
 create index idx1 on t3 (v1,v2);;
@@ -28,11 +28,11 @@ create index idx1 on t3 (v1,v2);;
 query TT
 describe t3;
 ----
-v1 Int32
-v2 Int32
-v3 Int32
+v1 integer
+v2 integer
+v3 integer
 primary key _row_id
-idx1 index(v1, v2) include(v3) distributed by(v1, v2)
+idx1 index(v1 ASC, v2 ASC) include(v3) distributed by(v1, v2)
 
 statement ok
 drop index idx1;
@@ -120,22 +120,22 @@ drop table t3;
 query TT
 describe pg_matviews;
 ----
-schemaname Varchar
-matviewname Varchar
-matviewowner Int32
-definition Varchar
-matviewid Int32
-matviewtimezone Varchar
-matviewgraph Varchar
+schemaname varchar
+matviewname varchar
+matviewowner integer
+definition varchar
+matviewid integer
+matviewtimezone varchar
+matviewgraph varchar
 primary key schemaname
 
 query TT
 show columns from pg_catalog.pg_matviews;
 ----
-schemaname Varchar
-matviewname Varchar
-matviewowner Int32
-definition Varchar
-matviewid Int32
-matviewtimezone Varchar
-matviewgraph Varchar
+schemaname varchar
+matviewname varchar
+matviewowner integer
+definition varchar
+matviewid integer
+matviewtimezone varchar
+matviewgraph varchar
diff --git a/e2e_test/ddl/table.slt b/e2e_test/ddl/table.slt
index 9a3c83a60e11d..4c076b979fc25 100644
--- a/e2e_test/ddl/table.slt
+++ b/e2e_test/ddl/table.slt
@@ -1,261 +1 @@
-# Create a table.
-statement ok
-create table ddl_t (v1 int);
-
-statement ok
-explain select v1 from ddl_t;
-
-# Create another table with duplicated name.
-statement error
-create table ddl_t (v2 int);
-
-# Create a table using a empty string.
-statement error
-create table ""(v2 int);
-
-statement ok
-create table if not exists ddl_t (v2 int);
-
-# Drop the table.
-statement ok
-drop table ddl_t;
-
-# Drop it again.
-statement error
-drop table ddl_t;
-
-# Create another table with the same name.
-statement ok
-create table ddl_t (v2 int);
-
-statement ok
-explain select v2 from ddl_t;
-
-# Create a mview on top of it.
-statement ok
-create materialized view ddl_mv as select v2 from ddl_t;
-
-statement ok
-explain select v2 from ddl_t;
-
-statement ok
-explain create sink sink_t from ddl_t with ( connector = 'kafka', format = 'append_only', force_append_only = 'true' );
-
-statement ok
-explain create sink sink_as as select sum(v2) as sum from ddl_t with ( connector = 'kafka', format = 'append_only', force_append_only = 'true' );
-
-# Create a mview with duplicated name.
-statement error
-create materialized view ddl_mv as select v2 from ddl_t;
-
-# Drop the table before dropping the mview.
-statement error
-drop table ddl_t;
-
-# We're not allowed to drop the mview using `DROP TABLE`.
-statement error
-drop table ddl_mv;
-
-# Drop the mview.
-statement ok
-drop materialized view ddl_mv;
-
-# Drop it again.
-statement error
-drop materialized view ddl_mv;
-
-# We're not allowed to drop the table using `DROP MATERIALIZED VIEW`.
-statement error
-drop materialized view ddl_t;
-
-# Now, we can drop the base table.
-statement ok
-drop table ddl_t;
-
-# Create table concludes struct column.
-statement ok
-create table st (v1 int, v2 struct<v1 int, v2 struct<v1 int, v2 int>>);
-
-statement ok
-drop table st
-
-# We test the case sensitivity of table name and column name.
-statement ok
-create table t1 (v1 int);
-
-statement ok
-drop table T1;
-
-statement ok
-create table T1 (v1 int);
-
-statement ok
-drop table t1;
-
-statement ok
-create table "T1" (v1 int);
-
-# Since we have not really bound the columns in the insert statement
-# this test case cannot be enabled.
-# statement error
-# insert into "T1" ("V1") values (1);
-
-statement error
-drop table t1;
-
-statement error
-drop table T1;
-
-statement ok
-drop table "T1";
-
-statement ok
-create table "T2" ("V1" int);
-
-# Since we have not really bound the columns in the insert statement
-# this test case cannot be enabled.
-# statement error
-# insert into "T2" (V1) values (1);
-
-statement ok
-insert into "T2" ("V1") values (1);
-
-statement ok
-drop table "T2"
-
-statement error
-create table C1 (c1 varchar(5));
-
-statement error
-create table t (v1 int not null);
-
-statement error
-create table t (v1 varchar collate "en_US");
-
-# Test create-table-as 
-statement ok
-create table t as select 1;
-
-statement ok
-drop table t;
-
-statement error
-create table t as select 1,2;
-
-statement ok
-create table t as select 1 as a, 2 as b;
-
-statement ok
-drop table t;
-
-statement ok 
-create table t(v1) as select 1;
-
-statement ok
-drop table t;
-
-statement ok
-create table t (v1 int,v2 int);
-
-statement ok
-insert into t values (1,1);
-
-statement ok
-insert into t values (1,1);
-
-statement ok
-insert into t values (1,1);
-
-statement ok
-flush
-
-statement ok
-create table t1 as select * from t;
-
-statement ok
-flush;
-
-query I
-select * from t1;
-----
-1 1
-1 1
-1 1
-
-statement ok
-drop table t1;
-
-statement ok
-drop table t;
-
-statement ok 
-create table t AS SELECT * FROM generate_series(0, 5,1) tbl(i);
-
-statement ok
-flush; 
-
-query I
-select * from t order by i;
-----
-0
-1
-2
-3
-4
-5
-
-statement ok
-drop table t;
-
-statement ok
-create table t (v1 int);
-
-statement ok
-insert into t values (1);
-
-statement ok
-insert into t values (2);
-
-statement ok
-create table n1 as select sum(v1) from t;
-
-statement ok
-flush;
-
-query I
-select * from n1;
-----
-3
-
-statement error
-create table n1 (v2 int);
-
-statement error
-create table n1 as select * from t;
-
-statement ok
-create table if not exists n1 (v2 int);
-
-statement ok
-drop table n1;
-
-statement ok
-drop table t;
-
-statement ok 
-create table t (v1 int,v2 int);
-
-statement ok
-create table t1(a,b) as select v1,v2 from t;
-
-statement ok
-create table t2(a) as select v1,v2 from t;
-
-statement ok 
-drop table t;
-
-statement ok
-drop table t1;
-
-statement ok
-drop table t2;
+include ./table/*.slt.part
diff --git a/e2e_test/ddl/table/generated_columns.slt.part b/e2e_test/ddl/table/generated_columns.slt.part
new file mode 100644
index 0000000000000..ccc52d8efceec
--- /dev/null
+++ b/e2e_test/ddl/table/generated_columns.slt.part
@@ -0,0 +1,41 @@
+# Create a table with generated columns.
+statement ok
+create table t1 (v1 int as v2-1, v2 int, v3 int as v2+1.02, v4 double as v2 + 1.02);
+
+statement ok
+insert into t1 (v2) values (1), (2);
+
+statement ok
+flush;
+
+query IIIR
+select * from t1;
+----
+0 1 2 2.02
+1 2 3 3.02
+
+statement ok
+drop table t1;
+
+# Create a table with generated columns.
+statement ok
+create table t2 (v1 int, v2 int as v1+1);
+
+statement ok
+insert into t2 values (1), (2);
+
+statement ok
+flush;
+
+query II
+select * from t2;
+----
+1 2
+2 3
+
+statement ok
+drop table t2;
+
+# Generated column reference another generated column
+statement error
+create table t2 (v1 int as v2+1, v2 int, v3 int as v1-1);
diff --git a/e2e_test/ddl/table/table.slt.part b/e2e_test/ddl/table/table.slt.part
new file mode 100644
index 0000000000000..525982f2c579d
--- /dev/null
+++ b/e2e_test/ddl/table/table.slt.part
@@ -0,0 +1,261 @@
+# Create a table.
+statement ok
+create table ddl_t (v1 int);
+
+statement ok
+explain select v1 from ddl_t;
+
+# Create another table with duplicated name.
+statement error
+create table ddl_t (v2 int);
+
+# Create a table using a empty string.
+statement error
+create table ""(v2 int);
+
+statement ok
+create table if not exists ddl_t (v2 int);
+
+# Drop the table.
+statement ok
+drop table ddl_t;
+
+# Drop it again.
+statement error
+drop table ddl_t;
+
+# Create another table with the same name.
+statement ok
+create table ddl_t (v2 int);
+
+statement ok
+explain select v2 from ddl_t;
+
+# Create a mview on top of it.
+statement ok
+create materialized view ddl_mv as select v2 from ddl_t;
+
+statement ok
+explain select v2 from ddl_t;
+
+statement ok
+explain create sink sink_t from ddl_t with ( connector = 'kafka', type = 'append-only', force_append_only = 'true' );
+
+statement ok
+explain create sink sink_as as select sum(v2) as sum from ddl_t with ( connector = 'kafka', type = 'append-only', force_append_only = 'true' );
+
+# Create a mview with duplicated name.
+statement error
+create materialized view ddl_mv as select v2 from ddl_t;
+
+# Drop the table before dropping the mview.
+statement error
+drop table ddl_t;
+
+# We're not allowed to drop the mview using `DROP TABLE`.
+statement error
+drop table ddl_mv;
+
+# Drop the mview.
+statement ok
+drop materialized view ddl_mv;
+
+# Drop it again.
+statement error
+drop materialized view ddl_mv;
+
+# We're not allowed to drop the table using `DROP MATERIALIZED VIEW`.
+statement error
+drop materialized view ddl_t;
+
+# Now, we can drop the base table.
+statement ok
+drop table ddl_t;
+
+# Create table concludes struct column.
+statement ok
+create table st (v1 int, v2 struct<v1 int, v2 struct<v1 int, v2 int>>);
+
+statement ok
+drop table st
+
+# We test the case sensitivity of table name and column name.
+statement ok
+create table t1 (v1 int);
+
+statement ok
+drop table T1;
+
+statement ok
+create table T1 (v1 int);
+
+statement ok
+drop table t1;
+
+statement ok
+create table "T1" (v1 int);
+
+# Since we have not really bound the columns in the insert statement
+# this test case cannot be enabled.
+# statement error
+# insert into "T1" ("V1") values (1);
+
+statement error
+drop table t1;
+
+statement error
+drop table T1;
+
+statement ok
+drop table "T1";
+
+statement ok
+create table "T2" ("V1" int);
+
+# Since we have not really bound the columns in the insert statement
+# this test case cannot be enabled.
+# statement error
+# insert into "T2" (V1) values (1);
+
+statement ok
+insert into "T2" ("V1") values (1);
+
+statement ok
+drop table "T2"
+
+statement error
+create table C1 (c1 varchar(5));
+
+statement error
+create table t (v1 int not null);
+
+statement error
+create table t (v1 varchar collate "en_US");
+
+# Test create-table-as 
+statement ok
+create table t as select 1;
+
+statement ok
+drop table t;
+
+statement error
+create table t as select 1,2;
+
+statement ok
+create table t as select 1 as a, 2 as b;
+
+statement ok
+drop table t;
+
+statement ok 
+create table t(v1) as select 1;
+
+statement ok
+drop table t;
+
+statement ok
+create table t (v1 int,v2 int);
+
+statement ok
+insert into t values (1,1);
+
+statement ok
+insert into t values (1,1);
+
+statement ok
+insert into t values (1,1);
+
+statement ok
+flush
+
+statement ok
+create table t1 as select * from t;
+
+statement ok
+flush;
+
+query I
+select * from t1;
+----
+1 1
+1 1
+1 1
+
+statement ok
+drop table t1;
+
+statement ok
+drop table t;
+
+statement ok 
+create table t AS SELECT * FROM generate_series(0, 5,1) tbl(i);
+
+statement ok
+flush; 
+
+query I
+select * from t order by i;
+----
+0
+1
+2
+3
+4
+5
+
+statement ok
+drop table t;
+
+statement ok
+create table t (v1 int);
+
+statement ok
+insert into t values (1);
+
+statement ok
+insert into t values (2);
+
+statement ok
+create table n1 as select sum(v1) from t;
+
+statement ok
+flush;
+
+query I
+select * from n1;
+----
+3
+
+statement error
+create table n1 (v2 int);
+
+statement error
+create table n1 as select * from t;
+
+statement ok
+create table if not exists n1 (v2 int);
+
+statement ok
+drop table n1;
+
+statement ok
+drop table t;
+
+statement ok 
+create table t (v1 int,v2 int);
+
+statement ok
+create table t1(a,b) as select v1,v2 from t;
+
+statement ok
+create table t2(a) as select v1,v2 from t;
+
+statement ok 
+drop table t;
+
+statement ok
+drop table t1;
+
+statement ok
+drop table t2;
diff --git a/e2e_test/extended_query/basic.slt b/e2e_test/extended_mode/basic.slt
similarity index 50%
rename from e2e_test/extended_query/basic.slt
rename to e2e_test/extended_mode/basic.slt
index c2cf66d73295d..51513a444ec79 100644
--- a/e2e_test/extended_query/basic.slt
+++ b/e2e_test/extended_mode/basic.slt
@@ -1,14 +1,4 @@
-# The basic.slt is to cover the path of pgwire.
-#
-# There are two kinds of statement, they run different path of pgwire:
-#   1. un-query statement: SET,CREATE,INSERT,FLUSH,EXPLAIN,DROP..
-#   2. query statement: SELECT,WITH,VALUES,SHOW,DESCRIBE..
-# 
-# We also need to test different type in extended query mode:
-#   smallint,int,bigint
-#   real,double precision,numeric
-#   time,date,timestamp
-
+# Test different statements(DDL,DQL,DML) in extended mode.
 
 statement ok
 SET RW_IMPLICIT_FLUSH TO true;
@@ -52,17 +42,17 @@ create table t3 (v1 int, v2 int, v3 int);
 query TT
 describe t3;
 ----
-v1 Int32
-v2 Int32
-v3 Int32
+v1 integer
+v2 integer
+v3 integer
 primary key _row_id
 
 query TT
 show columns from t3;
 ----
-v1 Int32
-v2 Int32
-v3 Int32
+v1 integer
+v2 integer
+v3 integer
 
 statement ok
 drop table t3;
@@ -78,18 +68,3 @@ with t as (select generate_series(1,3,1)) select * from t;
 1
 2
 3
-
-query III
-select 42::smallint, 42::int, 42::bigint;
-----
-42 42 42
-
-query III
-select 42::real,42::double precision,42::decimal;
-----
-42 42 42
-
-query TTT
-select '20:55:12'::time,'2022-07-12'::date,'2022-07-12 20:55:12'::timestamp;
-----
-20:55:12 2022-07-12 2022-07-12 20:55:12
diff --git a/e2e_test/extended_mode/type.slt b/e2e_test/extended_mode/type.slt
new file mode 100644
index 0000000000000..2271ecb51c5c9
--- /dev/null
+++ b/e2e_test/extended_mode/type.slt
@@ -0,0 +1,28 @@
+# Test binary format of different type. (sqllogitest return binary format in extended mode)
+
+statement ok
+SET RW_IMPLICIT_FLUSH TO true;
+
+# RisingWave can't support list and struct now so we skip them.
+# include ../batch/types/array.slt.part
+# include ../batch/types/struct.slt.part
+# include ../batch/types/list.slt.part
+
+# Sqllogitest can't support binary format bytea type so we skip it.
+# include ../batch/types/bytea.slt.part
+
+# Can't support inf,-inf binary format now so we skip it.
+# include ../batch/types/decimal.slt.part
+
+# Sqllogitest can't support binary format jsonb type so we skip it.
+# include ../batch/types/jsonb_ord.slt.part
+# include ../batch/types/jsonb.slt.part
+
+include ../batch/types/boolean.slt.part
+include ../batch/types/cast.slt.part
+include ../batch/types/date.slt
+include ../batch/types/intercal.slt.part
+include ../batch/types/number_arithmetic.slt.part
+include ../batch/types/temporal_arithmetic.slt.part
+include ../batch/types/time.slt.part
+include ../batch/types/timestamptz_utc.slt.part
diff --git a/e2e_test/sink/append_only_sink.slt b/e2e_test/sink/append_only_sink.slt
index cf4e185d1b28f..57f194f033f4f 100644
--- a/e2e_test/sink/append_only_sink.slt
+++ b/e2e_test/sink/append_only_sink.slt
@@ -1,35 +1,20 @@
 statement ok
-create table t1 (v1 int, v2 int);
-
-statement error No primary key for the upsert sink
-create sink s1 from t1 with (connector = 'console');
-
-statement ok
-create sink s1 as select v1, v2, _row_id from t1 with (connector = 'console');
-
-statement ok
-create table t2 (v1 int, v2 int primary key);
-
-statement ok
-create sink s2 from t2 with (connector = 'console');
-
-statement error No primary key for the upsert sink
-create sink s3 as select avg(v1) from t2 with (connector = 'console');
+create table t (v1 int, v2 int);
 
 statement ok
-create sink s3 as select avg(v1) from t2 with (connector = 'console', format = 'append_only', force_append_only = 'true');
+create sink s1 from t with (connector = 'console');
 
 statement ok
-create sink s4 as select avg(v1), v2 from t2 group by v2 with (connector = 'console');
+create sink s2 as select avg(v1), v2 from t group by v2 with (connector = 'console');
 
 statement error The sink cannot be append-only
-create sink s5 from t2 with (connector = 'console', format = 'append_only');
+create sink s3 from t with (connector = 'console', type = 'append-only');
 
 statement ok
-create sink s5 from t2 with (connector = 'console', format = 'append_only', force_append_only = 'true');
+create sink s3 from t with (connector = 'console', type = 'append-only', force_append_only = 'true');
 
 statement error Cannot force the sink to be append-only
-create sink s6 from t2 with (connector = 'console', format = 'upsert', force_append_only = 'true');
+create sink s4 from t with (connector = 'console', type = 'upsert', force_append_only = 'true');
 
 statement ok
 drop sink s1
@@ -41,13 +26,4 @@ statement ok
 drop sink s3
 
 statement ok
-drop sink s4
-
-statement ok
-drop sink s5
-
-statement ok
-drop table t1
-
-statement ok
-drop table t2
+drop table t
diff --git a/e2e_test/sink/iceberg_sink.slt b/e2e_test/sink/iceberg_sink.slt
index ecb91b96fd0f7..2a214c0710ddd 100644
--- a/e2e_test/sink/iceberg_sink.slt
+++ b/e2e_test/sink/iceberg_sink.slt
@@ -7,7 +7,8 @@ CREATE MATERIALIZED VIEW mv6 AS SELECT * FROM t6;
 statement ok
 CREATE SINK s6 AS select mv6.v1 as v1, mv6.v2 as v2, mv6.v3 as v3 from mv6 WITH (
     connector = 'iceberg',
-    sink.mode='append-only',
+    type = 'upsert',
+    primary_key = 'v1',
     warehouse.path = 's3://iceberg',
     s3.endpoint = 'http://127.0.0.1:9301',
     s3.access.key = 'hummockadmin',
@@ -22,6 +23,12 @@ INSERT INTO t6 VALUES (1, 2, '1-2'), (2, 2, '2-2'), (3, 2, '3-2'), (5, 2, '5-2')
 statement ok
 FLUSH;
 
+statement ok
+INSERT INTO t6 VALUES (1, 50, '1-50');
+
+statement ok
+FLUSH;
+
 statement ok
 DROP SINK s6;
 
diff --git a/e2e_test/sink/remote/jdbc.check.pg.slt b/e2e_test/sink/remote/jdbc.check.pg.slt
index 601a0b29e57b7..bd00a7938a898 100644
--- a/e2e_test/sink/remote/jdbc.check.pg.slt
+++ b/e2e_test/sink/remote/jdbc.check.pg.slt
@@ -3,8 +3,8 @@
 query I
 select * from t_remote order by id;
 ----
-1 Alex
-3 Carl
-4 Doris
-5 Eve
-6 Frank
\ No newline at end of file
+1 Alex 28208 281620391 4986480304337356800 28162.0391 2.03 28162.0391 2023-03-20 10:18:30
+3 Carl 18300 1702307129 7878292368468104192 17023.07129 23.07 17023.07129 2023-03-20 10:18:32
+4 Doris 17250 151951802 3946135584462581760 1519518.02 18.02 1519518.02 2023-03-21 10:18:30
+5 Eve 9725 698160808 524334216698825600 69.8160808 69.81 69.8160808 2023-03-21 10:18:31
+6 Frank 28131 1233587627 8492820454814063616 123358.7627 58.76 123358.7627 2023-03-21 10:18:32
diff --git a/e2e_test/sink/remote/jdbc.load.slt b/e2e_test/sink/remote/jdbc.load.slt
index 88bec6048187a..9adbb40a1b972 100644
--- a/e2e_test/sink/remote/jdbc.load.slt
+++ b/e2e_test/sink/remote/jdbc.load.slt
@@ -1,5 +1,15 @@
 statement ok
-create table t_remote (id integer primary key, name varchar);
+create table t_remote (
+    id integer primary key,
+    v_varchar varchar,
+    v_smallint smallint,
+    v_integer integer,
+    v_bigint bigint,
+    v_decimal decimal,
+    v_float float,
+    v_double double,
+    v_timestamp timestamp
+);
 
 statement ok
 create materialized view mv_remote as select * from t_remote;
@@ -19,16 +29,22 @@ CREATE SINK s_mysql FROM mv_remote WITH (
 );
 
 statement ok
-INSERT INTO t_remote VALUES (1, 'Alice'), (2, 'Bob'), (3, 'Carl');
+INSERT INTO t_remote VALUES
+    (1, 'Alice', 28208, 281620391, 4986480304337356659, 28162.0391, 2.03, 28162.0391, '2023-03-20 10:18:30'),
+    (2, 'Bob', 10580, 2131030003, 3074255027698877876, 21310.30003, 10.3, 21310.30003, '2023-03-20 10:18:31'),
+    (3, 'Carl', 18300, 1702307129, 7878292368468104216, 17023.07129, 23.07, 17023.07129, '2023-03-20 10:18:32');
 
 statement ok
-INSERT INTO t_remote VALUES (4, 'Doris'), (5, 'Eve'), (6, 'Frank');
+INSERT INTO t_remote VALUES
+    (4, 'Doris', 17250, 151951802, 3946135584462581863, 1519518.02, 18.02, 1519518.02, '2023-03-21 10:18:30'),
+    (5, 'Eve', 9725, 698160808, 524334216698825611, 69.8160808, 69.81, 69.8160808, '2023-03-21 10:18:31'),
+    (6, 'Frank', 28131, 1233587627, 8492820454814063326, 123358.7627, 58.76, 123358.7627, '2023-03-21 10:18:32');
 
 statement ok
 FLUSH;
 
 statement ok
-UPDATE t_remote SET name = 'Alex' WHERE id = 1;
+UPDATE t_remote SET v_varchar = 'Alex' WHERE id = 1;
 
 statement ok
 DELETE FROM t_remote WHERE id = 2;
diff --git a/e2e_test/sink/remote/mysql_create_table.sql b/e2e_test/sink/remote/mysql_create_table.sql
new file mode 100644
index 0000000000000..491072eb59d63
--- /dev/null
+++ b/e2e_test/sink/remote/mysql_create_table.sql
@@ -0,0 +1,11 @@
+CREATE TABLE t_remote (
+    id integer PRIMARY KEY,
+    v_varchar varchar(100),
+    v_smallint smallint,
+    v_integer integer,
+    v_bigint bigint,
+    v_decimal decimal,
+    v_float float,
+    v_double double,
+    v_timestamp timestamp
+);
\ No newline at end of file
diff --git a/e2e_test/sink/remote/mysql_expected_result.tsv b/e2e_test/sink/remote/mysql_expected_result.tsv
new file mode 100644
index 0000000000000..8e738579032d2
--- /dev/null
+++ b/e2e_test/sink/remote/mysql_expected_result.tsv
@@ -0,0 +1,5 @@
+1	Alex	28208	281620391	4986480304337356800	28162	2.03	28162.0391	2023-03-20 10:18:30
+3	Carl	18300	1702307129	7878292368468104192	17023	23.07	17023.07129	2023-03-20 10:18:32
+4	Doris	17250	151951802	3946135584462581760	1519518	18.02	1519518.02	2023-03-21 10:18:30
+5	Eve	9725	698160808	524334216698825600	70	69.81	69.8160808	2023-03-21 10:18:31
+6	Frank	28131	1233587627	8492820454814063616	123359	58.76	123358.7627	2023-03-21 10:18:32
diff --git a/e2e_test/sink/remote/pg_create_table.sql b/e2e_test/sink/remote/pg_create_table.sql
new file mode 100644
index 0000000000000..c20e3386e8d06
--- /dev/null
+++ b/e2e_test/sink/remote/pg_create_table.sql
@@ -0,0 +1,11 @@
+CREATE TABLE t_remote (
+    id integer PRIMARY KEY,
+    v_varchar varchar(100),
+    v_smallint smallint,
+    v_integer integer,
+    v_bigint bigint,
+    v_decimal decimal,
+    v_float real,
+    v_double double precision,
+    v_timestamp timestamp
+);
\ No newline at end of file
diff --git a/e2e_test/source/basic/kafka.slt b/e2e_test/source/basic/kafka.slt
index 0e6f7e6bca00b..5563e01dd15b9 100644
--- a/e2e_test/source/basic/kafka.slt
+++ b/e2e_test/source/basic/kafka.slt
@@ -79,7 +79,7 @@ from
   s5 with (
     properties.bootstrap.server = '127.0.0.1:29092',
     topic = 'sink_target',
-    format = 'append_only',
+    type = 'append-only',
     connector = 'kafka'
   )
 
@@ -384,7 +384,7 @@ select id, first_name, last_name, email from s8;
 query IITFFBTT
 select id, sequence_id, name, score, avg_score, is_lasted, entrance_date, birthday, passed from s9;
 ----
-32 64 str_value 32 64 t 1970-01-01 1970-01-01 00:00:00 1 mon 1 day 00:00:01
+32 64 str_value 32 64 t 1970-01-01 1970-01-01 00:00:00+00:00 1 mon 1 day 00:00:01
 
 query ITITT
 select id, code, timestamp, xfas, contacts, sex from s10;
diff --git a/e2e_test/streaming/array_agg.slt b/e2e_test/streaming/array_agg.slt
index 42c02a05c47ab..cf76386e3866e 100644
--- a/e2e_test/streaming/array_agg.slt
+++ b/e2e_test/streaming/array_agg.slt
@@ -13,9 +13,6 @@ create materialized view mv1 as select array_agg(c) as res from t;
 statement ok
 create materialized view mv2 as select array_agg(a order by b asc, a desc) as res from t;
 
-statement ok
-flush;
-
 query T
 select u from (select unnest(res) from mv1) p(u) order by u;
 ----
@@ -47,11 +44,25 @@ select * from mv2;
 ----
 {ccc,bbb,x,ddd,aaa,y}
 
+statement ok
+create materialized view mv3 as select array_agg(a order by b nulls first, a nulls last) as res from t;
+
+statement ok
+insert into t values (NULL, NULL, 2), ('z', NULL, 6);
+
+query T
+select * from mv3;
+----
+{z,NULL,bbb,ccc,aaa,ddd,x,y}
+
 statement ok
 drop materialized view mv1;
 
 statement ok
 drop materialized view mv2;
 
+statement ok
+drop materialized view mv3;
+
 statement ok
 drop table t;
diff --git a/e2e_test/streaming/bug_fixes/issue_8570.slt b/e2e_test/streaming/bug_fixes/issue_8570.slt
new file mode 100644
index 0000000000000..5a61fdc322c95
--- /dev/null
+++ b/e2e_test/streaming/bug_fixes/issue_8570.slt
@@ -0,0 +1,54 @@
+# https://github.com/risingwavelabs/risingwave/issues/8570
+# TopN cache invalidation issue
+
+statement ok
+SET RW_IMPLICIT_FLUSH TO true;
+
+statement ok
+create table t(x int);
+
+statement ok
+create materialized view t_singleton as select * from t order by x limit 100;
+
+statement ok
+create materialized view mv as select * from t_singleton order by x limit 1;
+
+statement ok
+insert into t values (1), (2), (3), (4);
+
+statement ok
+delete from t where x = 2;
+
+statement ok
+insert into t values (5);
+
+statement ok
+delete from t where x = 1;
+
+statement ok
+insert into t values (6);
+
+statement ok
+delete from t where x = 3;
+
+# Shouldn't be 5
+query I
+select * from mv;
+----
+4
+
+statement ok
+delete from t where x = 4;
+
+# Shouldn't panic
+statement ok
+insert into t values (1);
+
+statement ok
+drop materialized view mv;
+
+statement ok
+drop materialized view t_singleton;
+
+statement ok
+drop table t;
diff --git a/e2e_test/streaming/order_by.slt b/e2e_test/streaming/order_by.slt
index 4a6e44c9a8191..c87b937b3d718 100644
--- a/e2e_test/streaming/order_by.slt
+++ b/e2e_test/streaming/order_by.slt
@@ -16,9 +16,6 @@ create materialized view mv2 as select * from t1 order by v1 limit 3;
 statement ok
 create materialized view mv3 as select * from t1 order by v1 limit 3 offset 1;
 
-statement ok
-flush;
-
 query III rowsort
 select v1, v2, v3 from mv1;
 ----
@@ -43,13 +40,60 @@ select v1, v2, v3 from mv3;
 5 1 4
 
 statement ok
-drop materialized view mv1
+insert into t1 values (NULL,0,0);
+
+statement ok
+create materialized view mv4 as select * from t1 order by v1 desc limit 1;
+
+statement ok
+create materialized view mv5 as select * from t1 order by v1 nulls first limit 1;
+
+statement ok
+create materialized view mv6 as select * from t1 order by v1 nulls last limit 1;
+
+statement ok
+create materialized view mv7 as select * from t1 order by v1 desc nulls last limit 1;
+
+query III
+select v1, v2, v3 from mv4;
+----
+NULL 0 0
+
+query III
+select v1, v2, v3 from mv5;
+----
+NULL 0 0
+
+query III
+select v1, v2, v3 from mv6;
+----
+0 2 3
+
+query III
+select v1, v2, v3 from mv7;
+----
+9 8 1
+
+statement ok
+drop materialized view mv1;
+
+statement ok
+drop materialized view mv2;
+
+statement ok
+drop materialized view mv3;
+
+statement ok
+drop materialized view mv4;
+
+statement ok
+drop materialized view mv5;
 
 statement ok
-drop materialized view mv2
+drop materialized view mv6;
 
 statement ok
-drop materialized view mv3
+drop materialized view mv7;
 
 statement ok
-drop table t1
+drop table t1;
diff --git a/e2e_test/udf/python.slt b/e2e_test/udf/python.slt
index 560116e2e05fd..71654ac8ad64f 100644
--- a/e2e_test/udf/python.slt
+++ b/e2e_test/udf/python.slt
@@ -24,12 +24,18 @@ create function gcd(int, int, int) returns int language python as gcd3 using lin
 statement error exists
 create function gcd(int, int) returns int language python as gcd using link 'http://localhost:8815';
 
+# Create a function that returns multiple columns.
+statement ok
+create function extract_tcp_info(bytea) returns struct<src_ip varchar, dst_ip varchar, src_port smallint, dst_port smallint>
+language python as extract_tcp_info using link 'http://localhost:8815';
+
 # Create a table function.
 statement ok
 create function series(int) returns table (x int) language python as series using link 'http://localhost:8815';
 
+# Create a table function that returns multiple columns.
 statement ok
-create function series2(int) returns table (x int, s varchar) language python as series2 using link 'http://localhost:8815';
+create function series2(int) returns table (x int, y varchar) language python as series2 using link 'http://localhost:8815';
 
 query I
 select int_42();
@@ -55,16 +61,32 @@ select series(5);
 3
 4
 
-# FIXME: support table function with multiple columns
-# query IT
-# select series2(5);
-# ----
-# (0,0)
-# (1,1)
-# (2,2)
-# (3,3)
-# (4,4)
+query IT
+select * from series2(3);
+----
+0 #0
+1 #1
+2 #2
+
+query T
+select series2(3);
+----
+(0,#0)
+(1,#1)
+(2,#2)
 
+# TODO: support argument implicit cast for UDF
+# e.g. extract_tcp_info(E'\\x45');
+
+query T
+select extract_tcp_info(E'\\x45000034a8a8400040065b8ac0a8000ec0a80001035d20b6d971b900000000080020200493310000020405b4' :: bytea);
+----
+(192.168.0.14,192.168.0.1,861,8374)
+
+query TTII
+select (extract_tcp_info(E'\\x45000034a8a8400040065b8ac0a8000ec0a80001035d20b6d971b900000000080020200493310000020405b4' :: BYTEA)).*;
+----
+192.168.0.14 192.168.0.1 861 8374
 
 # TODO: drop function without arguments
 
diff --git a/e2e_test/udf/test.py b/e2e_test/udf/test.py
index eabc10ad9290a..3d9cba52d36bd 100644
--- a/e2e_test/udf/test.py
+++ b/e2e_test/udf/test.py
@@ -1,3 +1,5 @@
+import socket
+import struct
 import sys
 from typing import Iterator
 sys.path.append('src/udf/python')  # noqa
@@ -22,16 +24,25 @@ def gcd3(x: int, y: int, z: int) -> int:
     return gcd(gcd(x, y), z)
 
 
+@udf(input_types=['BINARY'], result_type='STRUCT<src_ip VARCHAR, dst_ip VARCHAR, src_port SMALLINT, dst_port SMALLINT>')
+def extract_tcp_info(tcp_packet: bytes):
+    src_addr, dst_addr = struct.unpack('!4s4s', tcp_packet[12:20])
+    src_port, dst_port = struct.unpack('!HH', tcp_packet[20:24])
+    src_addr = socket.inet_ntoa(src_addr)
+    dst_addr = socket.inet_ntoa(dst_addr)
+    return src_addr, dst_addr, src_port, dst_port
+
+
 @udtf(input_types='INT', result_types='INT')
 def series(n: int) -> Iterator[int]:
     for i in range(n):
         yield i
 
 
-@udtf(input_types=['INT'], result_types=['INT', 'VARCHAR'])
+@udtf(input_types='INT', result_types=['INT', 'VARCHAR'])
 def series2(n: int) -> Iterator[tuple[int, str]]:
     for i in range(n):
-        yield i, str(i)
+        yield i, f'#{i}'
 
 
 if __name__ == '__main__':
@@ -41,4 +52,5 @@ def series2(n: int) -> Iterator[tuple[int, str]]:
     server.add_function(gcd3)
     server.add_function(series)
     server.add_function(series2)
+    server.add_function(extract_tcp_info)
     server.serve()
diff --git a/grafana/risingwave-dashboard.dashboard.py b/grafana/risingwave-dashboard.dashboard.py
index 609a263dcb73b..f5bcaac3ce803 100644
--- a/grafana/risingwave-dashboard.dashboard.py
+++ b/grafana/risingwave-dashboard.dashboard.py
@@ -520,10 +520,16 @@ def section_cluster_node(panels):
             [
                 panels.target(
                     f"sum(rate({metric('process_cpu_seconds_total')}[$__rate_interval])) by (job,instance)",
-                    "{{job}} @ {{instance}}",
-                )
+                    "cpu - {{job}} @ {{instance}}",
+                ),
+
+                panels.target(
+                    f"sum(rate({metric('process_cpu_seconds_total')}[$__rate_interval])) by (job,instance) / avg({metric('process_cpu_core_num')}) by (job,instance)",
+                    "cpu usage -{{job}} @ {{instance}}",
+                ),
             ],
         ),
+
         panels.timeseries_count(
             "Meta Cluster",
             "",
@@ -562,6 +568,16 @@ def section_compaction(outer_panels):
                         ),
                     ],
                 ),
+                panels.timeseries_count(
+                    "scale compactor core count",
+                    "compactor core resource need to scale out",
+                    [
+                        panels.target(
+                            f"sum({metric('storage_compactor_suggest_core_count')})",
+                            "suggest-core-count"
+                        ),
+                    ],
+                ),
                 panels.timeseries_count(
                     "Compaction Success & Failure Count",
                     "num of compactions from each level to next level",
@@ -1362,11 +1378,7 @@ def section_streaming_actors(outer_panels):
                         ),
                         panels.target(
                             f"rate({metric('stream_join_insert_cache_miss_count')}[$__rate_interval])",
-                            "cache miss when insert {{actor_id}} {{side}}",
-                        ),
-                        panels.target(
-                            f"rate({metric('stream_join_may_exist_true_count')}[$__rate_interval])",
-                            "may_exist true when insert {{actor_id}} {{side}}",
+                            "cache miss when insert{{actor_id}} {{side}}",
                         ),
                     ],
                 ),
@@ -1564,7 +1576,6 @@ def section_batch_exchange(outer_panels):
         ),
     ]
 
-
 def section_frontend(outer_panels):
     panels = outer_panels.sub_panel()
     return [
@@ -2598,6 +2609,26 @@ def section_memory_manager(outer_panels):
         ),
     ]
 
+def section_connector_node(outer_panels):
+    panels = outer_panels.sub_panel()
+    return [
+        outer_panels.row_collapsed(
+            "Connector Node",
+            [
+                panels.timeseries_rowsps(
+                    "Connector Source Throughput(rows)",
+                    "",
+                    [
+                        panels.target(
+                            f"rate({metric('connector_source_rows_received')}[$__interval])",
+                            "{{source_type}} @ {{source_id}}",
+                        ),
+                    ],
+                ),
+            ],
+        )
+    ]
+
 templating = Templating()
 if namespace_filter_enabled:
     templating = Templating(
@@ -2655,5 +2686,6 @@ def section_memory_manager(outer_panels):
         *section_grpc_hummock_meta_client(panels),
         *section_frontend(panels),
         *section_memory_manager(panels),
+        *section_connector_node(panels),
     ],
 ).auto_panel_ids()
diff --git a/grafana/risingwave-dashboard.json b/grafana/risingwave-dashboard.json
index 67fe94a8198be..17d558245452d 100644
--- a/grafana/risingwave-dashboard.json
+++ b/grafana/risingwave-dashboard.json
@@ -1 +1 @@
-{"__inputs":[],"annotations":{"list":[]},"description":"RisingWave Dashboard","editable":true,"gnetId":null,"hideControls":false,"id":null,"links":[],"panels":[{"cacheTimeout":null,"collapsed":false,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":1,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Cluster Node","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":1},"height":null,"hideTimeOverride":false,"id":2,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(worker_num) by (worker_type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{worker_type}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Node Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":1},"height":null,"hideTimeOverride":false,"id":3,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"avg(process_resident_memory_bytes) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Node Memory","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":9},"height":null,"hideTimeOverride":false,"id":4,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(process_cpu_seconds_total[$__rate_interval])) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Node CPU","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":9},"height":null,"hideTimeOverride":false,"id":5,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(meta_num) by (worker_addr,role)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{worker_addr}} @ {{role}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Meta Cluster","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"collapsed":false,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":17},"height":null,"hideTimeOverride":false,"id":6,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Streaming","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"rows/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":18},"height":null,"hideTimeOverride":false,"id":7,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_source_output_rows_counts[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"source={{source_name}} {{source_id}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(rows)","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"rows/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":18},"height":null,"hideTimeOverride":false,"id":8,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(partition_input_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"actor={{actor_id}} source={{source_id}} partition={{partition}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(rows) Per Partition","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"MB/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":26},"height":null,"hideTimeOverride":false,"id":9,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(sum by (source_id)(rate(partition_input_bytes[$__rate_interval])))/(1000*1000)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"source={{source_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(bytes)","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"MB/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":26},"height":null,"hideTimeOverride":false,"id":10,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(rate(partition_input_bytes[$__rate_interval]))/(1000*1000)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"actor={{actor_id}} source={{source_id}} partition={{partition}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(bytes) Per Partition","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"rows/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":34},"height":null,"hideTimeOverride":false,"id":11,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_source_rows_per_barrier_counts[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"actor={{actor_id}} source={{source_id}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(rows) per barrier","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":34},"height":null,"hideTimeOverride":false,"id":12,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"all_barrier_nums","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"all_barrier","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"in_flight_barrier_nums","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"in_flight_barrier","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Number","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":42},"height":null,"hideTimeOverride":false,"id":13,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_p999","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_pmax","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(meta_barrier_send_duration_seconds_sum[$__rate_interval]) / rate(meta_barrier_send_duration_seconds_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Send Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":42},"height":null,"hideTimeOverride":false,"id":14,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_p999","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_pmax","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(meta_barrier_duration_seconds_sum[$__rate_interval]) / rate(meta_barrier_duration_seconds_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":50},"height":null,"hideTimeOverride":false,"id":15,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_p999","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_pmax","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"max(sum by(le, instance)(rate(stream_barrier_inflight_duration_seconds_sum[$__rate_interval]))  / sum by(le, instance)(rate(stream_barrier_inflight_duration_seconds_count[$__rate_interval])))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier In-Flight Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":50},"height":null,"hideTimeOverride":false,"id":16,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_p50 - {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_p90 - {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_p99 - {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_p999 - {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_pmax - {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, instance)(rate(stream_barrier_sync_storage_duration_seconds_sum[$__rate_interval]))  / sum by(le, instance)(rate(stream_barrier_sync_storage_duration_seconds_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_avg - {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Sync Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":58},"height":null,"hideTimeOverride":false,"id":17,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_p999","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_pmax","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(meta_barrier_wait_commit_duration_seconds_sum[$__rate_interval]) / rate(meta_barrier_wait_commit_duration_seconds_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Wait Commit Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":66},"height":null,"hideTimeOverride":false,"id":18,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"rows/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":19,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_executor_row_count[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}->{{executor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Executor Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":20,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_output_buffer_blocking_duration_ns[$__rate_interval]) / 1000000000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Backpressure","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":21,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(actor_memory_usage[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Memory Usage","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":22,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_input_buffer_blocking_duration_ns[$__rate_interval]) / 1000000000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}->{{upstream_fragment_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Input Blocking Time Ratio","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":23,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_barrier_time[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Barrier Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":24,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_processing_time[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Processing Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":25,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_actor_execution_time[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Execution Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"row"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":24},"height":null,"hideTimeOverride":false,"id":26,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_in_record_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Input Row","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"row"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":32},"height":null,"hideTimeOverride":false,"id":27,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_out_record_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Output Row","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":12,"y":32},"height":null,"hideTimeOverride":false,"id":28,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_fast_poll_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Fast Poll Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":40},"height":null,"hideTimeOverride":false,"id":29,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_fast_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Fast Poll Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":40},"height":null,"hideTimeOverride":false,"id":30,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_fast_poll_duration[$__rate_interval]) / rate(stream_actor_fast_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Fast Poll Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":40},"height":null,"hideTimeOverride":false,"id":31,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_slow_poll_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Slow Poll Total Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":48},"height":null,"hideTimeOverride":false,"id":32,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_slow_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Slow Poll Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":48},"height":null,"hideTimeOverride":false,"id":33,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_slow_poll_duration[$__rate_interval]) / rate(stream_actor_slow_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Slow Poll Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":48},"height":null,"hideTimeOverride":false,"id":34,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_poll_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Poll Total Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":56},"height":null,"hideTimeOverride":false,"id":35,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Poll Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":56},"height":null,"hideTimeOverride":false,"id":36,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_poll_duration[$__rate_interval]) / rate(stream_actor_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Poll Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":56},"height":null,"hideTimeOverride":false,"id":37,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_idle_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Idle Total Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":64},"height":null,"hideTimeOverride":false,"id":38,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_idle_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Idle Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":64},"height":null,"hideTimeOverride":false,"id":39,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_idle_duration[$__rate_interval]) / rate(stream_actor_idle_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Idle Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":64},"height":null,"hideTimeOverride":false,"id":40,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_scheduled_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Scheduled Total Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":72},"height":null,"hideTimeOverride":false,"id":41,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_scheduled_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Scheduled Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":72},"height":null,"hideTimeOverride":false,"id":42,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_scheduled_duration[$__rate_interval]) / rate(stream_actor_scheduled_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Scheduled Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":80},"height":null,"hideTimeOverride":false,"id":43,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_lookup_miss_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"cache miss {{actor_id}} {{side}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_lookup_total_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"total lookups {{actor_id}} {{side}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_insert_cache_miss_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"cache miss when insert {{actor_id}} {{side}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_may_exist_true_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"may_exist true when insert {{actor_id}} {{side}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Executor Cache","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":80},"height":null,"hideTimeOverride":false,"id":44,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p999 {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, actor_id, wait_side, job, instance)(rate(stream_join_barrier_align_duration_sum[$__rate_interval])) / sum by(le,actor_id,wait_side,job,instance) (rate(stream_join_barrier_align_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Executor Barrier Align","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":88},"height":null,"hideTimeOverride":false,"id":45,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_actor_input_waiting_duration_ns[$__rate_interval]) / 1000000000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Actor Input Blocking Time Ratio","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":88},"height":null,"hideTimeOverride":false,"id":46,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_match_duration_ns[$__rate_interval]) / 1000000000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}.{{side}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Actor Match Duration Per Second","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":96},"height":null,"hideTimeOverride":false,"id":47,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_join_cached_entries","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}} {{side}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Cached Entries","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":96},"height":null,"hideTimeOverride":false,"id":48,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_join_cached_rows","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}} {{side}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Cached Rows","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":104},"height":null,"hideTimeOverride":false,"id":49,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_join_cached_estimated_size","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}} {{side}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Cached Estimated Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":104},"height":null,"hideTimeOverride":false,"id":50,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_agg_lookup_miss_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"cache miss {{actor_id}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_agg_lookup_total_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"total lookups {{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Aggregation Executor Cache Statistics For Each Key/State","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":112},"height":null,"hideTimeOverride":false,"id":51,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_agg_chunk_lookup_miss_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"chunk-level cache miss {{actor_id}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_agg_chunk_lookup_total_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"chunk-level total lookups {{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Aggregation Executor Cache Statistics For Each StreamChunk","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":112},"height":null,"hideTimeOverride":false,"id":52,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_agg_cached_keys","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Aggregation Cached Keys","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Streaming Actors","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":67},"height":null,"hideTimeOverride":false,"id":53,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":54,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_exchange_frag_send_size[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{up_fragment_id}}->{{down_fragment_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Fragment-level Remote Exchange Send Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":55,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_exchange_frag_recv_size[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{up_fragment_id}}->{{down_fragment_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Fragment-level Remote Exchange Recv Throughput","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Streaming Exchange","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":68},"height":null,"hideTimeOverride":false,"id":56,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":57,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(user_compute_error_count) by (error_type, error_msg, fragment_id, executor_name)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{error_type}}: {{error_msg}} ({{executor_name}}: fragment_id={{fragment_id}})","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compute Errors by Type","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":58,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(user_source_error_count) by (error_type, error_msg, fragment_id, table_id, executor_name)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{error_type}}: {{error_msg}} ({{executor_name}}: table_id={{table_id}}, fragment_id={{fragment_id}})","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Errors by Type","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"User Streaming Errors","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":69},"height":null,"hideTimeOverride":false,"id":59,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"row"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":60,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"batch_task_exchange_recv_row_number","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{query_id}} : {{source_stage_id}}.{{source_task_id}} -> {{target_stage_id}}.{{target_task_id}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Exchange Recv Row Number","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"row"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":61,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"batch_task_num","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Batch Mpp Task Number","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Batch Metrics","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":false,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":70},"height":null,"hideTimeOverride":false,"id":62,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Hummock","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":71},"height":null,"hideTimeOverride":false,"id":63,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance) (rate(state_store_sync_duration_sum[$__rate_interval])) / sum by(le, job, instance) (rate(state_store_sync_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Build and Sync Sstable Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":71},"height":null,"hideTimeOverride":false,"id":64,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_sst_store_block_request_counts[$__rate_interval])) by (job, instance, table_id, type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{table_id}} @ {{type}} - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_latency_count[$__rate_interval])) by (op, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_miss[$__rate_interval])) by (instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache miss @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Cache Ops","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":79},"height":null,"hideTimeOverride":false,"id":65,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_get_duration_count[$__rate_interval])) by (job,instanc,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_range_reverse_scan_duration_count[$__rate_interval])) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"backward scan - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_get_shared_buffer_hit_counts[$__rate_interval])) by (job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"shared_buffer hit - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_iter_in_process_counts[$__rate_interval])) by(job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"iter - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Ops","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":79},"height":null,"hideTimeOverride":false,"id":66,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id)(rate(state_store_get_duration_sum[$__rate_interval])) / sum by(le, job, instance, table_id) (rate(state_store_get_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg - {{table_id}} {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Duration - Get","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":87},"height":null,"hideTimeOverride":false,"id":67,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time p999 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(state_store_iter_duration_sum[$__rate_interval])) / sum by(le, job,instance) (rate(state_store_iter_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time avg - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time p999 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(state_store_scan_iter_duration_sum[$__rate_interval])) / sum by(le, job,instance) (rate(state_store_iter_scan_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time avg - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Duration - Iter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":87},"height":null,"hideTimeOverride":false,"id":68,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(0.9, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(0.99, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(0.999, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p999 - {{table_id}} {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(1.0, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Item Size - Get","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":95},"height":null,"hideTimeOverride":false,"id":69,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p999 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Item Size - Iter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":95},"height":null,"hideTimeOverride":false,"id":70,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p999 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Item Count - Iter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":103},"height":null,"hideTimeOverride":false,"id":71,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_get_key_size_sum[$__rate_interval])) by(job, instance) + sum(rate(state_store_get_value_size_sum[$__rate_interval])) by(job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Throughput - Get","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":103},"height":null,"hideTimeOverride":false,"id":72,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_iter_size_sum[$__rate_interval])) by(job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Throughput - Iter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":111},"height":null,"hideTimeOverride":false,"id":73,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id)(rate(state_store_may_exist_duration_sum[$__rate_interval])) / sum by(le, job, instance, table_id) (rate(state_store_may_exist_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg - {{table_id}} {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Duration - MayExist","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":111},"height":null,"hideTimeOverride":false,"id":74,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_bloom_filter_true_negative_counts[$__rate_interval])) by (job,instance,table_id,type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"bloom filter true negative  - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_read_req_positive_but_non_exist_counts[$__rate_interval])) by (job,instance,table_id,type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"bloom filter false positive count  - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_read_req_bloom_filter_positive_counts[$__rate_interval])) by (job,instance,table_id,type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read_req bloom filter positive - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_read_req_check_bloom_filter_counts[$__rate_interval])) by (job,instance,table_id,type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read_req check bloom filter - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Bloom Filter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":119},"height":null,"hideTimeOverride":false,"id":75,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_iter_scan_key_counts[$__rate_interval])) by (instance, type, table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"iter keys flow - {{table_id}} @ {{type}} @ {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Iter keys flow","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":119},"height":null,"hideTimeOverride":false,"id":76,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"1 - (sum(rate(state_store_bloom_filter_true_negative_counts[$__rate_interval])) by (job,instance,table_id,type)) / (sum(rate(state_bloom_filter_check_counts[$__rate_interval])) by (job,instance,table_id,type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"bloom filter miss rate - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(sum(rate(state_store_sst_store_block_request_counts{type='meta_miss'}[$__rate_interval])) by (job,instance,table_id)) / (sum(rate(state_store_sst_store_block_request_counts{type='meta_total'}[$__rate_interval])) by (job,instance,table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"meta cache miss rate - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(sum(rate(state_store_sst_store_block_request_counts{type='data_miss'}[$__rate_interval])) by (job,instance,table_id)) / (sum(rate(state_store_sst_store_block_request_counts{type='data_total'}[$__rate_interval])) by (job,instance,table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"block cache miss rate - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(sum(rate(file_cache_miss[$__rate_interval])) by (instance)) / (sum(rate(file_cache_latency_count{op='get'}[$__rate_interval])) by (instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache miss rate @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"1 - (((sum(rate(state_store_read_req_bloom_filter_positive_counts[$__rate_interval])) by (job,instance,table_id,type))) / (sum(rate(state_store_read_req_check_bloom_filter_counts[$__rate_interval])) by (job,instance,table_id,type)))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read req bloom filter filter rate - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"1 - (((sum(rate(state_store_read_req_positive_but_non_exist_counts[$__rate_interval])) by (job,instance,table_id,type))) / (sum(rate(state_store_read_req_bloom_filter_positive_counts[$__rate_interval])) by (job,instance,table_id,type)))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read req bloom filter false positive rate - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":" Filter/Cache Miss Rate","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":127},"height":null,"hideTimeOverride":false,"id":77,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_merge_sstable_counts_bucket[$__rate_interval])) by (le, job, table_id, type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"# merged ssts p90 - {{table_id}} @ {{job}} @ {{type}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_merge_sstable_counts_bucket[$__rate_interval])) by (le, job, table_id, type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"# merged ssts p99 - {{table_id}} @ {{job}} @ {{type}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_merge_sstable_counts_bucket[$__rate_interval])) by (le, job, table_id, type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"# merged ssts pmax - {{table_id}} @ {{job}} @ {{type}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id)(rate(state_store_iter_merge_sstable_counts_sum[$__rate_interval]))  / sum by(le, job, instance, table_id)(rate(state_store_iter_merge_sstable_counts_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"# merged ssts avg  - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Merged SSTs","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":127},"height":null,"hideTimeOverride":false,"id":78,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_write_batch_duration_count[$__rate_interval])) by (job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write batch - {{table_id}} @ {{job}} @ {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_sync_duration_count[$__rate_interval])) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"l0 - {{job}} @ {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Write Ops","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":135},"height":null,"hideTimeOverride":false,"id":79,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer p50 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id)(rate(state_store_write_batch_duration_sum[$__rate_interval]))  / sum by(le, job, instance, table_id)(rate(state_store_write_batch_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer avg - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store p50 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store p99 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(state_store_write_shared_buffer_sync_time_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(state_store_write_shared_buffer_sync_time_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Write Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":135},"height":null,"hideTimeOverride":false,"id":80,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_write_batch_tuple_counts[$__rate_interval])) by (job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write_batch_kv_pair_count - {{table_id}} @ {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Write Item Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":143},"height":null,"hideTimeOverride":false,"id":81,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_write_batch_size_sum[$__rate_interval]))by(job,instance) / sum(rate(state_store_write_batch_size_count[$__rate_interval]))by(job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"shared_buffer - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(compactor_shared_buffer_to_sstable_size[$__rate_interval]))by(job,instance) / sum(rate(state_store_shared_buffer_to_sstable_size_count[$__rate_interval]))by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"sync - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Write Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":143},"height":null,"hideTimeOverride":false,"id":82,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance) (rate(state_store_sync_size_sum[$__rate_interval])) / sum by(le, job, instance) (rate(state_store_sync_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Checkpoint Sync Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":151},"height":null,"hideTimeOverride":false,"id":83,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"avg(state_store_meta_cache_size) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"meta cache - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"avg(state_store_block_cache_size) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"data cache - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(state_store_limit_memory_size) by (job)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"uploading memory - {{job}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Cache Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":151},"height":null,"hideTimeOverride":false,"id":84,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next p50 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next p99 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance) (rate(batch_row_seq_scan_next_duration_sum[$__rate_interval])) / sum by(le, job, instance) (rate(batch_row_seq_scan_next_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next avg - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Row SeqScan Next Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":159},"height":null,"hideTimeOverride":false,"id":85,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration p50 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id) (rate(state_store_iter_fetch_meta_duration_sum[$__rate_interval])) / sum by(le, job, instance, table_id) (rate(state_store_iter_fetch_meta_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration avg - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Fetch Meta Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":167},"height":null,"hideTimeOverride":false,"id":86,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"num of SSTs in each level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":87,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_sst_num) by (instance, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"SST Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"KBs total file bytes in each level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"kbytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":88,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_total_file_size) by (instance, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"KBs level sst","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of compactions from each level to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":89,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_compact_frequency) by (compactor, group, task_type, result)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{task_type}} - {{result}} - group-{{group}} @ {{compactor}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Success & Failure Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of compaction task which does not trigger","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":90,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_skip_compact_frequency[$__rate_interval])) by (level, type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{level}}-{{type}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Skip Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of compactions from each level to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":91,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"avg(storage_compact_task_pending_num) by(job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compactor_task_split_count - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compactor Running Task Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Total time of compact that have been issued to state store","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":92,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(compactor_compact_task_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-task p50 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(compactor_compact_task_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-task p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(compactor_compact_task_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-task pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(compactor_compact_sst_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-key-range p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(compactor_compact_sst_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-key-range pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(compactor_get_table_id_total_time_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get-table-id p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(compactor_get_table_id_total_time_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get-table-id pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(compactor_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"remote-io p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(compactor_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"remote-io pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le)(rate(compactor_compact_task_duration_sum[$__rate_interval])) / sum by(le)(rate(compactor_compact_task_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-task avg","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le)(rate(state_store_compact_sst_duration_sum[$__rate_interval])) / sum by(le)(rate(state_store_compact_sst_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-key-range avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"KBs read from next level during history compactions to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":93,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_next[$__rate_interval])) by(job,instance) + sum(rate(storage_level_compact_read_curr[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_write[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(compactor_write_build_l0_bytes[$__rate_interval]))by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"flush - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of SSTs written into next level during history compactions to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":24},"height":null,"hideTimeOverride":false,"id":94,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_compact_write) by (job)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write - {{job}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(compactor_write_build_l0_bytes) by (job)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"flush - {{job}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Write Bytes","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of SSTs written into next level during history compactions to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":32},"height":null,"hideTimeOverride":false,"id":95,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_compact_write) / sum(state_store_write_build_l0_bytes)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write amplification","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Write Amplification","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of SSTs to be merged to next level in each level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":32},"height":null,"hideTimeOverride":false,"id":96,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_level_compact_cnt","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compacting SST Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":40},"height":null,"hideTimeOverride":false,"id":97,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_next[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} read","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"KBs Read from Next Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":40},"height":null,"hideTimeOverride":false,"id":98,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_curr[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} read","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"KBs Read from Current Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":48},"height":null,"hideTimeOverride":false,"id":99,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_sstn_curr[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} read","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Count of SSTs Read from Current Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":48},"height":null,"hideTimeOverride":false,"id":100,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_write[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} write","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"KBs Written to Next Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":56},"height":null,"hideTimeOverride":false,"id":101,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_write_sstn[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} write","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Count of SSTs Written to Next Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of SSTs read from next level during history compactions to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":56},"height":null,"hideTimeOverride":false,"id":102,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_sstn_next[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} read","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Count of SSTs Read from Next Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Total bytes gotten from sstable_bloom_filter, for observing bloom_filter size","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":64},"height":null,"hideTimeOverride":false,"id":103,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_bloom_filter_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_bloom_filter_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_meta - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_file_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_file_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_file - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Hummock Sstable Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Total bytes gotten from sstable_avg_key_size, for observing sstable_avg_key_size","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":64},"height":null,"hideTimeOverride":false,"id":104,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_avg_key_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_avg_key_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_key_size - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_avg_value_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_avg_value_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_value_size - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Hummock Sstable Item Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Avg count gotten from sstable_distinct_epoch_count, for observing sstable_distinct_epoch_count","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":72},"height":null,"hideTimeOverride":false,"id":105,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_distinct_epoch_count_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_distinct_epoch_count_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_epoch_count - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Hummock Sstable Stat","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Total time of operations which read from remote storage when enable prefetch","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":72},"height":null,"hideTimeOverride":false,"id":106,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"remote-io p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"remote-io pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Hummock Remote Read Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":80},"height":null,"hideTimeOverride":false,"id":107,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(compactor_iter_scan_key_counts[$__rate_interval])) by (instance, type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"iter keys flow - {{type}} @ {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compactor Iter keys","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"bytes of Lsm tree needed to reach balance","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":80},"height":null,"hideTimeOverride":false,"id":108,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_compact_pending_bytes) by (instance, group)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact pending bytes - {{group}} @ {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Lsm Compact Pending Bytes","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"compression ratio of each level of the lsm tree","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":88},"height":null,"hideTimeOverride":false,"id":109,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_compact_level_compression_ratio) by (instance, group, level, algorithm)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"lsm compression ratio - cg{{group}} @ L{{level}} - {{algorithm}} {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Lsm Level Compression Ratio","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Compaction","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":168},"height":null,"hideTimeOverride":false,"id":110,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":111,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_read_bytes[$__rate_interval]))by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_write_bytes[$__rate_interval]))by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":112,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p50 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p99 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, type, job, instance)(rate(object_store_operation_latency_sum[$__rate_interval])) / sum by(le, type, job, instance) (rate(object_store_operation_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} avg - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":113,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_operation_latency_count[$__rate_interval])) by (le, type, job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_operation_latency_count{type=~'upload|delete'}[$__rate_interval])) by (le, media_type, job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{media_type}}-write - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_operation_latency_count{type=~'read|readv|list|metadata'}[$__rate_interval])) by (le, media_type, job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{media_type}}-read - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Rate","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":114,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p50 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p99 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} pmax - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":115,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_failure_count[$__rate_interval])) by (instance, job, type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Failure Rate","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"$"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":116,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(object_store_read_bytes) * 0.01 / 1000 / 1000 / 1000","format":"time_series","hide":true,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"(Cross Region) Data Transfer Cost","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(object_store_operation_latency_count{type=~'read|streaming_read_start|delete'}) * 0.0004 / 1000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GET, SELECT, and all other Requests Cost","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(object_store_operation_latency_count{type=~'upload|streaming_upload_start|s3_upload_part|streaming_upload_finish|delete_objects|list'}) * 0.005 / 1000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"PUT, COPY, POST, LIST Requests Cost","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Estimated S3 Cost (Realtime)","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"$"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":117,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_total_file_size) by (instance) * 0.023 / 1000 / 1000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Monthly Storage Cost","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Estimated S3 Cost (Monthly)","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Object Storage","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":169},"height":null,"hideTimeOverride":false,"id":118,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":119,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_latency_count[$__rate_interval])) by (op, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_miss[$__rate_interval])) by (instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache miss @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_disk_latency_count[$__rate_interval])) by (op, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache disk {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Ops","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":120,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - file cache - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - file cache - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - file cache - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - file cache - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - file cache disk - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - file cache disk - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - file cache disk - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - file cache disk - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":121,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_disk_bytes[$__rate_interval])) by (op, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"disk {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":122,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - file cache disk - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - file cache disk - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - file cache disk - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - file cache disk - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - file cache disk read entry - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - file cache disk read entry - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - file cache disk read entry - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - file cache disk read entry - {{op}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Disk IO Size","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Hummock Tiered Cache","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":170},"height":null,"hideTimeOverride":false,"id":123,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":124,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Lock Time p50 - {{lock_type}} @ {{lock_name}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Lock Time p99 - {{lock_type}} @ {{lock_name}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Lock Time p999 - {{lock_type}} @ {{lock_name}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Lock Time pmax - {{lock_type}} @ {{lock_name}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Lock Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":125,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Real Process Time p50 - {{method}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Real Process Time p99 - {{method}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Real Process Time p999 - {{method}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Real Process Time pmax - {{method}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Real Process Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":126,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_version_size","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"version size","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Version Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":127,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_current_version_id","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"current version id","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_checkpoint_version_id","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"checkpoint version id","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_min_pinned_version_id","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"min pinned version id","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_min_safepoint_version_id","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"min safepoint version id","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Version Id","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":128,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_max_committed_epoch","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"max committed epoch","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_safe_epoch","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"safe epoch","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_min_pinned_epoch","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"min pinned epoch","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Epoch","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"kbytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":129,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_version_stats{metric='total_key_size'}/1024","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"table{{table_id}} {{metric}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_version_stats{metric='total_value_size'}/1024","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"table{{table_id}} {{metric}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Table KV Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":130,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_version_stats{metric='total_key_count'}","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"table{{table_id}} {{metric}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Table KV Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"total number of SSTs that is no longer referenced by versions but is not yet deleted from storage","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":24},"height":null,"hideTimeOverride":false,"id":131,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_stale_ssts_count","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"stale SST total number","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Stale SST Total Number","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Hummock Manager","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":171},"height":null,"hideTimeOverride":false,"id":132,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":133,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"backup_job_count","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"job count","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Job Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":134,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Job Process Time p50 - {{state}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Job Process Time p99 - {{state}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Job Process Time p999 - {{state}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Job Process Time pmax - {{state}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Job Process Time","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Backup Manager","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":172},"height":null,"hideTimeOverride":false,"id":135,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":136,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Create'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Create_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Create'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Create_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Create'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Create_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.CatalogService/Create'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.CatalogService/Create'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Create_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Create latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":0},"height":null,"hideTimeOverride":false,"id":137,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Drop'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Drop_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Drop'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Drop_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Drop'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Drop_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.CatalogService/Drop'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.CatalogService/Drop'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Drop_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Drop latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":0},"height":null,"hideTimeOverride":false,"id":138,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetCatalog_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetCatalog_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetCatalog_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.CatalogService/GetCatalog'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetCatalog_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"GetCatalog latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC Meta: Catalog Service","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":173},"height":null,"hideTimeOverride":false,"id":139,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":140,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"AddWorkerNode_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"AddWorkerNode_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"AddWorkerNode_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"AddWorkerNode_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"AddWorkerNode latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":0},"height":null,"hideTimeOverride":false,"id":141,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ListAllNodes_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ListAllNodes_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ListAllNodes_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ListAllNodes_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"ListAllNodes latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC Meta: Cluster Service","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":174},"height":null,"hideTimeOverride":false,"id":142,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":143,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"CreateMaterializedView_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"CreateMaterializedView_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"CreateMaterializedView_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"CreateMaterializedView_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"CreateMaterializedView latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":0},"height":null,"hideTimeOverride":false,"id":144,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"DropMaterializedView_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"DropMaterializedView_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"DropMaterializedView_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"DropMaterializedView_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"DropMaterializedView latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":0},"height":null,"hideTimeOverride":false,"id":145,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Flush_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Flush_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Flush_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.StreamManagerService/Flush'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Flush_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Flush latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC Meta: Stream Manager","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":175},"height":null,"hideTimeOverride":false,"id":146,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":147,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinVersionBefore_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinVersionBefore_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinVersionBefore_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinVersionBefore_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"UnpinVersionBefore latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":0},"height":null,"hideTimeOverride":false,"id":148,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinSnapshotBefore_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinSnapshotBefore_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinSnapshotBefore_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinSnapshotBefore_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"UnpinSnapshotBefore latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":0},"height":null,"hideTimeOverride":false,"id":149,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ReportCompactionTasks_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ReportCompactionTasks_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ReportCompactionTasks_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ReportCompactionTasks_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"ReportCompactionTasks latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":150,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetNewSstIds_p50","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetNewSstIds_p90","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetNewSstIds_p99","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetNewSstIds_avg","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"GetNewSstIds latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC Meta: Hummock Manager","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":176},"height":null,"hideTimeOverride":false,"id":151,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":152,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_report_compaction_task_counts[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_counts - {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"compaction_count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":153,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_unpin_version_before_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_version_before_latency_p50 - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_unpin_version_before_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_version_before_latency_p99 - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_unpin_version_before_latency_sum[$__rate_interval])) / sum(irate(state_store_unpin_version_before_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_version_before_latency_avg","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.90, sum(irate(state_store_unpin_version_before_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_version_before_latency_p90 - {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"version_latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":154,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_pin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_latency_p50 - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_pin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_latency_p99 - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(state_store_pin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_latencyp90 - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_pin_snapshot_latency_sum[$__rate_interval])) / sum(irate(state_store_pin_snapshot_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_latency_avg","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_unpin_version_snapshot_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_latency_p50 - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_unpin_version_snapshot_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_latency_p99 - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_unpin_snapshot_latency_sum[$__rate_interval])) / sum(irate(state_store_unpin_snapshot_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_latency_avg","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.90, sum(irate(state_store_unpin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_latency_p90 - {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"snapshot_latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":155,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_pin_snapshot_counts[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_counts - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_unpin_snapshot_counts[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_counts - {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"snapshot_count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":156,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_get_new_sst_ids_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_latency_p50 - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_get_new_sst_ids_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_latency_p99 - {{instance}} ","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_get_new_sst_ids_latency_sum[$__rate_interval])) / sum(irate(state_store_get_new_sst_ids_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_latency_avg","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.90, sum(irate(state_store_get_new_sst_ids_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_latency_p90 - {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"table_latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":157,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_get_new_sst_ids_latency_counts[$__rate_interval]))by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_counts - {{instance}} ","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"table_count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":158,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_report_compaction_task_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_latency_p50 - {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_report_compaction_task_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_latency_p99 - {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_report_compaction_task_latency_sum[$__rate_interval])) / sum(irate(state_store_report_compaction_task_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_latency_avg","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.90, sum(irate(state_store_report_compaction_task_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_latency_p90 - {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"compaction_latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC: Hummock Meta Client","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":177},"height":null,"hideTimeOverride":false,"id":159,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Qps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":160,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(frontend_query_counter_local_execution[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Query Per second in Loacl Execution Mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Qps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":161,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(distributed_completed_query_counter[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Query Per second in Distributed Execution Mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":162,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"distributed_running_query_num","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"The number of running query in distributed execution mode","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Running query in distributed execution mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":163,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"distributed_rejected_query_counter","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"The number of rejected query in distributed execution mode","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Rejected query in distributed execution mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":164,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"distributed_completed_query_counter","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"The number of completed query in distributed execution mode","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Completed query in distributed execution mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":165,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(distributed_query_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(distributed_query_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.95, sum(rate(distributed_query_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Query Latency in Distributed Execution Mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":166,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(frontend_latency_local_execution_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(frontend_latency_local_execution_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.95, sum(rate(frontend_latency_local_execution_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{job}} @ {{instance}}","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Query Latency in Local Execution Mode","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Frontend","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":178},"height":null,"hideTimeOverride":false,"id":167,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":168,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(lru_runtime_loop_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"LRU manager loop count per sec","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":169,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"lru_watermark_step","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"LRU manager watermark steps","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"watermark_time is the current lower watermark of cached data. physical_now is the current time of the machine. The diff (physical_now - watermark_time) shows how much data is cached.","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":170,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"lru_physical_now_ms - lru_current_watermark_time_ms","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"LRU manager diff between watermark_time and now (ms)","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":171,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"jemalloc_allocated_bytes","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"The memory allocated by jemalloc","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":172,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_total_mem_usage","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"The memory allocated by streaming","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":173,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"batch_total_mem_usage","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"The memory allocated by batch","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Memory manager","transformations":[],"transparent":false,"type":"row"}],"refresh":"10s","rows":[],"schemaVersion":12,"sharedCrosshair":true,"style":"dark","tags":["risingwave"],"templating":{"list":[]},"time":{"from":"now-30m","to":"now"},"timepicker":{"hidden":false,"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"],"time_options":["5m","15m","1h","6h","12h","24h","2d","7d","30d"]},"timezone":"browser","title":"risingwave_dashboard","uid":"Ecy3uV1nz","version":0}
+{"__inputs":[],"annotations":{"list":[]},"description":"RisingWave Dashboard","editable":true,"gnetId":null,"graphTooltip":0,"hideControls":false,"id":null,"links":[],"panels":[{"cacheTimeout":null,"collapsed":false,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":1,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Cluster Node","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":1},"height":null,"hideTimeOverride":false,"id":2,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(worker_num) by (worker_type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{worker_type}}","metric":"","query":"sum(worker_num) by (worker_type)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Node Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":1},"height":null,"hideTimeOverride":false,"id":3,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"avg(process_resident_memory_bytes) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{job}} @ {{instance}}","metric":"","query":"avg(process_resident_memory_bytes) by (job,instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Node Memory","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":9},"height":null,"hideTimeOverride":false,"id":4,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(process_cpu_seconds_total[$__rate_interval])) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"cpu - {{job}} @ {{instance}}","metric":"","query":"sum(rate(process_cpu_seconds_total[$__rate_interval])) by (job,instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(process_cpu_seconds_total[$__rate_interval])) by (job,instance) / avg(process_cpu_core_num) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"cpu usage -{{job}} @ {{instance}}","metric":"","query":"sum(rate(process_cpu_seconds_total[$__rate_interval])) by (job,instance) / avg(process_cpu_core_num) by (job,instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Node CPU","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":9},"height":null,"hideTimeOverride":false,"id":5,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(meta_num) by (worker_addr,role)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{worker_addr}} @ {{role}}","metric":"","query":"sum(meta_num) by (worker_addr,role)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Meta Cluster","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"collapsed":false,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":17},"height":null,"hideTimeOverride":false,"id":6,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Streaming","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"rows/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":18},"height":null,"hideTimeOverride":false,"id":7,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_source_output_rows_counts[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"source={{source_name}} {{source_id}} @ {{instance}}","metric":"","query":"rate(stream_source_output_rows_counts[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(rows)","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"rows/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":18},"height":null,"hideTimeOverride":false,"id":8,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(partition_input_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"actor={{actor_id}} source={{source_id}} partition={{partition}}","metric":"","query":"rate(partition_input_count[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(rows) Per Partition","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"MB/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":26},"height":null,"hideTimeOverride":false,"id":9,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(sum by (source_id)(rate(partition_input_bytes[$__rate_interval])))/(1000*1000)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"source={{source_id}}","metric":"","query":"(sum by (source_id)(rate(partition_input_bytes[$__rate_interval])))/(1000*1000)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(bytes)","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"MB/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":26},"height":null,"hideTimeOverride":false,"id":10,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(rate(partition_input_bytes[$__rate_interval]))/(1000*1000)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"actor={{actor_id}} source={{source_id}} partition={{partition}}","metric":"","query":"(rate(partition_input_bytes[$__rate_interval]))/(1000*1000)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(bytes) Per Partition","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"rows/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":34},"height":null,"hideTimeOverride":false,"id":11,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_source_rows_per_barrier_counts[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"actor={{actor_id}} source={{source_id}} @ {{instance}}","metric":"","query":"rate(stream_source_rows_per_barrier_counts[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Throughput(rows) per barrier","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":34},"height":null,"hideTimeOverride":false,"id":12,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"all_barrier_nums","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"all_barrier","metric":"","query":"all_barrier_nums","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"in_flight_barrier_nums","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"in_flight_barrier","metric":"","query":"in_flight_barrier_nums","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Number","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":42},"height":null,"hideTimeOverride":false,"id":13,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_p50","metric":"","query":"histogram_quantile(0.5, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_p90","metric":"","query":"histogram_quantile(0.9, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_p99","metric":"","query":"histogram_quantile(0.99, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_p999","metric":"","query":"histogram_quantile(0.999, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_pmax","metric":"","query":"histogram_quantile(1.0, sum(rate(meta_barrier_send_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(meta_barrier_send_duration_seconds_sum[$__rate_interval]) / rate(meta_barrier_send_duration_seconds_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_send_latency_avg","metric":"","query":"rate(meta_barrier_send_duration_seconds_sum[$__rate_interval]) / rate(meta_barrier_send_duration_seconds_count[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Send Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":42},"height":null,"hideTimeOverride":false,"id":14,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_p50","metric":"","query":"histogram_quantile(0.5, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_p90","metric":"","query":"histogram_quantile(0.9, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_p99","metric":"","query":"histogram_quantile(0.99, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_p999","metric":"","query":"histogram_quantile(0.999, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_pmax","metric":"","query":"histogram_quantile(1.0, sum(rate(meta_barrier_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(meta_barrier_duration_seconds_sum[$__rate_interval]) / rate(meta_barrier_duration_seconds_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_latency_avg","metric":"","query":"rate(meta_barrier_duration_seconds_sum[$__rate_interval]) / rate(meta_barrier_duration_seconds_count[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":50},"height":null,"hideTimeOverride":false,"id":15,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_p50","metric":"","query":"histogram_quantile(0.5, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_p90","metric":"","query":"histogram_quantile(0.9, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_p99","metric":"","query":"histogram_quantile(0.99, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_p999","metric":"","query":"histogram_quantile(0.999, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_pmax","metric":"","query":"histogram_quantile(1.0, sum(rate(stream_barrier_inflight_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"max(sum by(le, instance)(rate(stream_barrier_inflight_duration_seconds_sum[$__rate_interval]))  / sum by(le, instance)(rate(stream_barrier_inflight_duration_seconds_count[$__rate_interval])))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_inflight_latency_avg","metric":"","query":"max(sum by(le, instance)(rate(stream_barrier_inflight_duration_seconds_sum[$__rate_interval]))  / sum by(le, instance)(rate(stream_barrier_inflight_duration_seconds_count[$__rate_interval])))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier In-Flight Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":50},"height":null,"hideTimeOverride":false,"id":16,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_p50 - {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_p90 - {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_p99 - {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_p999 - {{instance}}","metric":"","query":"histogram_quantile(0.999, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_pmax - {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(stream_barrier_sync_storage_duration_seconds_bucket[$__rate_interval])) by (le,instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, instance)(rate(stream_barrier_sync_storage_duration_seconds_sum[$__rate_interval]))  / sum by(le, instance)(rate(stream_barrier_sync_storage_duration_seconds_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_sync_latency_avg - {{instance}}","metric":"","query":"sum by(le, instance)(rate(stream_barrier_sync_storage_duration_seconds_sum[$__rate_interval]))  / sum by(le, instance)(rate(stream_barrier_sync_storage_duration_seconds_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Sync Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":58},"height":null,"hideTimeOverride":false,"id":17,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_p50","metric":"","query":"histogram_quantile(0.5, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_p90","metric":"","query":"histogram_quantile(0.9, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_p99","metric":"","query":"histogram_quantile(0.99, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_p999","metric":"","query":"histogram_quantile(0.999, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_latency_pmax","metric":"","query":"histogram_quantile(1.0, sum(rate(meta_barrier_wait_commit_duration_seconds_bucket[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(meta_barrier_wait_commit_duration_seconds_sum[$__rate_interval]) / rate(meta_barrier_wait_commit_duration_seconds_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"barrier_wait_commit_avg","metric":"","query":"rate(meta_barrier_wait_commit_duration_seconds_sum[$__rate_interval]) / rate(meta_barrier_wait_commit_duration_seconds_count[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Barrier Wait Commit Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":66},"height":null,"hideTimeOverride":false,"id":18,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"rows/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":19,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_executor_row_count[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}->{{executor_id}}","metric":"","query":"rate(stream_executor_row_count[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Executor Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":20,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_output_buffer_blocking_duration_ns[$__rate_interval]) / 1000000000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_output_buffer_blocking_duration_ns[$__rate_interval]) / 1000000000","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Backpressure","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":21,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(actor_memory_usage[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(actor_memory_usage[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Memory Usage","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":22,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_input_buffer_blocking_duration_ns[$__rate_interval]) / 1000000000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}->{{upstream_fragment_id}}","metric":"","query":"rate(stream_actor_input_buffer_blocking_duration_ns[$__rate_interval]) / 1000000000","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Input Blocking Time Ratio","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":23,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_barrier_time[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_barrier_time[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Barrier Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":24,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_processing_time[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_processing_time[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Processing Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":25,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_actor_execution_time[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_actor_execution_time[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Execution Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"row"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":24},"height":null,"hideTimeOverride":false,"id":26,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_in_record_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_in_record_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Input Row","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"row"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":32},"height":null,"hideTimeOverride":false,"id":27,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_out_record_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_out_record_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Actor Output Row","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":12,"y":32},"height":null,"hideTimeOverride":false,"id":28,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_fast_poll_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_fast_poll_duration[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Fast Poll Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":40},"height":null,"hideTimeOverride":false,"id":29,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_fast_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_fast_poll_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Fast Poll Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":40},"height":null,"hideTimeOverride":false,"id":30,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_fast_poll_duration[$__rate_interval]) / rate(stream_actor_fast_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_fast_poll_duration[$__rate_interval]) / rate(stream_actor_fast_poll_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Fast Poll Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":40},"height":null,"hideTimeOverride":false,"id":31,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_slow_poll_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_slow_poll_duration[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Slow Poll Total Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":48},"height":null,"hideTimeOverride":false,"id":32,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_slow_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_slow_poll_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Slow Poll Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":48},"height":null,"hideTimeOverride":false,"id":33,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_slow_poll_duration[$__rate_interval]) / rate(stream_actor_slow_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_slow_poll_duration[$__rate_interval]) / rate(stream_actor_slow_poll_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Slow Poll Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":48},"height":null,"hideTimeOverride":false,"id":34,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_poll_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_poll_duration[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Poll Total Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":56},"height":null,"hideTimeOverride":false,"id":35,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_poll_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Poll Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":56},"height":null,"hideTimeOverride":false,"id":36,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_poll_duration[$__rate_interval]) / rate(stream_actor_poll_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_poll_duration[$__rate_interval]) / rate(stream_actor_poll_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Poll Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":56},"height":null,"hideTimeOverride":false,"id":37,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_idle_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_idle_duration[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Idle Total Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":64},"height":null,"hideTimeOverride":false,"id":38,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_idle_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_idle_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Idle Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":64},"height":null,"hideTimeOverride":false,"id":39,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_idle_duration[$__rate_interval]) / rate(stream_actor_idle_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_idle_duration[$__rate_interval]) / rate(stream_actor_idle_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Idle Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":64},"height":null,"hideTimeOverride":false,"id":40,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_scheduled_duration[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_scheduled_duration[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Scheduled Total Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":72},"height":null,"hideTimeOverride":false,"id":41,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_scheduled_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_scheduled_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Scheduled Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":72},"height":null,"hideTimeOverride":false,"id":42,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_actor_scheduled_duration[$__rate_interval]) / rate(stream_actor_scheduled_cnt[$__rate_interval]) > 0","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_actor_scheduled_duration[$__rate_interval]) / rate(stream_actor_scheduled_cnt[$__rate_interval]) > 0","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Tokio: Actor Scheduled Avg Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":80},"height":null,"hideTimeOverride":false,"id":43,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_lookup_miss_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"cache miss {{actor_id}} {{side}}","metric":"","query":"rate(stream_join_lookup_miss_count[$__rate_interval])","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_lookup_total_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"total lookups {{actor_id}} {{side}}","metric":"","query":"rate(stream_join_lookup_total_count[$__rate_interval])","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_insert_cache_miss_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"cache miss when insert{{actor_id}} {{side}}","metric":"","query":"rate(stream_join_insert_cache_miss_count[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Executor Cache","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":80},"height":null,"hideTimeOverride":false,"id":44,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p999 {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.999, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(stream_join_barrier_align_duration_bucket[$__rate_interval])) by (le, actor_id, wait_side, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, actor_id, wait_side, job, instance)(rate(stream_join_barrier_align_duration_sum[$__rate_interval])) / sum by(le,actor_id,wait_side,job,instance) (rate(stream_join_barrier_align_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg {{actor_id}}.{{wait_side}} - {{job}} @ {{instance}}","metric":"","query":"sum by(le, actor_id, wait_side, job, instance)(rate(stream_join_barrier_align_duration_sum[$__rate_interval])) / sum by(le,actor_id,wait_side,job,instance) (rate(stream_join_barrier_align_duration_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Executor Barrier Align","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":88},"height":null,"hideTimeOverride":false,"id":45,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_actor_input_waiting_duration_ns[$__rate_interval]) / 1000000000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"rate(stream_join_actor_input_waiting_duration_ns[$__rate_interval]) / 1000000000","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Actor Input Blocking Time Ratio","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":88},"height":null,"hideTimeOverride":false,"id":46,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_join_match_duration_ns[$__rate_interval]) / 1000000000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}.{{side}}","metric":"","query":"rate(stream_join_match_duration_ns[$__rate_interval]) / 1000000000","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Actor Match Duration Per Second","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":96},"height":null,"hideTimeOverride":false,"id":47,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_join_cached_entries","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}} {{side}}","metric":"","query":"stream_join_cached_entries","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Cached Entries","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":96},"height":null,"hideTimeOverride":false,"id":48,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_join_cached_rows","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}} {{side}}","metric":"","query":"stream_join_cached_rows","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Cached Rows","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":104},"height":null,"hideTimeOverride":false,"id":49,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_join_cached_estimated_size","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}} {{side}}","metric":"","query":"stream_join_cached_estimated_size","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Join Cached Estimated Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":104},"height":null,"hideTimeOverride":false,"id":50,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_agg_lookup_miss_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"cache miss {{actor_id}}","metric":"","query":"rate(stream_agg_lookup_miss_count[$__rate_interval])","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_agg_lookup_total_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"total lookups {{actor_id}}","metric":"","query":"rate(stream_agg_lookup_total_count[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Aggregation Executor Cache Statistics For Each Key/State","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":0,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":112},"height":null,"hideTimeOverride":false,"id":51,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_agg_chunk_lookup_miss_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"chunk-level cache miss {{actor_id}}","metric":"","query":"rate(stream_agg_chunk_lookup_miss_count[$__rate_interval])","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_agg_chunk_lookup_total_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"chunk-level total lookups {{actor_id}}","metric":"","query":"rate(stream_agg_chunk_lookup_total_count[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Aggregation Executor Cache Statistics For Each StreamChunk","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":112},"height":null,"hideTimeOverride":false,"id":52,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_agg_cached_keys","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{actor_id}}","metric":"","query":"stream_agg_cached_keys","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Aggregation Cached Keys","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Streaming Actors","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":67},"height":null,"hideTimeOverride":false,"id":53,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":54,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_exchange_frag_send_size[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{up_fragment_id}}->{{down_fragment_id}}","metric":"","query":"rate(stream_exchange_frag_send_size[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Fragment-level Remote Exchange Send Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":55,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(stream_exchange_frag_recv_size[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{up_fragment_id}}->{{down_fragment_id}}","metric":"","query":"rate(stream_exchange_frag_recv_size[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Fragment-level Remote Exchange Recv Throughput","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Streaming Exchange","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":68},"height":null,"hideTimeOverride":false,"id":56,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":57,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(user_compute_error_count) by (error_type, error_msg, fragment_id, executor_name)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{error_type}}: {{error_msg}} ({{executor_name}}: fragment_id={{fragment_id}})","metric":"","query":"sum(user_compute_error_count) by (error_type, error_msg, fragment_id, executor_name)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compute Errors by Type","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":58,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(user_source_error_count) by (error_type, error_msg, fragment_id, table_id, executor_name)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{error_type}}: {{error_msg}} ({{executor_name}}: table_id={{table_id}}, fragment_id={{fragment_id}})","metric":"","query":"sum(user_source_error_count) by (error_type, error_msg, fragment_id, table_id, executor_name)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Source Errors by Type","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"User Streaming Errors","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":69},"height":null,"hideTimeOverride":false,"id":59,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"row"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":60,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"batch_task_exchange_recv_row_number","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{query_id}} : {{source_stage_id}}.{{source_task_id}} -> {{target_stage_id}}.{{target_task_id}}","metric":"","query":"batch_task_exchange_recv_row_number","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Exchange Recv Row Number","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"row"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":61,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"batch_task_num","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","query":"batch_task_num","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Batch Mpp Task Number","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Batch Metrics","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":false,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":70},"height":null,"hideTimeOverride":false,"id":62,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Hummock","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":71},"height":null,"hideTimeOverride":false,"id":63,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_sync_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance) (rate(state_store_sync_duration_sum[$__rate_interval])) / sum by(le, job, instance) (rate(state_store_sync_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance) (rate(state_store_sync_duration_sum[$__rate_interval])) / sum by(le, job, instance) (rate(state_store_sync_duration_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Build and Sync Sstable Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":71},"height":null,"hideTimeOverride":false,"id":64,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_sst_store_block_request_counts[$__rate_interval])) by (job, instance, table_id, type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{table_id}} @ {{type}} - {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_sst_store_block_request_counts[$__rate_interval])) by (job, instance, table_id, type)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_latency_count[$__rate_interval])) by (op, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache {{op}} @ {{instance}}","metric":"","query":"sum(rate(file_cache_latency_count[$__rate_interval])) by (op, instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_miss[$__rate_interval])) by (instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache miss @ {{instance}}","metric":"","query":"sum(rate(file_cache_miss[$__rate_interval])) by (instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Cache Ops","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":79},"height":null,"hideTimeOverride":false,"id":65,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_get_duration_count[$__rate_interval])) by (job,instanc,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_get_duration_count[$__rate_interval])) by (job,instanc,table_id)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_range_reverse_scan_duration_count[$__rate_interval])) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"backward scan - {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_range_reverse_scan_duration_count[$__rate_interval])) by (job,instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_get_shared_buffer_hit_counts[$__rate_interval])) by (job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"shared_buffer hit - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_get_shared_buffer_hit_counts[$__rate_interval])) by (job,instance,table_id)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_iter_in_process_counts[$__rate_interval])) by(job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"iter - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_iter_in_process_counts[$__rate_interval])) by(job,instance,table_id)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Ops","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":79},"height":null,"hideTimeOverride":false,"id":66,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_get_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id)(rate(state_store_get_duration_sum[$__rate_interval])) / sum by(le, job, instance, table_id) (rate(state_store_get_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg - {{table_id}} {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance, table_id)(rate(state_store_get_duration_sum[$__rate_interval])) / sum by(le, job, instance, table_id) (rate(state_store_get_duration_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Duration - Get","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":87},"height":null,"hideTimeOverride":false,"id":67,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time p999 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.999, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_iter_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(state_store_iter_duration_sum[$__rate_interval])) / sum by(le, job,instance) (rate(state_store_iter_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"create_iter_time avg - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance)(rate(state_store_iter_duration_sum[$__rate_interval])) / sum by(le, job,instance) (rate(state_store_iter_duration_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time p999 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.999, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_iter_scan_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(state_store_scan_iter_duration_sum[$__rate_interval])) / sum by(le, job,instance) (rate(state_store_iter_scan_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pure_scan_time avg - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance)(rate(state_store_scan_iter_duration_sum[$__rate_interval])) / sum by(le, job,instance) (rate(state_store_iter_scan_duration_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Duration - Iter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":87},"height":null,"hideTimeOverride":false,"id":68,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(0.9, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(0.9, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(0.99, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(0.99, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(0.999, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p999 - {{table_id}} {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.999, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(0.999, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(1.0, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_get_key_size_bucket[$__rate_interval])) by (le, job, instance, table_id)) + histogram_quantile(1.0, sum(rate(state_store_get_value_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Item Size - Get","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":95},"height":null,"hideTimeOverride":false,"id":69,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p999 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.999, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_iter_size_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Item Size - Iter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":95},"height":null,"hideTimeOverride":false,"id":70,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p999 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.999, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_iter_item_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Item Count - Iter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":103},"height":null,"hideTimeOverride":false,"id":71,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_get_key_size_sum[$__rate_interval])) by(job, instance) + sum(rate(state_store_get_value_size_sum[$__rate_interval])) by(job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_get_key_size_sum[$__rate_interval])) by(job, instance) + sum(rate(state_store_get_value_size_sum[$__rate_interval])) by(job, instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Throughput - Get","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":103},"height":null,"hideTimeOverride":false,"id":72,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_iter_size_sum[$__rate_interval])) by(job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_iter_size_sum[$__rate_interval])) by(job, instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Throughput - Iter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":111},"height":null,"hideTimeOverride":false,"id":73,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_may_exist_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id)(rate(state_store_may_exist_duration_sum[$__rate_interval])) / sum by(le, job, instance, table_id) (rate(state_store_may_exist_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg - {{table_id}} {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance, table_id)(rate(state_store_may_exist_duration_sum[$__rate_interval])) / sum by(le, job, instance, table_id) (rate(state_store_may_exist_duration_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Duration - MayExist","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":111},"height":null,"hideTimeOverride":false,"id":74,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_bloom_filter_true_negative_counts[$__rate_interval])) by (job,instance,table_id,type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"bloom filter true negative  - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_bloom_filter_true_negative_counts[$__rate_interval])) by (job,instance,table_id,type)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_read_req_positive_but_non_exist_counts[$__rate_interval])) by (job,instance,table_id,type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"bloom filter false positive count  - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_read_req_positive_but_non_exist_counts[$__rate_interval])) by (job,instance,table_id,type)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_read_req_bloom_filter_positive_counts[$__rate_interval])) by (job,instance,table_id,type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read_req bloom filter positive - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_read_req_bloom_filter_positive_counts[$__rate_interval])) by (job,instance,table_id,type)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_read_req_check_bloom_filter_counts[$__rate_interval])) by (job,instance,table_id,type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read_req check bloom filter - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_read_req_check_bloom_filter_counts[$__rate_interval])) by (job,instance,table_id,type)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Bloom Filter","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":119},"height":null,"hideTimeOverride":false,"id":75,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_iter_scan_key_counts[$__rate_interval])) by (instance, type, table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"iter keys flow - {{table_id}} @ {{type}} @ {{instance}} ","metric":"","query":"sum(rate(state_store_iter_scan_key_counts[$__rate_interval])) by (instance, type, table_id)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Iter keys flow","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":119},"height":null,"hideTimeOverride":false,"id":76,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"1 - (sum(rate(state_store_bloom_filter_true_negative_counts[$__rate_interval])) by (job,instance,table_id,type)) / (sum(rate(state_bloom_filter_check_counts[$__rate_interval])) by (job,instance,table_id,type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"bloom filter miss rate - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","query":"1 - (sum(rate(state_store_bloom_filter_true_negative_counts[$__rate_interval])) by (job,instance,table_id,type)) / (sum(rate(state_bloom_filter_check_counts[$__rate_interval])) by (job,instance,table_id,type))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(sum(rate(state_store_sst_store_block_request_counts{type='meta_miss'}[$__rate_interval])) by (job,instance,table_id)) / (sum(rate(state_store_sst_store_block_request_counts{type='meta_total'}[$__rate_interval])) by (job,instance,table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"meta cache miss rate - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"(sum(rate(state_store_sst_store_block_request_counts{type='meta_miss'}[$__rate_interval])) by (job,instance,table_id)) / (sum(rate(state_store_sst_store_block_request_counts{type='meta_total'}[$__rate_interval])) by (job,instance,table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(sum(rate(state_store_sst_store_block_request_counts{type='data_miss'}[$__rate_interval])) by (job,instance,table_id)) / (sum(rate(state_store_sst_store_block_request_counts{type='data_total'}[$__rate_interval])) by (job,instance,table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"block cache miss rate - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"(sum(rate(state_store_sst_store_block_request_counts{type='data_miss'}[$__rate_interval])) by (job,instance,table_id)) / (sum(rate(state_store_sst_store_block_request_counts{type='data_total'}[$__rate_interval])) by (job,instance,table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"(sum(rate(file_cache_miss[$__rate_interval])) by (instance)) / (sum(rate(file_cache_latency_count{op='get'}[$__rate_interval])) by (instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache miss rate @ {{instance}}","metric":"","query":"(sum(rate(file_cache_miss[$__rate_interval])) by (instance)) / (sum(rate(file_cache_latency_count{op='get'}[$__rate_interval])) by (instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"1 - (((sum(rate(state_store_read_req_bloom_filter_positive_counts[$__rate_interval])) by (job,instance,table_id,type))) / (sum(rate(state_store_read_req_check_bloom_filter_counts[$__rate_interval])) by (job,instance,table_id,type)))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read req bloom filter filter rate - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","query":"1 - (((sum(rate(state_store_read_req_bloom_filter_positive_counts[$__rate_interval])) by (job,instance,table_id,type))) / (sum(rate(state_store_read_req_check_bloom_filter_counts[$__rate_interval])) by (job,instance,table_id,type)))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"1 - (((sum(rate(state_store_read_req_positive_but_non_exist_counts[$__rate_interval])) by (job,instance,table_id,type))) / (sum(rate(state_store_read_req_bloom_filter_positive_counts[$__rate_interval])) by (job,instance,table_id,type)))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read req bloom filter false positive rate - {{table_id}} - {{type}} @ {{job}} @ {{instance}}","metric":"","query":"1 - (((sum(rate(state_store_read_req_positive_but_non_exist_counts[$__rate_interval])) by (job,instance,table_id,type))) / (sum(rate(state_store_read_req_bloom_filter_positive_counts[$__rate_interval])) by (job,instance,table_id,type)))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":" Filter/Cache Miss Rate","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":127},"height":null,"hideTimeOverride":false,"id":77,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_merge_sstable_counts_bucket[$__rate_interval])) by (le, job, table_id, type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"# merged ssts p90 - {{table_id}} @ {{job}} @ {{type}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_iter_merge_sstable_counts_bucket[$__rate_interval])) by (le, job, table_id, type))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_merge_sstable_counts_bucket[$__rate_interval])) by (le, job, table_id, type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"# merged ssts p99 - {{table_id}} @ {{job}} @ {{type}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_iter_merge_sstable_counts_bucket[$__rate_interval])) by (le, job, table_id, type))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_merge_sstable_counts_bucket[$__rate_interval])) by (le, job, table_id, type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"# merged ssts pmax - {{table_id}} @ {{job}} @ {{type}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_iter_merge_sstable_counts_bucket[$__rate_interval])) by (le, job, table_id, type))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id)(rate(state_store_iter_merge_sstable_counts_sum[$__rate_interval]))  / sum by(le, job, instance, table_id)(rate(state_store_iter_merge_sstable_counts_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"# merged ssts avg  - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance, table_id)(rate(state_store_iter_merge_sstable_counts_sum[$__rate_interval]))  / sum by(le, job, instance, table_id)(rate(state_store_iter_merge_sstable_counts_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Read Merged SSTs","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":127},"height":null,"hideTimeOverride":false,"id":78,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_write_batch_duration_count[$__rate_interval])) by (job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write batch - {{table_id}} @ {{job}} @ {{instance}} ","metric":"","query":"sum(rate(state_store_write_batch_duration_count[$__rate_interval])) by (job,instance,table_id)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_sync_duration_count[$__rate_interval])) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"l0 - {{job}} @ {{instance}} ","metric":"","query":"sum(rate(state_store_sync_duration_count[$__rate_interval])) by (job,instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Write Ops","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":135},"height":null,"hideTimeOverride":false,"id":79,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer p50 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_write_batch_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id)(rate(state_store_write_batch_duration_sum[$__rate_interval]))  / sum by(le, job, instance, table_id)(rate(state_store_write_batch_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to shared_buffer avg - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance, table_id)(rate(state_store_write_batch_duration_sum[$__rate_interval]))  / sum by(le, job, instance, table_id)(rate(state_store_write_batch_duration_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store p50 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store p99 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_write_shared_buffer_sync_time_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(state_store_write_shared_buffer_sync_time_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(state_store_write_shared_buffer_sync_time_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write to object_store - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance)(rate(state_store_write_shared_buffer_sync_time_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(state_store_write_shared_buffer_sync_time_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Write Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":135},"height":null,"hideTimeOverride":false,"id":80,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_write_batch_tuple_counts[$__rate_interval])) by (job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write_batch_kv_pair_count - {{table_id}} @ {{instance}} ","metric":"","query":"sum(rate(state_store_write_batch_tuple_counts[$__rate_interval])) by (job,instance,table_id)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Write Item Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":143},"height":null,"hideTimeOverride":false,"id":81,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(state_store_write_batch_size_sum[$__rate_interval]))by(job,instance) / sum(rate(state_store_write_batch_size_count[$__rate_interval]))by(job,instance,table_id)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"shared_buffer - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"sum(rate(state_store_write_batch_size_sum[$__rate_interval]))by(job,instance) / sum(rate(state_store_write_batch_size_count[$__rate_interval]))by(job,instance,table_id)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(compactor_shared_buffer_to_sstable_size[$__rate_interval]))by(job,instance) / sum(rate(state_store_shared_buffer_to_sstable_size_count[$__rate_interval]))by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"sync - {{job}} @ {{instance}}","metric":"","query":"sum(rate(compactor_shared_buffer_to_sstable_size[$__rate_interval]))by(job,instance) / sum(rate(state_store_shared_buffer_to_sstable_size_count[$__rate_interval]))by(job,instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Write Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":143},"height":null,"hideTimeOverride":false,"id":82,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_sync_size_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance) (rate(state_store_sync_size_sum[$__rate_interval])) / sum by(le, job, instance) (rate(state_store_sync_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance) (rate(state_store_sync_size_sum[$__rate_interval])) / sum by(le, job, instance) (rate(state_store_sync_size_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Checkpoint Sync Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":151},"height":null,"hideTimeOverride":false,"id":83,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"avg(state_store_meta_cache_size) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"meta cache - {{job}} @ {{instance}}","metric":"","query":"avg(state_store_meta_cache_size) by (job,instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"avg(state_store_block_cache_size) by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"data cache - {{job}} @ {{instance}}","metric":"","query":"avg(state_store_block_cache_size) by (job,instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(state_store_limit_memory_size) by (job)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"uploading memory - {{job}}","metric":"","query":"sum(state_store_limit_memory_size) by (job)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Cache Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":151},"height":null,"hideTimeOverride":false,"id":84,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next p50 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next p99 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(batch_row_seq_scan_next_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance) (rate(batch_row_seq_scan_next_duration_sum[$__rate_interval])) / sum by(le, job, instance) (rate(batch_row_seq_scan_next_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"row_seq_scan next avg - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance) (rate(batch_row_seq_scan_next_duration_sum[$__rate_interval])) / sum by(le, job, instance) (rate(batch_row_seq_scan_next_duration_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Row SeqScan Next Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":159},"height":null,"hideTimeOverride":false,"id":85,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration p50 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration p99 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_iter_fetch_meta_duration_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance, table_id) (rate(state_store_iter_fetch_meta_duration_sum[$__rate_interval])) / sum by(le, job, instance, table_id) (rate(state_store_iter_fetch_meta_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"fetch_meta_duration avg - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance, table_id) (rate(state_store_iter_fetch_meta_duration_sum[$__rate_interval])) / sum by(le, job, instance, table_id) (rate(state_store_iter_fetch_meta_duration_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Fetch Meta Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":167},"height":null,"hideTimeOverride":false,"id":86,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"num of SSTs in each level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":87,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_sst_num) by (instance, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}}","metric":"","query":"sum(storage_level_sst_num) by (instance, level_index)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"SST Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"KBs total file bytes in each level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"kbytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":88,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_total_file_size) by (instance, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}}","metric":"","query":"sum(storage_level_total_file_size) by (instance, level_index)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"KBs level sst","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"compactor core resource need to scale out","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":89,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_compactor_suggest_core_count)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"suggest-core-count","metric":"","query":"sum(storage_compactor_suggest_core_count)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"scale compactor core count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of compactions from each level to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":90,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_compact_frequency) by (compactor, group, task_type, result)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{task_type}} - {{result}} - group-{{group}} @ {{compactor}}","metric":"","query":"sum(storage_level_compact_frequency) by (compactor, group, task_type, result)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Success & Failure Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of compaction task which does not trigger","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":91,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_skip_compact_frequency[$__rate_interval])) by (level, type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{level}}-{{type}}","metric":"","query":"sum(rate(storage_skip_compact_frequency[$__rate_interval])) by (level, type)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Skip Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of compactions from each level to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":92,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"avg(storage_compact_task_pending_num) by(job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compactor_task_split_count - {{job}} @ {{instance}}","metric":"","query":"avg(storage_compact_task_pending_num) by(job, instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compactor Running Task Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Total time of compact that have been issued to state store","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":93,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(compactor_compact_task_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-task p50 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(compactor_compact_task_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(compactor_compact_task_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-task p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(compactor_compact_task_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(compactor_compact_task_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-task pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(compactor_compact_task_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(compactor_compact_sst_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-key-range p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(compactor_compact_sst_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(compactor_compact_sst_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-key-range pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(compactor_compact_sst_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(compactor_get_table_id_total_time_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get-table-id p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(compactor_get_table_id_total_time_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(compactor_get_table_id_total_time_duration_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get-table-id pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(compactor_get_table_id_total_time_duration_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(compactor_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"remote-io p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(compactor_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(compactor_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"remote-io pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(compactor_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le)(rate(compactor_compact_task_duration_sum[$__rate_interval])) / sum by(le)(rate(compactor_compact_task_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-task avg","metric":"","query":"sum by(le)(rate(compactor_compact_task_duration_sum[$__rate_interval])) / sum by(le)(rate(compactor_compact_task_duration_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le)(rate(state_store_compact_sst_duration_sum[$__rate_interval])) / sum by(le)(rate(state_store_compact_sst_duration_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact-key-range avg","metric":"","query":"sum by(le)(rate(state_store_compact_sst_duration_sum[$__rate_interval])) / sum by(le)(rate(state_store_compact_sst_duration_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"KBs read from next level during history compactions to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":24},"height":null,"hideTimeOverride":false,"id":94,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_next[$__rate_interval])) by(job,instance) + sum(rate(storage_level_compact_read_curr[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read - {{job}} @ {{instance}}","metric":"","query":"sum(rate(storage_level_compact_read_next[$__rate_interval])) by(job,instance) + sum(rate(storage_level_compact_read_curr[$__rate_interval])) by(job,instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_write[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write - {{job}} @ {{instance}}","metric":"","query":"sum(rate(storage_level_compact_write[$__rate_interval])) by(job,instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(compactor_write_build_l0_bytes[$__rate_interval]))by (job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"flush - {{job}} @ {{instance}}","metric":"","query":"sum(rate(compactor_write_build_l0_bytes[$__rate_interval]))by (job,instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of SSTs written into next level during history compactions to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":32},"height":null,"hideTimeOverride":false,"id":95,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_compact_write) by (job)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write - {{job}}","metric":"","query":"sum(storage_level_compact_write) by (job)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(compactor_write_build_l0_bytes) by (job)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"flush - {{job}}","metric":"","query":"sum(compactor_write_build_l0_bytes) by (job)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Write Bytes","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of SSTs written into next level during history compactions to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":32},"height":null,"hideTimeOverride":false,"id":96,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_compact_write) / sum(state_store_write_build_l0_bytes)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write amplification","metric":"","query":"sum(storage_level_compact_write) / sum(state_store_write_build_l0_bytes)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compaction Write Amplification","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of SSTs to be merged to next level in each level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":40},"height":null,"hideTimeOverride":false,"id":97,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_level_compact_cnt","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}}","metric":"","query":"storage_level_compact_cnt","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compacting SST Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":40},"height":null,"hideTimeOverride":false,"id":98,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_next[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} read","metric":"","query":"sum(rate(storage_level_compact_read_next[$__rate_interval])) by (le, level_index)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"KBs Read from Next Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":48},"height":null,"hideTimeOverride":false,"id":99,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_curr[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} read","metric":"","query":"sum(rate(storage_level_compact_read_curr[$__rate_interval])) by (le, level_index)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"KBs Read from Current Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":48},"height":null,"hideTimeOverride":false,"id":100,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_sstn_curr[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} read","metric":"","query":"sum(rate(storage_level_compact_read_sstn_curr[$__rate_interval])) by (le, level_index)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Count of SSTs Read from Current Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":56},"height":null,"hideTimeOverride":false,"id":101,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_write[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} write","metric":"","query":"sum(rate(storage_level_compact_write[$__rate_interval])) by (le, level_index)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"KBs Written to Next Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":56},"height":null,"hideTimeOverride":false,"id":102,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_write_sstn[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} write","metric":"","query":"sum(rate(storage_level_compact_write_sstn[$__rate_interval])) by (le, level_index)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Count of SSTs Written to Next Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"num of SSTs read from next level during history compactions to next level","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":64},"height":null,"hideTimeOverride":false,"id":103,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(storage_level_compact_read_sstn_next[$__rate_interval])) by (le, level_index)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"L{{level_index}} read","metric":"","query":"sum(rate(storage_level_compact_read_sstn_next[$__rate_interval])) by (le, level_index)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Count of SSTs Read from Next Level","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Total bytes gotten from sstable_bloom_filter, for observing bloom_filter size","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":64},"height":null,"hideTimeOverride":false,"id":104,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_bloom_filter_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_bloom_filter_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_meta - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance)(rate(compactor_sstable_bloom_filter_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_bloom_filter_size_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_file_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_file_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_file - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance)(rate(compactor_sstable_file_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_file_size_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Hummock Sstable Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Total bytes gotten from sstable_avg_key_size, for observing sstable_avg_key_size","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":72},"height":null,"hideTimeOverride":false,"id":105,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_avg_key_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_avg_key_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_key_size - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance)(rate(compactor_sstable_avg_key_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_avg_key_size_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_avg_value_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_avg_value_size_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_value_size - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance)(rate(compactor_sstable_avg_value_size_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_avg_value_size_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Hummock Sstable Item Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Avg count gotten from sstable_distinct_epoch_count, for observing sstable_distinct_epoch_count","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":72},"height":null,"hideTimeOverride":false,"id":106,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, job, instance)(rate(compactor_sstable_distinct_epoch_count_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_distinct_epoch_count_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"avg_epoch_count - {{job}} @ {{instance}}","metric":"","query":"sum by(le, job, instance)(rate(compactor_sstable_distinct_epoch_count_sum[$__rate_interval]))  / sum by(le, job, instance)(rate(compactor_sstable_distinct_epoch_count_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Hummock Sstable Stat","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"Total time of operations which read from remote storage when enable prefetch","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":80},"height":null,"hideTimeOverride":false,"id":107,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(state_store_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"remote-io p90 - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(state_store_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(state_store_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance, table_id))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"remote-io pmax - {{table_id}} @ {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(state_store_remote_read_time_per_task_bucket[$__rate_interval])) by (le, job, instance, table_id))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Hummock Remote Read Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":80},"height":null,"hideTimeOverride":false,"id":108,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(compactor_iter_scan_key_counts[$__rate_interval])) by (instance, type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"iter keys flow - {{type}} @ {{instance}} ","metric":"","query":"sum(rate(compactor_iter_scan_key_counts[$__rate_interval])) by (instance, type)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Compactor Iter keys","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"bytes of Lsm tree needed to reach balance","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":88},"height":null,"hideTimeOverride":false,"id":109,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_compact_pending_bytes) by (instance, group)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"compact pending bytes - {{group}} @ {{instance}} ","metric":"","query":"sum(storage_compact_pending_bytes) by (instance, group)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Lsm Compact Pending Bytes","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"compression ratio of each level of the lsm tree","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"percentunit"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":88},"height":null,"hideTimeOverride":false,"id":110,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_compact_level_compression_ratio) by (instance, group, level, algorithm)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"lsm compression ratio - cg{{group}} @ L{{level}} - {{algorithm}} {{instance}} ","metric":"","query":"sum(storage_compact_level_compression_ratio) by (instance, group, level, algorithm)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Lsm Level Compression Ratio","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Compaction","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":168},"height":null,"hideTimeOverride":false,"id":111,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":112,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_read_bytes[$__rate_interval]))by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"read - {{job}} @ {{instance}}","metric":"","query":"sum(rate(object_store_read_bytes[$__rate_interval]))by(job,instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_write_bytes[$__rate_interval]))by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"write - {{job}} @ {{instance}}","metric":"","query":"sum(rate(object_store_write_bytes[$__rate_interval]))by(job,instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":113,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p50 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p99 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(object_store_operation_latency_bucket[$__rate_interval])) by (le, type, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum by(le, type, job, instance)(rate(object_store_operation_latency_sum[$__rate_interval])) / sum by(le, type, job, instance) (rate(object_store_operation_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} avg - {{job}} @ {{instance}}","metric":"","query":"sum by(le, type, job, instance)(rate(object_store_operation_latency_sum[$__rate_interval])) / sum by(le, type, job, instance) (rate(object_store_operation_latency_count[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Duration","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":114,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_operation_latency_count[$__rate_interval])) by (le, type, job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} - {{job}} @ {{instance}}","metric":"","query":"sum(rate(object_store_operation_latency_count[$__rate_interval])) by (le, type, job, instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_operation_latency_count{type=~'upload|delete'}[$__rate_interval])) by (le, media_type, job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{media_type}}-write - {{job}} @ {{instance}}","metric":"","query":"sum(rate(object_store_operation_latency_count{type=~'upload|delete'}[$__rate_interval])) by (le, media_type, job, instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_operation_latency_count{type=~'read|readv|list|metadata'}[$__rate_interval])) by (le, media_type, job, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{media_type}}-read - {{job}} @ {{instance}}","metric":"","query":"sum(rate(object_store_operation_latency_count{type=~'read|readv|list|metadata'}[$__rate_interval])) by (le, media_type, job, instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Rate","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":115,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p50 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} p99 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} pmax - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(object_store_operation_bytes_bucket[$__rate_interval])) by (le, type, job, instance))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":116,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(object_store_failure_count[$__rate_interval])) by (instance, job, type)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{type}} - {{job}} @ {{instance}}","metric":"","query":"sum(rate(object_store_failure_count[$__rate_interval])) by (instance, job, type)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Operation Failure Rate","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"$"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":117,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(object_store_read_bytes) * 0.01 / 1000 / 1000 / 1000","format":"time_series","hide":true,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"(Cross Region) Data Transfer Cost","metric":"","query":"sum(object_store_read_bytes) * 0.01 / 1000 / 1000 / 1000","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(object_store_operation_latency_count{type=~'read|streaming_read_start|delete'}) * 0.0004 / 1000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GET, SELECT, and all other Requests Cost","metric":"","query":"sum(object_store_operation_latency_count{type=~'read|streaming_read_start|delete'}) * 0.0004 / 1000","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(object_store_operation_latency_count{type=~'upload|streaming_upload_start|s3_upload_part|streaming_upload_finish|delete_objects|list'}) * 0.005 / 1000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"PUT, COPY, POST, LIST Requests Cost","metric":"","query":"sum(object_store_operation_latency_count{type=~'upload|streaming_upload_start|s3_upload_part|streaming_upload_finish|delete_objects|list'}) * 0.005 / 1000","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Estimated S3 Cost (Realtime)","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"$"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":118,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(storage_level_total_file_size) by (instance) * 0.023 / 1000 / 1000","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Monthly Storage Cost","metric":"","query":"sum(storage_level_total_file_size) by (instance) * 0.023 / 1000 / 1000","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Estimated S3 Cost (Monthly)","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Object Storage","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":169},"height":null,"hideTimeOverride":false,"id":119,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"ops"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":120,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_latency_count[$__rate_interval])) by (op, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache {{op}} @ {{instance}}","metric":"","query":"sum(rate(file_cache_latency_count[$__rate_interval])) by (op, instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_miss[$__rate_interval])) by (instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache miss @ {{instance}}","metric":"","query":"sum(rate(file_cache_miss[$__rate_interval])) by (instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_disk_latency_count[$__rate_interval])) by (op, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"file cache disk {{op}} @ {{instance}}","metric":"","query":"sum(rate(file_cache_disk_latency_count[$__rate_interval])) by (op, instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Ops","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":121,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - file cache - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - file cache - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - file cache - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - file cache - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(file_cache_latency_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - file cache disk - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - file cache disk - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - file cache disk - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - file cache disk - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(file_cache_disk_latency_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Bps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":122,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(rate(file_cache_disk_bytes[$__rate_interval])) by (op, instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"disk {{op}} @ {{instance}}","metric":"","query":"sum(rate(file_cache_disk_bytes[$__rate_interval])) by (op, instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Throughput","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":123,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - file cache disk - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - file cache disk - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - file cache disk - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - file cache disk - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(file_cache_disk_io_size_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - file cache disk read entry - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - file cache disk read entry - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - file cache disk read entry - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pmax - file cache disk read entry - {{op}} @ {{instance}}","metric":"","query":"histogram_quantile(1.0, sum(rate(file_cache_disk_read_entry_size_bucket[$__rate_interval])) by (le, op, instance))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Disk IO Size","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Hummock Tiered Cache","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":170},"height":null,"hideTimeOverride":false,"id":124,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":125,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Lock Time p50 - {{lock_type}} @ {{lock_name}}","metric":"","query":"histogram_quantile(0.5, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Lock Time p99 - {{lock_type}} @ {{lock_name}}","metric":"","query":"histogram_quantile(0.99, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Lock Time p999 - {{lock_type}} @ {{lock_name}}","metric":"","query":"histogram_quantile(0.999, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Lock Time pmax - {{lock_type}} @ {{lock_name}}","metric":"","query":"histogram_quantile(1.0, sum(rate(hummock_manager_lock_time_bucket[$__rate_interval])) by (le, lock_name, lock_type))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Lock Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":126,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Real Process Time p50 - {{method}}","metric":"","query":"histogram_quantile(0.5, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Real Process Time p99 - {{method}}","metric":"","query":"histogram_quantile(0.99, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Real Process Time p999 - {{method}}","metric":"","query":"histogram_quantile(0.999, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Real Process Time pmax - {{method}}","metric":"","query":"histogram_quantile(1.0, sum(rate(meta_hummock_manager_real_process_time_bucket[$__rate_interval])) by (le, method))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Real Process Time","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":127,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_version_size","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"version size","metric":"","query":"storage_version_size","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Version Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":128,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_current_version_id","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"current version id","metric":"","query":"storage_current_version_id","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_checkpoint_version_id","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"checkpoint version id","metric":"","query":"storage_checkpoint_version_id","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_min_pinned_version_id","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"min pinned version id","metric":"","query":"storage_min_pinned_version_id","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_min_safepoint_version_id","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"min safepoint version id","metric":"","query":"storage_min_safepoint_version_id","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Version Id","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":129,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_max_committed_epoch","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"max committed epoch","metric":"","query":"storage_max_committed_epoch","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_safe_epoch","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"safe epoch","metric":"","query":"storage_safe_epoch","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_min_pinned_epoch","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"min pinned epoch","metric":"","query":"storage_min_pinned_epoch","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Epoch","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"kbytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":130,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_version_stats{metric='total_key_size'}/1024","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"table{{table_id}} {{metric}}","metric":"","query":"storage_version_stats{metric='total_key_size'}/1024","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_version_stats{metric='total_value_size'}/1024","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"table{{table_id}} {{metric}}","metric":"","query":"storage_version_stats{metric='total_value_size'}/1024","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Table KV Size","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":131,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_version_stats{metric='total_key_count'}","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"table{{table_id}} {{metric}}","metric":"","query":"storage_version_stats{metric='total_key_count'}","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Table KV Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"total number of SSTs that is no longer referenced by versions but is not yet deleted from storage","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":24},"height":null,"hideTimeOverride":false,"id":132,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"storage_stale_ssts_count","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"stale SST total number","metric":"","query":"storage_stale_ssts_count","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Stale SST Total Number","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Hummock Manager","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":171},"height":null,"hideTimeOverride":false,"id":133,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":134,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"backup_job_count","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"job count","metric":"","query":"backup_job_count","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Job Count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":135,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Job Process Time p50 - {{state}}","metric":"","query":"histogram_quantile(0.5, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Job Process Time p99 - {{state}}","metric":"","query":"histogram_quantile(0.99, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.999, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Job Process Time p999 - {{state}}","metric":"","query":"histogram_quantile(0.999, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(1.0, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Job Process Time pmax - {{state}}","metric":"","query":"histogram_quantile(1.0, sum(rate(backup_job_latency_bucket[$__rate_interval])) by (le, state))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Job Process Time","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Backup Manager","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":172},"height":null,"hideTimeOverride":false,"id":136,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":137,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Create'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Create_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Create'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Create'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Create_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Create'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Create'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Create_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Create'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.CatalogService/Create'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.CatalogService/Create'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Create_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.CatalogService/Create'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.CatalogService/Create'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Create latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":0},"height":null,"hideTimeOverride":false,"id":138,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Drop'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Drop_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Drop'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Drop'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Drop_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Drop'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Drop'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Drop_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/Drop'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.CatalogService/Drop'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.CatalogService/Drop'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Drop_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.CatalogService/Drop'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.CatalogService/Drop'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Drop latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":0},"height":null,"hideTimeOverride":false,"id":139,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetCatalog_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetCatalog_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetCatalog_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.CatalogService/GetCatalog'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetCatalog_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.CatalogService/GetCatalog'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.CatalogService/GetCatalog'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"GetCatalog latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC Meta: Catalog Service","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":173},"height":null,"hideTimeOverride":false,"id":140,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":141,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"AddWorkerNode_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"AddWorkerNode_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"AddWorkerNode_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"AddWorkerNode_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.ClusterService/AddWorkerNode'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"AddWorkerNode latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":0},"height":null,"hideTimeOverride":false,"id":142,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ListAllNodes_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ListAllNodes_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ListAllNodes_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ListAllNodes_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.ClusterService/ListAllNodes'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"ListAllNodes latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC Meta: Cluster Service","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":174},"height":null,"hideTimeOverride":false,"id":143,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":144,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"CreateMaterializedView_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"CreateMaterializedView_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"CreateMaterializedView_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"CreateMaterializedView_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.StreamManagerService/CreateMaterializedView'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"CreateMaterializedView latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":0},"height":null,"hideTimeOverride":false,"id":145,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"DropMaterializedView_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"DropMaterializedView_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"DropMaterializedView_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"DropMaterializedView_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.StreamManagerService/DropMaterializedView'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"DropMaterializedView latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":0},"height":null,"hideTimeOverride":false,"id":146,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Flush_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Flush_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Flush_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.StreamManagerService/Flush'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"Flush_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.StreamManagerService/Flush'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.StreamManagerService/Flush'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Flush latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC Meta: Stream Manager","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":175},"height":null,"hideTimeOverride":false,"id":147,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":148,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinVersionBefore_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinVersionBefore_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinVersionBefore_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinVersionBefore_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/UnpinVersionBefore'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"UnpinVersionBefore latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":8,"y":0},"height":null,"hideTimeOverride":false,"id":149,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinSnapshotBefore_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinSnapshotBefore_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinSnapshotBefore_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"UnpinSnapshotBefore_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/UnpinSnapshotBefore'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"UnpinSnapshotBefore latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":16,"y":0},"height":null,"hideTimeOverride":false,"id":150,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ReportCompactionTasks_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ReportCompactionTasks_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ReportCompactionTasks_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"ReportCompactionTasks_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/ReportCompactionTasks'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"ReportCompactionTasks latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":8,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":151,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetNewSstIds_p50","metric":"","query":"histogram_quantile(0.5, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetNewSstIds_p90","metric":"","query":"histogram_quantile(0.9, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) by (le))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetNewSstIds_p99","metric":"","query":"histogram_quantile(0.99, sum(irate(meta_grpc_duration_seconds_bucket{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) by (le))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"GetNewSstIds_avg","metric":"","query":"sum(irate(meta_grpc_duration_seconds_sum{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval])) / sum(irate(meta_grpc_duration_seconds_count{path='/meta.HummockManagerService/GetNewSstIds'}[$__rate_interval]))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"GetNewSstIds latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC Meta: Hummock Manager","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":176},"height":null,"hideTimeOverride":false,"id":152,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":153,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_report_compaction_task_counts[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_counts - {{instance}} ","metric":"","query":"sum(irate(state_store_report_compaction_task_counts[$__rate_interval])) by(job,instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"compaction_count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":154,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_unpin_version_before_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_version_before_latency_p50 - {{instance}} ","metric":"","query":"histogram_quantile(0.5, sum(irate(state_store_unpin_version_before_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_unpin_version_before_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_version_before_latency_p99 - {{instance}} ","metric":"","query":"histogram_quantile(0.99, sum(irate(state_store_unpin_version_before_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_unpin_version_before_latency_sum[$__rate_interval])) / sum(irate(state_store_unpin_version_before_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_version_before_latency_avg","metric":"","query":"sum(irate(state_store_unpin_version_before_latency_sum[$__rate_interval])) / sum(irate(state_store_unpin_version_before_latency_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.90, sum(irate(state_store_unpin_version_before_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_version_before_latency_p90 - {{instance}} ","metric":"","query":"histogram_quantile(0.90, sum(irate(state_store_unpin_version_before_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"version_latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":155,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_pin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_latency_p50 - {{instance}} ","metric":"","query":"histogram_quantile(0.5, sum(irate(state_store_pin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_pin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_latency_p99 - {{instance}} ","metric":"","query":"histogram_quantile(0.99, sum(irate(state_store_pin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(irate(state_store_pin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_latencyp90 - {{instance}} ","metric":"","query":"histogram_quantile(0.9, sum(irate(state_store_pin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_pin_snapshot_latency_sum[$__rate_interval])) / sum(irate(state_store_pin_snapshot_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_latency_avg","metric":"","query":"sum(irate(state_store_pin_snapshot_latency_sum[$__rate_interval])) / sum(irate(state_store_pin_snapshot_latency_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_unpin_version_snapshot_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_latency_p50 - {{instance}} ","metric":"","query":"histogram_quantile(0.5, sum(irate(state_store_unpin_version_snapshot_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_unpin_version_snapshot_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_latency_p99 - {{instance}} ","metric":"","query":"histogram_quantile(0.99, sum(irate(state_store_unpin_version_snapshot_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_unpin_snapshot_latency_sum[$__rate_interval])) / sum(irate(state_store_unpin_snapshot_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_latency_avg","metric":"","query":"sum(irate(state_store_unpin_snapshot_latency_sum[$__rate_interval])) / sum(irate(state_store_unpin_snapshot_latency_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.90, sum(irate(state_store_unpin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_latency_p90 - {{instance}} ","metric":"","query":"histogram_quantile(0.90, sum(irate(state_store_unpin_snapshot_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"snapshot_latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":156,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_pin_snapshot_counts[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"pin_snapshot_counts - {{instance}} ","metric":"","query":"sum(irate(state_store_pin_snapshot_counts[$__rate_interval])) by(job,instance)","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_unpin_snapshot_counts[$__rate_interval])) by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"unpin_snapshot_counts - {{instance}} ","metric":"","query":"sum(irate(state_store_unpin_snapshot_counts[$__rate_interval])) by(job,instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"snapshot_count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":157,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_get_new_sst_ids_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_latency_p50 - {{instance}} ","metric":"","query":"histogram_quantile(0.5, sum(irate(state_store_get_new_sst_ids_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_get_new_sst_ids_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_latency_p99 - {{instance}} ","metric":"","query":"histogram_quantile(0.99, sum(irate(state_store_get_new_sst_ids_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_get_new_sst_ids_latency_sum[$__rate_interval])) / sum(irate(state_store_get_new_sst_ids_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_latency_avg","metric":"","query":"sum(irate(state_store_get_new_sst_ids_latency_sum[$__rate_interval])) / sum(irate(state_store_get_new_sst_ids_latency_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.90, sum(irate(state_store_get_new_sst_ids_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_latency_p90 - {{instance}} ","metric":"","query":"histogram_quantile(0.90, sum(irate(state_store_get_new_sst_ids_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"table_latency","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":158,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_get_new_sst_ids_latency_counts[$__rate_interval]))by(job,instance)","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"get_new_sst_ids_latency_counts - {{instance}} ","metric":"","query":"sum(irate(state_store_get_new_sst_ids_latency_counts[$__rate_interval]))by(job,instance)","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"table_count","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":159,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(irate(state_store_report_compaction_task_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_latency_p50 - {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(irate(state_store_report_compaction_task_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.99, sum(irate(state_store_report_compaction_task_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_latency_p99 - {{instance}}","metric":"","query":"histogram_quantile(0.99, sum(irate(state_store_report_compaction_task_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"sum(irate(state_store_report_compaction_task_latency_sum[$__rate_interval])) / sum(irate(state_store_report_compaction_task_latency_count[$__rate_interval]))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_latency_avg","metric":"","query":"sum(irate(state_store_report_compaction_task_latency_sum[$__rate_interval])) / sum(irate(state_store_report_compaction_task_latency_count[$__rate_interval]))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.90, sum(irate(state_store_report_compaction_task_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"report_compaction_task_latency_p90 - {{instance}}","metric":"","query":"histogram_quantile(0.90, sum(irate(state_store_report_compaction_task_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"compaction_latency","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"gRPC: Hummock Meta Client","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":177},"height":null,"hideTimeOverride":false,"id":160,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Qps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":161,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(frontend_query_counter_local_execution[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","query":"rate(frontend_query_counter_local_execution[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Query Per second in Loacl Execution Mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"Qps"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":162,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(distributed_completed_query_counter[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","query":"rate(distributed_completed_query_counter[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Query Per second in Distributed Execution Mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":163,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"distributed_running_query_num","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"The number of running query in distributed execution mode","metric":"","query":"distributed_running_query_num","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Running query in distributed execution mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":164,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"distributed_rejected_query_counter","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"The number of rejected query in distributed execution mode","metric":"","query":"distributed_rejected_query_counter","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Rejected query in distributed execution mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":165,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["last"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"distributed_completed_query_counter","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"The number of completed query in distributed execution mode","metric":"","query":"distributed_completed_query_counter","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Completed query in distributed execution mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":166,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(distributed_query_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(distributed_query_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(distributed_query_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(distributed_query_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.95, sum(rate(distributed_query_latency_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.95, sum(rate(distributed_query_latency_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Query Latency in Distributed Execution Mode","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":24},"height":null,"hideTimeOverride":false,"id":167,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.5, sum(rate(frontend_latency_local_execution_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p50 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.5, sum(rate(frontend_latency_local_execution_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.9, sum(rate(frontend_latency_local_execution_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p90 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.9, sum(rate(frontend_latency_local_execution_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""},{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"histogram_quantile(0.95, sum(rate(frontend_latency_local_execution_bucket[$__rate_interval])) by (le, job, instance))","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"p99 - {{job}} @ {{instance}}","metric":"","query":"histogram_quantile(0.95, sum(rate(frontend_latency_local_execution_bucket[$__rate_interval])) by (le, job, instance))","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Query Latency in Local Execution Mode","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Frontend","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":178},"height":null,"hideTimeOverride":false,"id":168,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":169,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(lru_runtime_loop_count[$__rate_interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","query":"rate(lru_runtime_loop_count[$__rate_interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"LRU manager loop count per sec","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":0},"height":null,"hideTimeOverride":false,"id":170,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"lru_watermark_step","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","query":"lru_watermark_step","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"LRU manager watermark steps","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"watermark_time is the current lower watermark of cached data. physical_now is the current time of the machine. The diff (physical_now - watermark_time) shows how much data is cached.","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":""},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":8},"height":null,"hideTimeOverride":false,"id":171,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"lru_physical_now_ms - lru_current_watermark_time_ms","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","query":"lru_physical_now_ms - lru_current_watermark_time_ms","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"LRU manager diff between watermark_time and now (ms)","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":8},"height":null,"hideTimeOverride":false,"id":172,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"jemalloc_allocated_bytes","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","query":"jemalloc_allocated_bytes","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"The memory allocated by jemalloc","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":16},"height":null,"hideTimeOverride":false,"id":173,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"stream_total_mem_usage","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","query":"stream_total_mem_usage","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"The memory allocated by streaming","transformations":[],"transparent":false,"type":"timeseries"},{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"bytes"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":12,"y":16},"height":null,"hideTimeOverride":false,"id":174,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":[],"displayMode":"list","placement":"bottom"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"batch_total_mem_usage","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"","metric":"","query":"batch_total_mem_usage","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"The memory allocated by batch","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Memory manager","transformations":[],"transparent":false,"type":"row"},{"cacheTimeout":null,"collapsed":true,"datasource":null,"description":null,"editable":true,"error":false,"fieldConfig":{"defaults":{"thresholds":{"mode":"absolute","steps":[]}}},"gridPos":{"h":1,"w":24,"x":0,"y":179},"height":null,"hideTimeOverride":false,"id":175,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"panels":[{"cacheTimeout":null,"datasource":null,"description":"","editable":true,"error":false,"fieldConfig":{"defaults":{"color":{"mode":"palette-classic"},"custom":{"axisLabel":"","axisPlacement":"auto","barAlignment":0,"drawStyle":"line","fillOpacity":10,"gradientMode":"none","hideFrom":{"legend":false,"tooltip":false,"viz":false},"lineInterpolation":"linear","lineWidth":1,"pointSize":5,"scaleDistribution":{"log":2,"type":"linear"},"showPoints":"auto","spanNulls":false,"stacking":{},"thresholdsStyle":{"mode":"off"}},"mappings":[],"thresholds":{"mode":"absolute","steps":[]},"unit":"rows/s"},"overrides":[]},"gridPos":{"h":8,"w":12,"x":0,"y":0},"height":null,"hideTimeOverride":false,"id":176,"interval":null,"links":[],"maxDataPoints":100,"maxPerRow":null,"minSpan":null,"options":{"legend":{"calcs":["mean"],"displayMode":"table","placement":"right"},"tooltip":{"mode":"single"}},"repeat":null,"repeatDirection":null,"span":null,"targets":[{"datasource":{"type":"prometheus","uid":"risedev-prometheus"},"expr":"rate(connector_source_rows_received[$__interval])","format":"time_series","hide":false,"instant":false,"interval":"","intervalFactor":2,"legendFormat":"{{source_type}} @ {{source_id}}","metric":"","query":"rate(connector_source_rows_received[$__interval])","refId":"","step":10,"target":""}],"timeFrom":null,"timeShift":null,"title":"Connector Source Throughput(rows)","transformations":[],"transparent":false,"type":"timeseries"}],"repeat":null,"repeatDirection":null,"span":null,"targets":[],"timeFrom":null,"timeShift":null,"title":"Connector Node","transformations":[],"transparent":false,"type":"row"}],"refresh":"10s","rows":[],"schemaVersion":12,"sharedCrosshair":true,"style":"dark","tags":["risingwave"],"templating":{"list":[]},"time":{"from":"now-30m","to":"now"},"timepicker":{"hidden":false,"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"],"time_options":["5m","15m","1h","6h","12h","24h","2d","7d","30d"]},"timezone":"browser","title":"risingwave_dashboard","uid":"Ecy3uV1nz","version":0}
diff --git a/integration_tests/datagen/sink/mysql/mysql.go b/integration_tests/datagen/sink/mysql/mysql.go
index 5d1370b245970..0831af85b4857 100644
--- a/integration_tests/datagen/sink/mysql/mysql.go
+++ b/integration_tests/datagen/sink/mysql/mysql.go
@@ -24,7 +24,7 @@ type MysqlSink struct {
 func OpenMysqlSink(cfg MysqlConfig) (*MysqlSink, error) {
 	fmt.Printf("Opening MySQL sink: %+v\n", cfg)
 
-	db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s:%d)/%s",
+	db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?multiStatements=true",
 		cfg.DbUser, cfg.DbPassword, cfg.DbHost, cfg.DbPort, cfg.Database))
 	if err != nil {
 		return nil, err
diff --git a/integration_tests/datagen/twitter/twitter.go b/integration_tests/datagen/twitter/twitter.go
index 5a4aefb152b5f..97731dc3aed2b 100644
--- a/integration_tests/datagen/twitter/twitter.go
+++ b/integration_tests/datagen/twitter/twitter.go
@@ -37,16 +37,10 @@ type twitterUser struct {
 }
 
 func (r *twitterEvent) ToPostgresSql() string {
-	return fmt.Sprintf("INSERT INTO %s (data, author) values (%s, %s);",
-		"twitter", r.Data.objectString(), r.Author.objectString())
-}
-
-func (r *twitterUser) objectString() string {
-	return fmt.Sprintf("('%s'::TIMESTAMP, '%s', '%s', '%s')", r.CreatedAt, r.Id, r.Name, r.UserName)
-}
-
-func (r *tweetData) objectString() string {
-	return fmt.Sprintf("('%s'::TIMESTAMP, '%s', '%s', '%s')", r.CreatedAt, r.Id, r.Text, r.Lang)
+	return fmt.Sprintf("INSERT INTO tweet (created_at, id, text, lang, author_id) values ('%s', '%s', '%s', '%s', '%s'); INSERT INTO user (created_at, id, name, username, followers) values ('%s', '%s', '%s', '%s', %d);",
+		r.Data.CreatedAt, r.Data.Id, r.Data.Text, r.Data.Lang, r.Author.Id,
+		r.Author.CreatedAt, r.Author.Id, r.Author.Name, r.Author.UserName, r.Author.Followers,
+	)
 }
 
 func (r *twitterEvent) ToJson() (topic string, key string, data []byte) {
diff --git a/integration_tests/iceberg-sink/create_sink.sql b/integration_tests/iceberg-sink/create_sink.sql
index 8913dbb05525b..9306b836f7744 100644
--- a/integration_tests/iceberg-sink/create_sink.sql
+++ b/integration_tests/iceberg-sink/create_sink.sql
@@ -2,7 +2,8 @@ CREATE SINK bhv_iceberg_sink
 FROM
     bhv_mv WITH (
     connector = 'iceberg',
-    sink.mode='upsert',
+    type = 'upsert',
+    primary_key = 'user_id, target_id, event_timestamp',
     warehouse.path = 's3://hummock001/iceberg-data',
     s3.endpoint = 'http://minio-0:9301',
     s3.access.key = 'hummockadmin',
diff --git a/integration_tests/postgres-sink/postgres_prepare.sql b/integration_tests/postgres-sink/postgres_prepare.sql
index cac57c699a154..ded9b4cec97cd 100644
--- a/integration_tests/postgres-sink/postgres_prepare.sql
+++ b/integration_tests/postgres-sink/postgres_prepare.sql
@@ -1,4 +1,4 @@
 CREATE TABLE target_count (
-  target_id VARCHAR(128),
+  target_id VARCHAR(128) primary key,
   target_count BIGINT
 );
\ No newline at end of file
diff --git a/integration_tests/scripts/run_demos.py b/integration_tests/scripts/run_demos.py
index 330ebee1065b7..fc2bea0d837c3 100644
--- a/integration_tests/scripts/run_demos.py
+++ b/integration_tests/scripts/run_demos.py
@@ -25,8 +25,7 @@ def run_demo(demo: str, format: str):
     demo_dir = os.path.join(project_dir, demo)
     print("Running demo: {}".format(demo))
 
-    subprocess.run(["docker", "compose", "up", "-d"],
-                   cwd=demo_dir, check=True)
+    subprocess.run(["docker", "compose", "up", "-d"], cwd=demo_dir, check=True)
     sleep(40)
 
     sql_files = ['create_source.sql', 'create_mv.sql', 'query.sql']
@@ -43,6 +42,7 @@ def run_demo(demo: str, format: str):
         run_sql_file(sql_file, demo_dir)
         sleep(10)
 
+
 def run_iceberg_demo():
     demo = "iceberg-sink"
     file_dir = dirname(abspath(__file__))
@@ -50,8 +50,7 @@ def run_iceberg_demo():
     demo_dir = os.path.join(project_dir, demo)
     print("Running demo: iceberg-sink")
 
-    subprocess.run(["docker", "compose", "up", "-d"],
-                   cwd=demo_dir, check=True)
+    subprocess.run(["docker", "compose", "up", "-d"], cwd=demo_dir, check=True)
     sleep(40)
 
     subprocess.run(["docker", "compose", "exec", "spark", "bash", "/spark-script/run-sql-file.sh", "create-table"],
@@ -71,7 +70,7 @@ def run_iceberg_demo():
 
     query_sql = open(os.path.join(demo_dir, "iceberg-query.sql")).read()
 
-    print("querying iceberg with presto sql: %s"%query_sql)
+    print("querying iceberg with presto sql: %s" % query_sql)
 
     query_output_file_name = "query_outout.txt"
 
@@ -88,8 +87,6 @@ def run_iceberg_demo():
     assert len(output_content.strip()) > 0
 
 
-
-
 arg_parser = argparse.ArgumentParser(description='Run the demo')
 arg_parser.add_argument('--format',
                         metavar='format',
@@ -102,6 +99,9 @@ def run_iceberg_demo():
                         help='the test case')
 args = arg_parser.parse_args()
 
+# disable telemetry in env
+os.environ['ENABLE_TELEMETRY'] = "false"
+
 if args.case == "iceberg-sink":
     if args.format == "protobuf":
         print("skip protobuf test for iceberg-sink")
diff --git a/integration_tests/tidb-cdc-sink/config/changefeed.toml b/integration_tests/tidb-cdc-sink/config/changefeed.toml
new file mode 100644
index 0000000000000..b84615c14e3df
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/config/changefeed.toml
@@ -0,0 +1,4 @@
+[sink]
+dispatchers = [
+ {matcher = ['*.*'], topic = "ticdc_{schema}_{table}"},
+]
diff --git a/integration_tests/tidb-cdc-sink/config/pd.toml b/integration_tests/tidb-cdc-sink/config/pd.toml
new file mode 100644
index 0000000000000..19f8a1119f99c
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/config/pd.toml
@@ -0,0 +1,86 @@
+# PD Configuration.
+
+name = "pd"
+data-dir = "default.pd"
+
+client-urls = "http://127.0.0.1:2379"
+# if not set, use ${client-urls}
+advertise-client-urls = ""
+
+peer-urls = "http://127.0.0.1:2380"
+# if not set, use ${peer-urls}
+advertise-peer-urls = ""
+
+initial-cluster = "pd=http://127.0.0.1:2380"
+initial-cluster-state = "new"
+
+lease = 3
+tso-save-interval = "3s"
+
+[security]
+# Path of file that contains list of trusted SSL CAs. if set, following four settings shouldn't be empty
+cacert-path = ""
+# Path of file that contains X509 certificate in PEM format.
+cert-path = ""
+# Path of file that contains X509 key in PEM format.
+key-path = ""
+
+[log]
+level = "error"
+
+# log format, one of json, text, console
+#format = "text"
+
+# disable automatic timestamps in output
+#disable-timestamp = false
+
+# file logging
+[log.file]
+#filename = ""
+# max log file size in MB
+#max-size = 300
+# max log file keep days
+#max-days = 28
+# maximum number of old log files to retain
+#max-backups = 7
+# rotate log by day
+#log-rotate = true
+
+[metric]
+# prometheus client push interval, set "0s" to disable prometheus.
+interval = "15s"
+# prometheus pushgateway address, leaves it empty will disable prometheus.
+address = "prometheus-0:9091"
+
+[schedule]
+max-merge-region-size = 0
+split-merge-interval = "1h"
+max-snapshot-count = 3
+max-pending-peer-count = 16
+max-store-down-time = "30m"
+leader-schedule-limit = 4
+region-schedule-limit = 4
+replica-schedule-limit = 8
+merge-schedule-limit = 8
+tolerant-size-ratio = 5.0
+
+# customized schedulers, the format is as below
+# if empty, it will use balance-leader, balance-region, hot-region as default
+# [[schedule.schedulers]]
+# type = "evict-leader"
+# args = ["1"]
+
+[replication]
+# The number of replicas for each region.
+max-replicas = 3
+# The label keys specified the location of a store.
+# The placement priorities is implied by the order of label keys.
+# For example, ["zone", "rack"] means that we should place replicas to
+# different zones first, then to different racks if we don't have enough zones.
+location-labels = []
+
+[label-property]
+# Do not assign region leaders to stores that have these tags.
+#  [[label-property.reject-leader]]
+#  key = "zone"
+#  value = "cn1
diff --git a/integration_tests/tidb-cdc-sink/config/tidb.toml b/integration_tests/tidb-cdc-sink/config/tidb.toml
new file mode 100644
index 0000000000000..c58a052b6e6a3
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/config/tidb.toml
@@ -0,0 +1,239 @@
+# TiDB Configuration.
+
+# TiDB server host.
+host = "0.0.0.0"
+
+# TiDB server port.
+port = 4000
+
+# Registered store name, [tikv, mocktikv]
+store = "mocktikv"
+
+# TiDB storage path.
+path = "/tmp/tidb"
+
+# The socket file to use for connection.
+socket = ""
+
+# Run ddl worker on this tidb-server.
+run-ddl = true
+
+# Schema lease duration, very dangerous to change only if you know what you do.
+lease = "0"
+
+# When create table, split a separated region for it. It is recommended to
+# turn off this option if there will be a large number of tables created.
+split-table = true
+
+# The limit of concurrent executed sessions.
+token-limit = 1000
+
+# Only print a log when out of memory quota.
+# Valid options: ["log", "cancel"]
+oom-action = "log"
+
+# Set the memory quota for a query in bytes. Default: 32GB
+mem-quota-query = 34359738368
+
+# Enable coprocessor streaming.
+enable-streaming = false
+
+# Set system variable 'lower_case_table_names'
+lower-case-table-names = 2
+
+[log]
+# Log level: debug, info, warn, error, fatal.
+level = "error"
+
+# Log format, one of json, text, console.
+format = "text"
+
+# Disable automatic timestamp in output
+disable-timestamp = false
+
+# Stores slow query log into separated files.
+slow-query-file = ""
+
+# Queries with execution time greater than this value will be logged. (Milliseconds)
+slow-threshold = 300
+
+# Queries with internal result greater than this value will be logged.
+expensive-threshold = 10000
+
+# Maximum query length recorded in log.
+query-log-max-len = 2048
+
+# File logging.
+[log.file]
+# Log file name.
+filename = ""
+
+# Max log file size in MB (upper limit to 4096MB).
+max-size = 300
+
+# Max log file keep days. No clean up by default.
+max-days = 0
+
+# Maximum number of old log files to retain. No clean up by default.
+max-backups = 0
+
+# Rotate log by day
+log-rotate = true
+
+[security]
+# Path of file that contains list of trusted SSL CAs for connection with mysql client.
+ssl-ca = ""
+
+# Path of file that contains X509 certificate in PEM format for connection with mysql client.
+ssl-cert = ""
+
+# Path of file that contains X509 key in PEM format for connection with mysql client.
+ssl-key = ""
+
+# Path of file that contains list of trusted SSL CAs for connection with cluster components.
+cluster-ssl-ca = ""
+
+# Path of file that contains X509 certificate in PEM format for connection with cluster components.
+cluster-ssl-cert = ""
+
+# Path of file that contains X509 key in PEM format for connection with cluster components.
+cluster-ssl-key = ""
+
+[status]
+# If enable status report HTTP service.
+report-status = true
+
+# TiDB status port.
+status-port = 10080
+
+# Prometheus pushgateway address, leaves it empty will disable prometheus push.
+metrics-addr = "prometheus-0:9091"
+
+# Prometheus client push interval in second, set \"0\" to disable prometheus push.
+metrics-interval = 15
+
+[performance]
+# Max CPUs to use, 0 use number of CPUs in the machine.
+max-procs = 0
+# StmtCountLimit limits the max count of statement inside a transaction.
+stmt-count-limit = 5000
+
+# Set keep alive option for tcp connection.
+tcp-keep-alive = true
+
+# The maximum number of retries when commit a transaction.
+retry-limit = 10
+
+# Whether support cartesian product.
+cross-join = true
+
+# Stats lease duration, which influences the time of analyze and stats load.
+stats-lease = "3s"
+
+# Run auto analyze worker on this tidb-server.
+run-auto-analyze = true
+
+# Probability to use the query feedback to update stats, 0 or 1 for always false/true.
+feedback-probability = 0.0
+
+# The max number of query feedback that cache in memory.
+query-feedback-limit = 1024
+
+# Pseudo stats will be used if the ratio between the modify count and
+# row count in statistics of a table is greater than it.
+pseudo-estimate-ratio = 0.7
+
+[proxy-protocol]
+# PROXY protocol acceptable client networks.
+# Empty string means disable PROXY protocol, * means all networks.
+networks = ""
+
+# PROXY protocol header read timeout, unit is second
+header-timeout = 5
+
+[plan-cache]
+enabled = false
+capacity = 2560
+shards = 256
+
+[prepared-plan-cache]
+enabled = false
+capacity = 100
+
+[opentracing]
+# Enable opentracing.
+enable = false
+
+# Whether to enable the rpc metrics.
+rpc-metrics = false
+
+[opentracing.sampler]
+# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
+type = "const"
+
+# Param is a value passed to the sampler.
+# Valid values for Param field are:
+# - for "const" sampler, 0 or 1 for always false/true respectively
+# - for "probabilistic" sampler, a probability between 0 and 1
+# - for "rateLimiting" sampler, the number of spans per second
+# - for "remote" sampler, param is the same as for "probabilistic"
+# and indicates the initial sampling rate before the actual one
+# is received from the mothership
+param = 1.0
+
+# SamplingServerURL is the address of jaeger-agent's HTTP sampling server
+sampling-server-url = ""
+
+# MaxOperations is the maximum number of operations that the sampler
+# will keep track of. If an operation is not tracked, a default probabilistic
+# sampler will be used rather than the per operation specific sampler.
+max-operations = 0
+
+# SamplingRefreshInterval controls how often the remotely controlled sampler will poll
+# jaeger-agent for the appropriate sampling strategy.
+sampling-refresh-interval = 0
+
+[opentracing.reporter]
+# QueueSize controls how many spans the reporter can keep in memory before it starts dropping
+# new spans. The queue is continuously drained by a background go-routine, as fast as spans
+# can be sent out of process.
+queue-size = 0
+
+# BufferFlushInterval controls how often the buffer is force-flushed, even if it's not full.
+# It is generally not useful, as it only matters for very low traffic services.
+buffer-flush-interval = 0
+
+# LogSpans, when true, enables LoggingReporter that runs in parallel with the main reporter
+# and logs all submitted spans. Main Configuration.Logger must be initialized in the code
+# for this option to have any effect.
+log-spans = false
+
+#  LocalAgentHostPort instructs reporter to send spans to jaeger-agent at this address
+local-agent-host-port = ""
+
+[tikv-client]
+# Max gRPC connections that will be established with each tikv-server.
+grpc-connection-count = 16
+
+# After a duration of this time in seconds if the client doesn't see any activity it pings
+# the server to see if the transport is still alive.
+grpc-keepalive-time = 10
+
+# After having pinged for keepalive check, the client waits for a duration of Timeout in seconds
+# and if no activity is seen even after that the connection is closed.
+grpc-keepalive-timeout = 3
+
+# max time for commit command, must be twice bigger than raft election timeout.
+commit-timeout = "41s"
+
+[binlog]
+
+# Socket file to write binlog.
+binlog-socket = ""
+
+# WriteTimeout specifies how long it will wait for writing binlog to pump.
+write-timeout = "15s"
+
+# If IgnoreError is true, when writing binlog meets error, TiDB would stop writing binlog,
+# but still provide service.
+ignore-error = false
diff --git a/integration_tests/tidb-cdc-sink/config/tikv.toml b/integration_tests/tidb-cdc-sink/config/tikv.toml
new file mode 100644
index 0000000000000..0757990597098
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/config/tikv.toml
@@ -0,0 +1,497 @@
+# TiKV config template
+#  Human-readable big numbers:
+#   File size(based on byte): KB, MB, GB, TB, PB
+#    e.g.: 1_048_576 = "1MB"
+#   Time(based on ms): ms, s, m, h
+#    e.g.: 78_000 = "1.3m"
+
+# log level: trace, debug, info, warn, error, off.
+log-level = "error"
+# file to store log, write to stderr if it's empty.
+# log-file = ""
+
+[readpool.storage]
+# size of thread pool for high-priority operations
+# high-concurrency = 4
+# size of thread pool for normal-priority operations
+# normal-concurrency = 4
+# size of thread pool for low-priority operations
+# low-concurrency = 4
+# max running high-priority operations, reject if exceed
+# max-tasks-high = 8000
+# max running normal-priority operations, reject if exceed
+# max-tasks-normal = 8000
+# max running low-priority operations, reject if exceed
+# max-tasks-low = 8000
+# size of stack size for each thread pool
+# stack-size = "10MB"
+
+[readpool.coprocessor]
+# Notice: if CPU_NUM > 8, default thread pool size for coprocessors
+# will be set to CPU_NUM * 0.8.
+
+# high-concurrency = 8
+# normal-concurrency = 8
+# low-concurrency = 8
+# max-tasks-high = 16000
+# max-tasks-normal = 16000
+# max-tasks-low = 16000
+# stack-size = "10MB"
+
+[server]
+# set listening address.
+# addr = "127.0.0.1:20160"
+# set advertise listening address for client communication, if not set, use addr instead.
+# advertise-addr = ""
+# notify capacity, 40960 is suitable for about 7000 regions.
+# notify-capacity = 40960
+# maximum number of messages can be processed in one tick.
+# messages-per-tick = 4096
+
+# compression type for grpc channel, available values are no, deflate and gzip.
+# grpc-compression-type = "no"
+# size of thread pool for grpc server.
+# grpc-concurrency = 4
+# The number of max concurrent streams/requests on a client connection.
+# grpc-concurrent-stream = 1024
+# The number of connections with each tikv server to send raft messages.
+# grpc-raft-conn-num = 10
+# Amount to read ahead on individual grpc streams.
+# grpc-stream-initial-window-size = "2MB"
+
+# How many snapshots can be sent concurrently.
+# concurrent-send-snap-limit = 32
+# How many snapshots can be recv concurrently.
+# concurrent-recv-snap-limit = 32
+
+# max count of tasks being handled, new tasks will be rejected.
+# end-point-max-tasks = 2000
+
+# max recursion level allowed when decoding dag expression
+# end-point-recursion-limit = 1000
+
+# max time to handle coprocessor request before timeout
+# end-point-request-max-handle-duration = "60s"
+
+# the max bytes that snapshot can be written to disk in one second,
+# should be set based on your disk performance
+# snap-max-write-bytes-per-sec = "100MB"
+
+# set attributes about this server, e.g. { zone = "us-west-1", disk = "ssd" }.
+# labels = {}
+
+[storage]
+# set the path to rocksdb directory.
+# data-dir = "/tmp/tikv/store"
+
+# notify capacity of scheduler's channel
+# scheduler-notify-capacity = 10240
+
+# maximum number of messages can be processed in one tick
+# scheduler-messages-per-tick = 1024
+
+# the number of slots in scheduler latches, concurrency control for write.
+# scheduler-concurrency = 2048000
+
+# scheduler's worker pool size, should increase it in heavy write cases,
+# also should less than total cpu cores.
+# scheduler-worker-pool-size = 4
+
+# When the pending write bytes exceeds this threshold,
+# the "scheduler too busy" error is displayed.
+# scheduler-pending-write-threshold = "100MB"
+
+[pd]
+# pd endpoints
+# endpoints = []
+
+[metric]
+# the Prometheus client push interval. Setting the value to 0s stops Prometheus client from pushing.
+# interval = "15s"
+# the Prometheus pushgateway address. Leaving it empty stops Prometheus client from pushing.
+address = "prometheus-0:9091"
+# the Prometheus client push job name. Note: A node id will automatically append, e.g., "tikv_1".
+# job = "tikv"
+
+[raftstore]
+# true (default value) for high reliability, this can prevent data loss when power failure.
+# sync-log = true
+
+# set the path to raftdb directory, default value is data-dir/raft
+# raftdb-path = ""
+
+# set store capacity, if no set, use disk capacity.
+# capacity = 0
+
+# notify capacity, 40960 is suitable for about 7000 regions.
+# notify-capacity = 40960
+
+# maximum number of messages can be processed in one tick.
+# messages-per-tick = 4096
+
+# Region heartbeat tick interval for reporting to pd.
+# pd-heartbeat-tick-interval = "60s"
+# Store heartbeat tick interval for reporting to pd.
+# pd-store-heartbeat-tick-interval = "10s"
+
+# When region size changes exceeds region-split-check-diff, we should check
+# whether the region should be split or not.
+# region-split-check-diff = "6MB"
+
+# Interval to check region whether need to be split or not.
+# split-region-check-tick-interval = "10s"
+
+# When raft entry exceed the max size, reject to propose the entry.
+# raft-entry-max-size = "8MB"
+
+# Interval to gc unnecessary raft log.
+# raft-log-gc-tick-interval = "10s"
+# A threshold to gc stale raft log, must >= 1.
+# raft-log-gc-threshold = 50
+# When entry count exceed this value, gc will be forced trigger.
+# raft-log-gc-count-limit = 72000
+# When the approximate size of raft log entries exceed this value, gc will be forced trigger.
+# It's recommended to set it to 3/4 of region-split-size.
+# raft-log-gc-size-limit = "72MB"
+
+# When a peer hasn't been active for max-peer-down-duration,
+# we will consider this peer to be down and report it to pd.
+# max-peer-down-duration = "5m"
+
+# Interval to check whether start manual compaction for a region,
+# region-compact-check-interval = "5m"
+# Number of regions for each time to check.
+# region-compact-check-step = 100
+# The minimum number of delete tombstones to trigger manual compaction.
+# region-compact-min-tombstones = 10000
+# Interval to check whether should start a manual compaction for lock column family,
+# if written bytes reach lock-cf-compact-threshold for lock column family, will fire
+# a manual compaction for lock column family.
+# lock-cf-compact-interval = "10m"
+# lock-cf-compact-bytes-threshold = "256MB"
+
+# Interval (s) to check region whether the data are consistent.
+# consistency-check-interval = 0
+
+# Use delete range to drop a large number of continuous keys.
+# use-delete-range = false
+
+# delay time before deleting a stale peer
+# clean-stale-peer-delay = "10m"
+
+# Interval to cleanup import sst files.
+# cleanup-import-sst-interval = "10m"
+
+[coprocessor]
+# When it is true, it will try to split a region with table prefix if
+# that region crosses tables. It is recommended to turn off this option
+# if there will be a large number of tables created.
+# split-region-on-table = true
+# When the region's size exceeds region-max-size, we will split the region
+# into two which the left region's size will be region-split-size or a little
+# bit smaller.
+# region-max-size = "144MB"
+# region-split-size = "96MB"
+
+[rocksdb]
+# Maximum number of concurrent background jobs (compactions and flushes)
+# max-background-jobs = 8
+
+# This value represents the maximum number of threads that will concurrently perform a
+# compaction job by breaking it into multiple, smaller ones that are run simultaneously.
+# Default: 1 (i.e. no subcompactions)
+# max-sub-compactions = 1
+
+# Number of open files that can be used by the DB.  You may need to
+# increase this if your database has a large working set. Value -1 means
+# files opened are always kept open. You can estimate number of files based
+# on target_file_size_base and target_file_size_multiplier for level-based
+# compaction.
+# If max-open-files = -1, RocksDB will prefetch index and filter blocks into
+# block cache at startup, so if your database has a large working set, it will
+# take several minutes to open the db.
+max-open-files = 1024
+
+# Max size of rocksdb's MANIFEST file.
+# For detailed explanation please refer to https://github.com/facebook/rocksdb/wiki/MANIFEST
+# max-manifest-file-size = "20MB"
+
+# If true, the database will be created if it is missing.
+# create-if-missing = true
+
+# rocksdb wal recovery mode
+# 0 : TolerateCorruptedTailRecords, tolerate incomplete record in trailing data on all logs;
+# 1 : AbsoluteConsistency, We don't expect to find any corruption in the WAL;
+# 2 : PointInTimeRecovery, Recover to point-in-time consistency;
+# 3 : SkipAnyCorruptedRecords, Recovery after a disaster;
+# wal-recovery-mode = 2
+
+# rocksdb write-ahead logs dir path
+# This specifies the absolute dir path for write-ahead logs (WAL).
+# If it is empty, the log files will be in the same dir as data.
+# When you set the path to rocksdb directory in memory like in /dev/shm, you may want to set
+# wal-dir to a directory on a persistent storage.
+# See https://github.com/facebook/rocksdb/wiki/How-to-persist-in-memory-RocksDB-database
+# wal-dir = "/tmp/tikv/store"
+
+# The following two fields affect how archived write-ahead logs will be deleted.
+# 1. If both set to 0, logs will be deleted asap and will not get into the archive.
+# 2. If wal-ttl-seconds is 0 and wal-size-limit is not 0,
+#    WAL files will be checked every 10 min and if total size is greater
+#    then wal-size-limit, they will be deleted starting with the
+#    earliest until size_limit is met. All empty files will be deleted.
+# 3. If wal-ttl-seconds is not 0 and wal-size-limit is 0, then
+#    WAL files will be checked every wal-ttl-seconds / 2 and those that
+#    are older than wal-ttl-seconds will be deleted.
+# 4. If both are not 0, WAL files will be checked every 10 min and both
+#    checks will be performed with ttl being first.
+# When you set the path to rocksdb directory in memory like in /dev/shm, you may want to set
+# wal-ttl-seconds to a value greater than 0 (like 86400) and backup your db on a regular basis.
+# See https://github.com/facebook/rocksdb/wiki/How-to-persist-in-memory-RocksDB-database
+# wal-ttl-seconds = 0
+# wal-size-limit = 0
+
+# rocksdb max total wal size
+# max-total-wal-size = "4GB"
+
+# Rocksdb Statistics provides cumulative stats over time.
+# Turn statistics on will introduce about 5%-10% overhead for RocksDB,
+# but it is worthy to know the internal status of RocksDB.
+# enable-statistics = true
+
+# Dump statistics periodically in information logs.
+# Same as rocksdb's default value (10 min).
+# stats-dump-period = "10m"
+
+# Due to Rocksdb FAQ: https://github.com/facebook/rocksdb/wiki/RocksDB-FAQ,
+# If you want to use rocksdb on multi disks or spinning disks, you should set value at
+# least 2MB;
+# compaction-readahead-size = 0
+
+# This is the maximum buffer size that is used by WritableFileWrite
+# writable-file-max-buffer-size = "1MB"
+
+# Use O_DIRECT for both reads and writes in background flush and compactions
+# use-direct-io-for-flush-and-compaction = false
+
+# Limit the disk IO of compaction and flush. Compaction and flush can cause
+# terrible spikes if they exceed a certain threshold. Consider setting this to
+# 50% ~ 80% of the disk throughput for a more stable result. However, in heavy
+# write workload, limiting compaction and flush speed can cause write stalls too.
+# rate-bytes-per-sec = 0
+
+# Enable or disable the pipelined write
+# enable-pipelined-write = true
+
+# Allows OS to incrementally sync files to disk while they are being
+# written, asynchronously, in the background.
+# bytes-per-sync = "0MB"
+
+# Allows OS to incrementally sync WAL to disk while it is being written.
+# wal-bytes-per-sync = "0KB"
+
+# Specify the maximal size of the Rocksdb info log file. If the log file
+# is larger than `max_log_file_size`, a new info log file will be created.
+# If max_log_file_size == 0, all logs will be written to one log file.
+# Default: 1GB
+# info-log-max-size = "1GB"
+
+# Time for the Rocksdb info log file to roll (in seconds).
+# If specified with non-zero value, log file will be rolled
+# if it has been active longer than `log_file_time_to_roll`.
+# Default: 0 (disabled)
+# info-log-roll-time = "0"
+
+# Maximal Rocksdb info log files to be kept.
+# Default: 10
+# info-log-keep-log-file-num = 10
+
+# This specifies the Rocksdb info LOG dir.
+# If it is empty, the log files will be in the same dir as data.
+# If it is non empty, the log files will be in the specified dir,
+# and the db data dir's absolute path will be used as the log file
+# name's prefix.
+# Default: empty
+# info-log-dir = ""
+
+# Column Family default used to store actual data of the database.
+[rocksdb.defaultcf]
+# compression method (if any) is used to compress a block.
+#   no:     kNoCompression
+#   snappy: kSnappyCompression
+#   zlib:   kZlibCompression
+#   bzip2:  kBZip2Compression
+#   lz4:    kLZ4Compression
+#   lz4hc:  kLZ4HCCompression
+#   zstd:   kZSTD
+
+# per level compression
+# compression-per-level = ["no", "no", "lz4", "lz4", "lz4", "zstd", "zstd"]
+
+# Approximate size of user data packed per block.  Note that the
+# block size specified here corresponds to uncompressed data.
+# block-size = "64KB"
+
+# If you're doing point lookups you definitely want to turn bloom filters on, We use
+# bloom filters to avoid unnecessary disk reads. Default bits_per_key is 10, which
+# yields ~1% false positive rate. Larger bits_per_key values will reduce false positive
+# rate, but increase memory usage and space amplification.
+# bloom-filter-bits-per-key = 10
+
+# false means one sst file one bloom filter, true means every block has a corresponding bloom filter
+# block-based-bloom-filter = false
+
+# level0-file-num-compaction-trigger = 4
+
+# Soft limit on number of level-0 files. We start slowing down writes at this point.
+# level0-slowdown-writes-trigger = 20
+
+# Maximum number of level-0 files.  We stop writes at this point.
+# level0-stop-writes-trigger = 36
+
+# Amount of data to build up in memory (backed by an unsorted log
+# on disk) before converting to a sorted on-disk file.
+# write-buffer-size = "128MB"
+
+# The maximum number of write buffers that are built up in memory.
+# max-write-buffer-number = 5
+
+# The minimum number of write buffers that will be merged together
+# before writing to storage.
+# min-write-buffer-number-to-merge = 1
+
+# Control maximum total data size for base level (level 1).
+# max-bytes-for-level-base = "512MB"
+
+# Target file size for compaction.
+# target-file-size-base = "8MB"
+
+# Max bytes for compaction.max_compaction_bytes
+# max-compaction-bytes = "2GB"
+
+# There are four different algorithms to pick files to compact.
+# 0 : ByCompensatedSize
+# 1 : OldestLargestSeqFirst
+# 2 : OldestSmallestSeqFirst
+# 3 : MinOverlappingRatio
+# compaction-pri = 3
+
+# block-cache used to cache uncompressed blocks, big block-cache can speed up read.
+# in normal cases should tune to 30%-50% system's total memory.
+# block-cache-size = "1GB"
+
+# Indicating if we'd put index/filter blocks to the block cache.
+# If not specified, each "table reader" object will pre-load index/filter block
+# during table initialization.
+# cache-index-and-filter-blocks = true
+
+# Pin level0 filter and index blocks in cache.
+# pin-l0-filter-and-index-blocks = true
+
+# Enable read amplication statistics.
+# value  =>  memory usage (percentage of loaded blocks memory)
+# 1      =>  12.50 %
+# 2      =>  06.25 %
+# 4      =>  03.12 %
+# 8      =>  01.56 %
+# 16     =>  00.78 %
+# read-amp-bytes-per-bit = 0
+
+# Pick target size of each level dynamically.
+# dynamic-level-bytes = true
+
+# Options for Column Family write
+# Column Family write used to store commit information in MVCC model
+[rocksdb.writecf]
+# compression-per-level = ["no", "no", "lz4", "lz4", "lz4", "zstd", "zstd"]
+# block-size = "64KB"
+# write-buffer-size = "128MB"
+# max-write-buffer-number = 5
+# min-write-buffer-number-to-merge = 1
+# max-bytes-for-level-base = "512MB"
+# target-file-size-base = "8MB"
+
+# in normal cases should tune to 10%-30% system's total memory.
+# block-cache-size = "256MB"
+# level0-file-num-compaction-trigger = 4
+# level0-slowdown-writes-trigger = 20
+# level0-stop-writes-trigger = 36
+# cache-index-and-filter-blocks = true
+# pin-l0-filter-and-index-blocks = true
+# compaction-pri = 3
+# read-amp-bytes-per-bit = 0
+# dynamic-level-bytes = true
+
+[rocksdb.lockcf]
+# compression-per-level = ["no", "no", "no", "no", "no", "no", "no"]
+# block-size = "16KB"
+# write-buffer-size = "128MB"
+# max-write-buffer-number = 5
+# min-write-buffer-number-to-merge = 1
+# max-bytes-for-level-base = "128MB"
+# target-file-size-base = "8MB"
+# block-cache-size = "256MB"
+# level0-file-num-compaction-trigger = 1
+# level0-slowdown-writes-trigger = 20
+# level0-stop-writes-trigger = 36
+# cache-index-and-filter-blocks = true
+# pin-l0-filter-and-index-blocks = true
+# compaction-pri = 0
+# read-amp-bytes-per-bit = 0
+# dynamic-level-bytes = true
+
+[raftdb]
+# max-sub-compactions = 1
+max-open-files = 1024
+# max-manifest-file-size = "20MB"
+# create-if-missing = true
+
+# enable-statistics = true
+# stats-dump-period = "10m"
+
+# compaction-readahead-size = 0
+# writable-file-max-buffer-size = "1MB"
+# use-direct-io-for-flush-and-compaction = false
+# enable-pipelined-write = true
+# allow-concurrent-memtable-write = false
+# bytes-per-sync = "0MB"
+# wal-bytes-per-sync = "0KB"
+
+# info-log-max-size = "1GB"
+# info-log-roll-time = "0"
+# info-log-keep-log-file-num = 10
+# info-log-dir = ""
+
+[raftdb.defaultcf]
+# compression-per-level = ["no", "no", "lz4", "lz4", "lz4", "zstd", "zstd"]
+# block-size = "64KB"
+# write-buffer-size = "128MB"
+# max-write-buffer-number = 5
+# min-write-buffer-number-to-merge = 1
+# max-bytes-for-level-base = "512MB"
+# target-file-size-base = "8MB"
+
+# should tune to 256MB~2GB.
+# block-cache-size = "256MB"
+# level0-file-num-compaction-trigger = 4
+# level0-slowdown-writes-trigger = 20
+# level0-stop-writes-trigger = 36
+# cache-index-and-filter-blocks = true
+# pin-l0-filter-and-index-blocks = true
+# compaction-pri = 0
+# read-amp-bytes-per-bit = 0
+# dynamic-level-bytes = true
+
+[security]
+# set the path for certificates. Empty string means disabling secure connectoins.
+# ca-path = ""
+# cert-path = ""
+# key-path = ""
+
+[import]
+# the directory to store importing kv data.
+# import-dir = "/tmp/tikv/import"
+# number of threads to handle RPC requests.
+# num-threads = 8
+# stream channel window size, stream will be blocked on channel full.
+# stream-channel-window = 128
diff --git a/integration_tests/tidb-cdc-sink/create_mv.sql b/integration_tests/tidb-cdc-sink/create_mv.sql
new file mode 100644
index 0000000000000..042da6cf585b3
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/create_mv.sql
@@ -0,0 +1,31 @@
+--
+-- Find the top10 hotest hashtags.
+--
+CREATE MATERIALIZED VIEW hot_hashtags AS WITH tags AS (
+    SELECT
+        unnest(regexp_matches(tweet.text, '#\w+', 'g')) AS hashtag,
+        tweet.created_at AS created_at
+    FROM
+        tweet JOIN user
+    ON
+        tweet.author_id = user.id
+)
+SELECT
+    hashtag,
+    COUNT(*) AS hashtag_occurrences,
+    window_start
+FROM
+    TUMBLE(tags, created_at, INTERVAL '5 minute')
+GROUP BY
+    hashtag,
+    window_start
+ORDER BY
+    hashtag_occurrences;
+
+
+CREATE SINK hot_hashtags_sink FROM hot_hashtags
+WITH (
+   connector='jdbc',
+   jdbc.url='jdbc:mysql://tidb:4000/test?user=root&password=',
+   table.name='hot_hashtags'
+);
diff --git a/integration_tests/tidb-cdc-sink/create_source.sql b/integration_tests/tidb-cdc-sink/create_source.sql
new file mode 100644
index 0000000000000..d58996f799d7d
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/create_source.sql
@@ -0,0 +1,27 @@
+CREATE TABLE tweet (
+  id varchar,
+  text varchar,
+  lang varchar,
+  created_at timestamp,
+  author_id varchar,
+  PRIMARY KEY (id)
+) WITH (
+    connector='kafka',
+    topic='ticdc_test_tweet',
+    properties.bootstrap.server='kafka:9092',
+    scan.startup.mode='earliest'
+) ROW FORMAT CANAL_JSON;
+
+create table user (
+    id varchar,
+    name varchar,
+    username varchar,
+    followers bigint,
+    created_at timestamp,
+    PRIMARY KEY (id)
+) WITH (
+    connector='kafka',
+    topic='ticdc_test_user',
+    properties.bootstrap.server='kafka:9092',
+    scan.startup.mode='earliest'
+) ROW FORMAT CANAL_JSON;
diff --git a/integration_tests/tidb-cdc-sink/data_check b/integration_tests/tidb-cdc-sink/data_check
new file mode 100644
index 0000000000000..2f946d9fc6ae8
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/data_check
@@ -0,0 +1 @@
+tweet,user
\ No newline at end of file
diff --git a/integration_tests/tidb-cdc-sink/docker-compose.yml b/integration_tests/tidb-cdc-sink/docker-compose.yml
new file mode 100644
index 0000000000000..e1b45c81a6bbf
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/docker-compose.yml
@@ -0,0 +1,232 @@
+---
+version: '3'
+services:
+  compactor-0:
+    extends:
+      file: ../../docker/docker-compose.yml
+      service: compactor-0
+  compute-node-0:
+    extends:
+      file: ../../docker/docker-compose.yml
+      service: compute-node-0
+  etcd-0:
+    extends:
+      file: ../../docker/docker-compose.yml
+      service: etcd-0
+  frontend-node-0:
+    extends:
+      file: ../../docker/docker-compose.yml
+      service: frontend-node-0
+  grafana-0:
+    extends:
+      file: ../../docker/docker-compose.yml
+      service: grafana-0
+  meta-node-0:
+    extends:
+      file: ../../docker/docker-compose.yml
+      service: meta-node-0
+  minio-0:
+    extends:
+      file: ../../docker/docker-compose.yml
+      service: minio-0
+  prometheus-0:
+    extends:
+      file: ../../docker/docker-compose.yml
+      service: prometheus-0
+  connector-node:
+    extends:
+      file: ../../docker/docker-compose.yml
+      service: connector-node
+
+  #=================== TiDB & TiCDC components ==================
+  ticdc-controller:
+    image: pingcap/ticdc:v6.6.0
+    entrypoint: "/cdc cli"
+    command:
+      - changefeed
+      - create
+      - --server
+      - http://ticdc-capturer0:8300
+      - --sink-uri
+      - "kafka://kafka:9092/ticdc_default?protocol=canal-json&kafka-version=2.4.0&partition-num=3&max-message-bytes=67108864&replication-factor=1"
+      - --changefeed-id
+      - "ticdc-replication-task"
+      - --config
+      - "/changefeed.toml"
+    volumes:
+      - ./config/changefeed.toml:/changefeed.toml:ro
+    depends_on:
+      - "pd"
+      - "kafka"
+      - "ticdc-capturer0"
+    restart: on-failure
+
+  ticdc-capturer0:
+    image: pingcap/ticdc:v6.6.0
+    entrypoint: "/cdc server"
+    ports:
+      - "8300:8300"
+    command:
+      - --addr=0.0.0.0:8300
+      - --pd=http://pd:2379
+      - --advertise-addr=ticdc-capturer0:8300
+    depends_on:
+      - pd
+      - "tidb"
+      - "kafka"
+    restart: on-failure
+
+  pd:
+    image: pingcap/pd:v6.6.0
+    ports:
+      - "2379:2379"
+    volumes:
+      - ./config/pd.toml:/pd.toml:ro
+    command:
+      - --name=pd
+      - --client-urls=http://0.0.0.0:2379
+      - --peer-urls=http://0.0.0.0:2380
+      - --advertise-client-urls=http://pd:2379
+      - --advertise-peer-urls=http://pd:2380
+      - --initial-cluster=pd=http://pd:2380
+      - --data-dir=/data/pd
+      - --config=/pd.toml
+    restart: on-failure
+
+  tikv0:
+    image: pingcap/tikv:v6.6.0
+    volumes:
+      - ./config/tikv.toml:/tikv.toml:ro
+      - /data
+    command:
+      - --addr=0.0.0.0:20160
+      - --advertise-addr=tikv0:20160
+      - --data-dir=/data/tikv0
+      - --pd=pd:2379
+      - --config=/tikv.toml
+    depends_on:
+      - "pd"
+    restart: on-failure
+
+  tikv1:
+    image: pingcap/tikv:v6.6.0
+    volumes:
+      - ./config/tikv.toml:/tikv.toml:ro
+      - /data
+    command:
+      - --addr=0.0.0.0:20160
+      - --advertise-addr=tikv1:20160
+      - --data-dir=/data/tikv1
+      - --pd=pd:2379
+      - --config=/tikv.toml
+    depends_on:
+      - "pd"
+    restart: on-failure
+
+  tikv2:
+    image: pingcap/tikv:v6.6.0
+    volumes:
+      - ./config/tikv.toml:/tikv.toml:ro
+      - /data
+    command:
+      - --addr=0.0.0.0:20160
+      - --advertise-addr=tikv2:20160
+      - --data-dir=/data/tikv2
+      - --pd=pd:2379
+      - --config=/tikv.toml
+    depends_on:
+      - "pd"
+    restart: on-failure
+
+  tidb:
+    image: pingcap/tidb:v6.6.0
+    ports:
+      - "4000:4000"
+      - "10080:10080"
+    volumes:
+      - ./config/tidb.toml:/tidb.toml:ro
+    command:
+      - --store=tikv
+      - --path=pd:2379
+      - --config=/tidb.toml
+      - --advertise-address=tidb
+    depends_on:
+      - "tikv0"
+      - "tikv1"
+      - "tikv2"
+    restart: on-failure
+
+  #=================== Kakfa ==================
+
+  # Adapted from https://github.com/confluentinc/demo-scene/blob/master/connect-jdbc/docker-compose.yml
+  zookeeper:
+    image: confluentinc/cp-zookeeper:5.5.1
+    container_name: zookeeper
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_TICK_TIME: 2000
+
+  kafka:
+    image: confluentinc/cp-enterprise-kafka:5.5.1
+    container_name: kafka
+    depends_on:
+      - "zookeeper"
+    ports:
+      # Exposes 9092 for external connections to the broker
+      # Use kafka:29092 for connections internal on the docker network
+      # See https://rmoff.net/2018/08/02/kafka-listeners-explained/ for details
+      - 9092:9092
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://kafka:9092
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
+      KAFKA_METRIC_REPORTERS: io.confluent.metrics.reporter.ConfluentMetricsReporter
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 100
+      CONFLUENT_METRICS_REPORTER_BOOTSTRAP_SERVERS: kafka:29092
+      CONFLUENT_METRICS_REPORTER_ZOOKEEPER_CONNECT: zookeeper:2181
+      CONFLUENT_METRICS_REPORTER_TOPIC_REPLICAS: 1
+      CONFLUENT_METRICS_ENABLE: 'true'
+      CONFLUENT_SUPPORT_CUSTOMER_ID: 'anonymous'
+
+  #===================== Others ===================
+  datagen:
+    build: ../datagen
+    depends_on: 
+      - tidb
+    command:
+      - /bin/sh
+      - -c
+      - /datagen --mode twitter --qps 2 mysql --host tidb --db test --port 4000 --user root --password ""
+    restart: always
+    container_name: datagen
+
+  init_tidb:
+    image: mysql:8.0
+    depends_on: 
+      - tidb
+    command:
+      - /bin/sh
+      - -c
+      - "mysql --password= -h tidb --port 4000 -u root test < tidb_create_tables.sql"
+    volumes:
+      - "./tidb_create_tables.sql:/tidb_create_tables.sql"      
+    container_name: init_tidb
+    restart: on-failure
+
+volumes:
+  compute-node-0:
+    external: false
+  etcd-0:
+    external: false
+  grafana-0:
+    external: false
+  minio-0:
+    external: false
+  prometheus-0:
+    external: false
+  message_queue:
+    external: false
\ No newline at end of file
diff --git a/integration_tests/tidb-cdc-sink/query.sql b/integration_tests/tidb-cdc-sink/query.sql
new file mode 100644
index 0000000000000..3e64784a04aa7
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/query.sql
@@ -0,0 +1,8 @@
+SELECT
+    *
+FROM
+    hot_hashtags
+ORDER BY
+    hashtag_occurrences DESC
+LIMIT
+    10;
\ No newline at end of file
diff --git a/integration_tests/tidb-cdc-sink/tidb_create_tables.sql b/integration_tests/tidb-cdc-sink/tidb_create_tables.sql
new file mode 100644
index 0000000000000..3a7e4d448bf6f
--- /dev/null
+++ b/integration_tests/tidb-cdc-sink/tidb_create_tables.sql
@@ -0,0 +1,25 @@
+CREATE TABLE `tweet` (
+  `id` varchar(20) NOT NULL,
+  `text` varchar(1024) DEFAULT NULL,
+  `lang` varchar(20) DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `author_id` varchar(20) NOT NULL,
+  PRIMARY KEY (`id`)
+);
+
+create table user (
+    `id` varchar(20) NOT NULL,
+    `name` varchar(100) DEFAULT NULL,
+    `username` varchar(100) DEFAULT NULL,
+    `followers` bigint not null,
+    `created_at` timestamp NULL DEFAULT NULL,
+    PRIMARY KEY (`id`)
+);
+
+
+create table hot_hashtags (
+    `window_start` timestamp not null,
+    `hashtag` varchar(100) not null,
+    `hashtag_occurrences` bigint not null,
+    PRIMARY KEY (window_start, hashtag)
+);
diff --git a/java/connector-node/assembly/scripts/start-service.sh b/java/connector-node/assembly/scripts/start-service.sh
index 483c950570329..86b59386c43a3 100755
--- a/java/connector-node/assembly/scripts/start-service.sh
+++ b/java/connector-node/assembly/scripts/start-service.sh
@@ -15,6 +15,7 @@ while getopts ":h:p:" o; do
 done
 shift $((OPTIND-1))
 
+
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 MAIN='com.risingwave.connector.ConnectorService'
 PORT=50051
@@ -24,4 +25,4 @@ if [ -z "${port}" ]; then
     port=$PORT
 fi
 
-java -classpath "${DIR}/libs/*" $MAIN --port ${port}
+java -classpath "${DIR}/libs/*" -Djava.library.path="${RW_JAVA_BINDING_LIB_PATH}" $MAIN --port ${port}
diff --git a/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/TableSchema.java b/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/TableSchema.java
index 5d1016c95ea49..053ba1e329920 100644
--- a/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/TableSchema.java
+++ b/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/TableSchema.java
@@ -102,8 +102,6 @@ public static TableSchema fromProto(ConnectorServiceProto.TableSchema tableSchem
                         .collect(Collectors.toList()));
     }
 
-    /** @deprecated pk here is from Risingwave, it may not match the pk in the database */
-    @Deprecated
     public List<String> getPrimaryKeys() {
         return primaryKeys;
     }
diff --git a/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/source/ConnectorConfig.java b/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/source/ConnectorConfig.java
deleted file mode 100644
index 8f5c3c854a480..0000000000000
--- a/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/source/ConnectorConfig.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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.
-
-package com.risingwave.connector.api.source;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ConnectorConfig extends HashMap<String, String> {
-
-    public ConnectorConfig() {}
-
-    public ConnectorConfig(Map<? extends String, ? extends String> m) {
-        super(m);
-    }
-
-    public String getNonNull(String key) {
-        String value = super.get(key);
-        if (value == null) {
-            throw new RuntimeException(key + "cannot be null");
-        }
-        return value;
-    }
-
-    /* Common configs */
-    public static final String HOST = "hostname";
-    public static final String PORT = "port";
-    public static final String USER = "username";
-    public static final String PASSWORD = "password";
-
-    public static final String DB_NAME = "database.name";
-    public static final String TABLE_NAME = "table.name";
-
-    /* MySQL specified configs */
-    public static final String MYSQL_SERVER_ID = "server.id";
-
-    /* Postgres specified configs */
-    public static final String PG_SLOT_NAME = "slot.name";
-    public static final String PG_SCHEMA_NAME = "schema.name";
-
-    public static Map<String, String> extractDebeziumProperties(Map<String, String> properties) {
-        // retain only debezium properties if any
-        var userProps = new HashMap<>(properties);
-        userProps.remove(ConnectorConfig.HOST);
-        userProps.remove(ConnectorConfig.PORT);
-        userProps.remove(ConnectorConfig.USER);
-        userProps.remove(ConnectorConfig.PASSWORD);
-        userProps.remove(ConnectorConfig.DB_NAME);
-        userProps.remove(ConnectorConfig.TABLE_NAME);
-        userProps.remove(ConnectorConfig.MYSQL_SERVER_ID);
-        userProps.remove(ConnectorConfig.PG_SLOT_NAME);
-        userProps.remove(ConnectorConfig.PG_SCHEMA_NAME);
-        return userProps;
-    }
-}
diff --git a/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/source/SourceHandler.java b/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/source/SourceHandler.java
index 1c3f0d1e91d66..d37730635a60b 100644
--- a/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/source/SourceHandler.java
+++ b/java/connector-node/connector-api/src/main/java/com/risingwave/connector/api/source/SourceHandler.java
@@ -19,7 +19,7 @@
 
 /** Handler for RPC request */
 public interface SourceHandler {
-    void handle(
+    void startSource(
             ServerCallStreamObserver<ConnectorServiceProto.GetEventStreamResponse>
                     responseObserver);
 }
diff --git a/java/connector-node/python-client/integration_tests.py b/java/connector-node/python-client/integration_tests.py
index 61aacb6414dce..7480902519e61 100644
--- a/java/connector-node/python-client/integration_tests.py
+++ b/java/connector-node/python-client/integration_tests.py
@@ -162,7 +162,7 @@ def test_print_sink(input_file):
 
 def test_iceberg_sink(input_file):
     test_sink("iceberg",
-              {"sink.mode":"append-only",
+              {"type":"append-only",
                "warehouse.path":"s3a://bucket",
                "s3.endpoint": "http://127.0.0.1:9000",
                "s3.access.key": "minioadmin",
@@ -173,7 +173,7 @@ def test_iceberg_sink(input_file):
 
 def test_upsert_iceberg_sink(input_file):
     test_upsert_sink("iceberg",
-              {"sink.mode":"upsert",
+              {"type":"upsert",
                "warehouse.path":"s3a://bucket",
                "s3.endpoint": "http://127.0.0.1:9000",
                "s3.access.key": "minioadmin",
diff --git a/java/connector-node/risingwave-connector-service/pom.xml b/java/connector-node/risingwave-connector-service/pom.xml
index ff38088c4221f..581085f43b30a 100644
--- a/java/connector-node/risingwave-connector-service/pom.xml
+++ b/java/connector-node/risingwave-connector-service/pom.xml
@@ -25,6 +25,10 @@
             <groupId>com.risingwave.java</groupId>
             <artifactId>proto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.risingwave.java</groupId>
+            <artifactId>java-binding</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.risingwave.java</groupId>
             <artifactId>connector-api</artifactId>
@@ -47,7 +51,14 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/JsonDeserializer.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/JsonDeserializer.java
index 097872dcef757..837989120eab3 100644
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/JsonDeserializer.java
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/JsonDeserializer.java
@@ -22,6 +22,8 @@
 import com.risingwave.proto.ConnectorServiceProto;
 import com.risingwave.proto.ConnectorServiceProto.SinkStreamRequest.WriteBatch.JsonPayload;
 import com.risingwave.proto.Data;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.util.Map;
 
 public class JsonDeserializer implements Deserializer {
@@ -31,6 +33,8 @@ public JsonDeserializer(TableSchema tableSchema) {
         this.tableSchema = tableSchema;
     }
 
+    // Encoding here should be consistent with `datum_to_json_object()` in
+    // src/connector/src/sink/mod.rs
     @Override
     public CloseableIterator<SinkRow> deserialize(
             ConnectorServiceProto.SinkStreamRequest.WriteBatch writeBatch) {
@@ -113,6 +117,19 @@ private static Double castDouble(Object value) {
         }
     }
 
+    private static BigDecimal castDecimal(Object value) {
+        if (value instanceof String) {
+            // FIXME(eric): See `datum_to_json_object()` in src/connector/src/sink/mod.rs
+            return new BigDecimal((String) value);
+        } else if (value instanceof BigDecimal) {
+            return (BigDecimal) value;
+        } else {
+            throw io.grpc.Status.INVALID_ARGUMENT
+                    .withDescription("unable to cast into double from " + value.getClass())
+                    .asRuntimeException();
+        }
+    }
+
     private static Object validateJsonDataTypes(Data.DataType.TypeName typeName, Object value) {
         switch (typeName) {
             case INT16:
@@ -132,6 +149,8 @@ private static Object validateJsonDataTypes(Data.DataType.TypeName typeName, Obj
                 return castDouble(value);
             case FLOAT:
                 return castDouble(value).floatValue();
+            case DECIMAL:
+                return castDecimal(value);
             case BOOLEAN:
                 if (!(value instanceof Boolean)) {
                     throw io.grpc.Status.INVALID_ARGUMENT
@@ -139,6 +158,15 @@ private static Object validateJsonDataTypes(Data.DataType.TypeName typeName, Obj
                             .asRuntimeException();
                 }
                 return value;
+            case TIMESTAMP:
+            case TIMESTAMPTZ:
+                if (!(value instanceof String)) {
+                    throw io.grpc.Status.INVALID_ARGUMENT
+                            .withDescription(
+                                    "Expected timestamp in string, got " + value.getClass())
+                            .asRuntimeException();
+                }
+                return Timestamp.valueOf((String) value);
             default:
                 throw io.grpc.Status.INVALID_ARGUMENT
                         .withDescription("unsupported type " + typeName)
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/SinkStreamObserver.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/SinkStreamObserver.java
index eb5d6514cb53c..036db70aae9b8 100644
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/SinkStreamObserver.java
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/SinkStreamObserver.java
@@ -18,6 +18,7 @@
 
 import com.risingwave.connector.api.TableSchema;
 import com.risingwave.connector.api.sink.*;
+import com.risingwave.connector.deserializer.StreamChunkDeserializer;
 import com.risingwave.metrics.ConnectorNodeMetrics;
 import com.risingwave.metrics.MonitoredRowIterator;
 import com.risingwave.proto.ConnectorServiceProto;
@@ -202,7 +203,10 @@ private void bindSink(SinkConfig sinkConfig, ConnectorServiceProto.SinkPayloadFo
             case JSON:
                 deserializer = new JsonDeserializer(tableSchema);
                 break;
+            case STREAM_CHUNK:
+                deserializer = new StreamChunkDeserializer(tableSchema);
+                break;
         }
-        ConnectorNodeMetrics.incActiveConnections(sinkConfig.getConnectorType(), "node1");
+        ConnectorNodeMetrics.incActiveSinkConnections(sinkConfig.getConnectorType(), "node1");
     }
 }
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/deserializer/StreamChunkDeserializer.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/deserializer/StreamChunkDeserializer.java
new file mode 100644
index 0000000000000..b6be0af1d9394
--- /dev/null
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/connector/deserializer/StreamChunkDeserializer.java
@@ -0,0 +1,215 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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.
+
+package com.risingwave.connector.deserializer;
+
+import static io.grpc.Status.INVALID_ARGUMENT;
+
+import com.risingwave.connector.api.TableSchema;
+import com.risingwave.connector.api.sink.CloseableIterator;
+import com.risingwave.connector.api.sink.Deserializer;
+import com.risingwave.connector.api.sink.SinkRow;
+import com.risingwave.java.binding.StreamChunkIterator;
+import com.risingwave.java.binding.StreamChunkRow;
+import com.risingwave.proto.ConnectorServiceProto;
+import com.risingwave.proto.ConnectorServiceProto.SinkStreamRequest.WriteBatch.StreamChunkPayload;
+import com.risingwave.proto.Data;
+
+public class StreamChunkDeserializer implements Deserializer {
+    interface ValueGetter {
+        Object get(StreamChunkRow row);
+    }
+
+    private final ValueGetter[] valueGetters;
+
+    public StreamChunkDeserializer(TableSchema tableSchema) {
+        this.valueGetters = buildValueGetter(tableSchema);
+    }
+
+    static ValueGetter[] buildValueGetter(TableSchema tableSchema) {
+        String[] colNames = tableSchema.getColumnNames();
+        ValueGetter[] ret = new ValueGetter[colNames.length];
+        for (int i = 0; i < colNames.length; i++) {
+            int index = i;
+            Data.DataType.TypeName typeName = tableSchema.getColumnType(colNames[i]);
+            switch (typeName) {
+                case INT16:
+                    ret[i] =
+                            row -> {
+                                if (row.isNull(index)) {
+                                    return null;
+                                }
+                                return row.getShort(index);
+                            };
+                    break;
+                case INT32:
+                    ret[i] =
+                            row -> {
+                                if (row.isNull(index)) {
+                                    return null;
+                                }
+                                return row.getInt(index);
+                            };
+                    break;
+                case INT64:
+                    ret[i] =
+                            row -> {
+                                if (row.isNull(index)) {
+                                    return null;
+                                }
+                                return row.getLong(index);
+                            };
+                    break;
+                case FLOAT:
+                    ret[i] =
+                            row -> {
+                                if (row.isNull(index)) {
+                                    return null;
+                                }
+                                return row.getFloat(index);
+                            };
+                    break;
+                case DOUBLE:
+                    ret[i] =
+                            row -> {
+                                if (row.isNull(index)) {
+                                    return null;
+                                }
+                                return row.getDouble(index);
+                            };
+                    break;
+                case BOOLEAN:
+                    ret[i] =
+                            row -> {
+                                if (row.isNull(index)) {
+                                    return null;
+                                }
+                                return row.getBoolean(index);
+                            };
+                    break;
+                case VARCHAR:
+                    ret[i] =
+                            row -> {
+                                if (row.isNull(index)) {
+                                    return null;
+                                }
+                                return row.getString(index);
+                            };
+                    break;
+                default:
+                    throw io.grpc.Status.INVALID_ARGUMENT
+                            .withDescription("unsupported type " + typeName)
+                            .asRuntimeException();
+            }
+        }
+        return ret;
+    }
+
+    @Override
+    public CloseableIterator<SinkRow> deserialize(
+            ConnectorServiceProto.SinkStreamRequest.WriteBatch writeBatch) {
+        if (!writeBatch.hasStreamChunkPayload()) {
+            throw INVALID_ARGUMENT
+                    .withDescription(
+                            "expected StreamChunkPayload, got " + writeBatch.getPayloadCase())
+                    .asRuntimeException();
+        }
+        StreamChunkPayload streamChunkPayload = writeBatch.getStreamChunkPayload();
+        return new StreamChunkIteratorWrapper(
+                new StreamChunkIterator(streamChunkPayload.getBinaryData().toByteArray()),
+                valueGetters);
+    }
+
+    static class StreamChunkRowWrapper implements SinkRow {
+
+        private boolean isClosed;
+        private final StreamChunkRow inner;
+        private final ValueGetter[] valueGetters;
+
+        StreamChunkRowWrapper(StreamChunkRow inner, ValueGetter[] valueGetters) {
+            this.inner = inner;
+            this.valueGetters = valueGetters;
+            this.isClosed = false;
+        }
+
+        @Override
+        public Object get(int index) {
+            return valueGetters[index].get(inner);
+        }
+
+        @Override
+        public Data.Op getOp() {
+            return inner.getOp();
+        }
+
+        @Override
+        public int size() {
+            return valueGetters.length;
+        }
+
+        @Override
+        public void close() {
+            if (!isClosed) {
+                this.isClosed = true;
+                inner.close();
+            }
+        }
+    }
+
+    static class StreamChunkIteratorWrapper implements CloseableIterator<SinkRow> {
+        private final StreamChunkIterator iter;
+        private final ValueGetter[] valueGetters;
+        private StreamChunkRowWrapper row;
+
+        public StreamChunkIteratorWrapper(StreamChunkIterator iter, ValueGetter[] valueGetters) {
+            this.iter = iter;
+            this.valueGetters = valueGetters;
+            this.row = null;
+        }
+
+        @Override
+        public void close() {
+            iter.close();
+            try {
+                if (row != null) {
+                    row.close();
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public boolean hasNext() {
+            if (this.row != null) {
+                throw new RuntimeException(
+                        "cannot call hasNext again when there is row not consumed by next");
+            }
+            StreamChunkRow row = iter.next();
+            if (row == null) {
+                return false;
+            }
+            this.row = new StreamChunkRowWrapper(row, valueGetters);
+            return true;
+        }
+
+        @Override
+        public SinkRow next() {
+            // Move the sink row outside
+            SinkRow ret = this.row;
+            this.row = null;
+            return ret;
+        }
+    }
+}
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/metrics/ConnectorNodeMetrics.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/metrics/ConnectorNodeMetrics.java
index 51009c356b505..90fa04c538784 100644
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/metrics/ConnectorNodeMetrics.java
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/metrics/ConnectorNodeMetrics.java
@@ -16,42 +16,55 @@
 
 import static io.grpc.Status.INTERNAL;
 
+import com.sun.management.OperatingSystemMXBean;
 import io.prometheus.client.CollectorRegistry;
 import io.prometheus.client.Counter;
 import io.prometheus.client.Gauge;
 import io.prometheus.client.exporter.HTTPServer;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
-import java.lang.management.OperatingSystemMXBean;
 import java.net.InetSocketAddress;
 
 public class ConnectorNodeMetrics {
-    private static final Counter activeConnections =
+    private static final Counter activeSourceConnections =
             Counter.build()
-                    .name("active_connections")
+                    .name("active_source_connections")
+                    .labelNames("source_type", "ip")
+                    .help("Number of active source connections")
+                    .register();
+
+    private static final Counter activeSinkConnections =
+            Counter.build()
+                    .name("active_sink_connections")
                     .labelNames("sink_type", "ip")
-                    .help("Number of active connections")
+                    .help("Number of active sink connections")
                     .register();
 
-    private static final Counter totalConnections =
+    private static final Counter totalSinkConnections =
             Counter.build()
-                    .name("total_connections")
+                    .name("total_sink_connections")
                     .labelNames("sink_type", "ip")
                     .help("Number of total connections")
                     .register();
-    private static final Gauge cpuUsage =
-            Gauge.build()
-                    .name("cpu_usage")
-                    .labelNames("node_id")
-                    .help("CPU usage in percentage")
+    private static final Counter cpuUsage =
+            Counter.build()
+                    .name("process_cpu_seconds_total")
+                    .labelNames("job")
+                    .help("Total user and system CPU time spent in seconds.")
                     .register();
     private static final Gauge ramUsage =
             Gauge.build()
-                    .name("ram_usage")
-                    .labelNames("node_id")
+                    .name("process_resident_memory_bytes")
+                    .labelNames("job")
                     .help("RAM usage in bytes")
                     .register();
 
+    private static final Counter sourceRowsReceived =
+            Counter.build()
+                    .name("connector_source_rows_received")
+                    .labelNames("source_type", "source_id")
+                    .help("Number of rows received by source")
+                    .register();
     private static final Counter sinkRowsReceived =
             Counter.build()
                     .name("sink_rows_received")
@@ -68,14 +81,15 @@ public class ConnectorNodeMetrics {
     static class PeriodicMetricsCollector extends Thread {
         private final int interval;
         private final OperatingSystemMXBean osBean;
-        private final String nodeId;
+        private final String job;
 
-        public PeriodicMetricsCollector(int intervalMillis, String nodeId) {
+        public PeriodicMetricsCollector(int intervalMillis, String job) {
             this.interval = intervalMillis;
-            this.nodeId = nodeId;
-            this.osBean = ManagementFactory.getOperatingSystemMXBean();
+            this.job = job;
+            this.osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
         }
 
+        @SuppressWarnings({"InfiniteLoopStatement", "BusyWait"})
         @Override
         public void run() {
             while (true) {
@@ -89,24 +103,26 @@ public void run() {
         }
 
         private void collect() {
-            double cpuUsage = osBean.getSystemLoadAverage();
-            ConnectorNodeMetrics.cpuUsage.labels(nodeId).set(cpuUsage);
+            double cpuTotal = osBean.getProcessCpuTime() / 1000000000.0;
+            double cpuPast = ConnectorNodeMetrics.cpuUsage.labels(job).get();
+            ConnectorNodeMetrics.cpuUsage.labels(job).inc(cpuTotal - cpuPast);
             long ramUsageBytes =
                     Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
-            ConnectorNodeMetrics.ramUsage.labels(nodeId).set(ramUsageBytes);
+            ConnectorNodeMetrics.ramUsage.labels(job).set(ramUsageBytes);
         }
     }
 
     public static void startHTTPServer(int port) {
         CollectorRegistry registry = new CollectorRegistry();
-        registry.register(activeConnections);
+        registry.register(activeSourceConnections);
+        registry.register(activeSinkConnections);
+        registry.register(sourceRowsReceived);
         registry.register(cpuUsage);
         registry.register(ramUsage);
-        PeriodicMetricsCollector collector = new PeriodicMetricsCollector(1000, "node1");
+        PeriodicMetricsCollector collector = new PeriodicMetricsCollector(1000, "connector");
         collector.start();
-
         try {
-            HTTPServer server = new HTTPServer(new InetSocketAddress("localhost", port), registry);
+            new HTTPServer(new InetSocketAddress("localhost", port), registry);
         } catch (IOException e) {
             throw INTERNAL.withDescription("Failed to start HTTP server")
                     .withCause(e)
@@ -114,12 +130,24 @@ public static void startHTTPServer(int port) {
         }
     }
 
-    public static void incActiveConnections(String sinkType, String ip) {
-        activeConnections.labels(sinkType, ip).inc();
+    public static void incActiveSourceConnections(String sourceType, String ip) {
+        activeSourceConnections.labels(sourceType, ip).inc();
+    }
+
+    public static void decActiveSourceConnections(String sourceType, String ip) {
+        activeSourceConnections.remove(sourceType, ip);
+    }
+
+    public static void incActiveSinkConnections(String sinkType, String ip) {
+        activeSinkConnections.labels(sinkType, ip).inc();
     }
 
     public static void decActiveConnections(String sinkType, String ip) {
-        activeConnections.remove(sinkType, ip);
+        activeSinkConnections.remove(sinkType, ip);
+    }
+
+    public static void incSourceRowsReceived(String sourceType, String sourceId, double amt) {
+        sourceRowsReceived.labels(sourceType, sourceId).inc(amt);
     }
 
     public static void incSinkRowsReceived() {
@@ -127,17 +155,13 @@ public static void incSinkRowsReceived() {
     }
 
     public static void incTotalConnections(String sinkType, String ip) {
-        totalConnections.labels(sinkType, ip).inc();
+        totalSinkConnections.labels(sinkType, ip).inc();
     }
 
     public static void incErrorCount(String sinkType, String ip) {
         errorCount.labels(sinkType, ip).inc();
     }
 
-    public static void setCpuUsage(String ip, double cpuUsagePercentage) {
-        cpuUsage.labels(ip).set(cpuUsagePercentage);
-    }
-
     public static void setRamUsage(String ip, long usedRamInBytes) {
         ramUsage.labels(ip).set(usedRamInBytes);
     }
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/SourceRequestHandler.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/SourceRequestHandler.java
index 8dcb973307c06..dd54b86803889 100644
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/SourceRequestHandler.java
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/SourceRequestHandler.java
@@ -14,10 +14,11 @@
 
 package com.risingwave.sourcenode;
 
-import com.risingwave.connector.api.source.ConnectorConfig;
 import com.risingwave.connector.api.source.SourceTypeE;
+import com.risingwave.metrics.ConnectorNodeMetrics;
 import com.risingwave.proto.ConnectorServiceProto;
 import com.risingwave.proto.Data.DataType;
+import com.risingwave.sourcenode.common.DbzConnectorConfig;
 import com.risingwave.sourcenode.core.SourceHandlerFactory;
 import io.grpc.Status;
 import io.grpc.StatusException;
@@ -46,19 +47,25 @@ public void handle(ConnectorServiceProto.GetEventStreamRequest request) {
                 break;
             case START:
                 var startRequest = request.getStart();
-                var handler =
-                        SourceHandlerFactory.createSourceHandler(
-                                SourceTypeE.valueOf(startRequest.getSourceType()),
-                                startRequest.getSourceId(),
-                                startRequest.getStartOffset(),
-                                new ConnectorConfig(startRequest.getPropertiesMap()));
-                if (handler == null) {
-                    LOG.error("failed to create source handler");
-                    responseObserver.onCompleted();
-                } else {
-                    handler.handle(
+                try {
+                    var handler =
+                            SourceHandlerFactory.createSourceHandler(
+                                    SourceTypeE.valueOf(startRequest.getSourceType()),
+                                    startRequest.getSourceId(),
+                                    startRequest.getStartOffset(),
+                                    startRequest.getPropertiesMap());
+                    ConnectorNodeMetrics.incActiveSourceConnections(
+                            startRequest.getSourceType().toString(),
+                            startRequest.getPropertiesMap().get(DbzConnectorConfig.HOST));
+                    handler.startSource(
                             (ServerCallStreamObserver<ConnectorServiceProto.GetEventStreamResponse>)
                                     responseObserver);
+                    ConnectorNodeMetrics.decActiveSourceConnections(
+                            startRequest.getSourceType().toString(),
+                            startRequest.getPropertiesMap().get(DbzConnectorConfig.HOST));
+                } catch (Throwable t) {
+                    LOG.error("failed to start source", t);
+                    responseObserver.onError(t);
                 }
                 break;
             case REQUEST_NOT_SET:
@@ -75,11 +82,11 @@ private void validateDbProperties(
         String jdbcUrl =
                 toJdbcPrefix(validate.getSourceType())
                         + "://"
-                        + props.get(ConnectorConfig.HOST)
+                        + props.get(DbzConnectorConfig.HOST)
                         + ":"
-                        + props.get(ConnectorConfig.PORT)
+                        + props.get(DbzConnectorConfig.PORT)
                         + "/"
-                        + props.get(ConnectorConfig.DB_NAME);
+                        + props.get(DbzConnectorConfig.DB_NAME);
         LOG.debug("validate jdbc url: {}", jdbcUrl);
 
         var sqlStmts = new Properties();
@@ -93,8 +100,8 @@ private void validateDbProperties(
         try (var conn =
                 DriverManager.getConnection(
                         jdbcUrl,
-                        props.get(ConnectorConfig.USER),
-                        props.get(ConnectorConfig.PASSWORD))) {
+                        props.get(DbzConnectorConfig.USER),
+                        props.get(DbzConnectorConfig.PASSWORD))) {
             // usernamed and password are correct
             var dbMeta = conn.getMetaData();
 
@@ -138,8 +145,8 @@ private void validateDbProperties(
                     }
                     // check whether table exist
                     try (var stmt = conn.prepareStatement(sqlStmts.getProperty("mysql.table"))) {
-                        stmt.setString(1, props.get(ConnectorConfig.DB_NAME));
-                        stmt.setString(2, props.get(ConnectorConfig.TABLE_NAME));
+                        stmt.setString(1, props.get(DbzConnectorConfig.DB_NAME));
+                        stmt.setString(2, props.get(DbzConnectorConfig.TABLE_NAME));
                         var res = stmt.executeQuery();
                         while (res.next()) {
                             var ret = res.getInt(1);
@@ -152,8 +159,8 @@ private void validateDbProperties(
                     try (var stmt =
                             conn.prepareStatement(sqlStmts.getProperty("mysql.table_schema"))) {
                         var sourceSchema = validate.getTableSchema();
-                        stmt.setString(1, props.get(ConnectorConfig.DB_NAME));
-                        stmt.setString(2, props.get(ConnectorConfig.TABLE_NAME));
+                        stmt.setString(1, props.get(DbzConnectorConfig.DB_NAME));
+                        stmt.setString(2, props.get(DbzConnectorConfig.TABLE_NAME));
                         var res = stmt.executeQuery();
                         var pkFields = new HashSet<String>();
                         int index = 0;
@@ -203,8 +210,8 @@ private void validateDbProperties(
                     }
                     // check schema name and table name
                     try (var stmt = conn.prepareStatement(sqlStmts.getProperty("postgres.table"))) {
-                        stmt.setString(1, props.get(ConnectorConfig.PG_SCHEMA_NAME));
-                        stmt.setString(2, props.get(ConnectorConfig.TABLE_NAME));
+                        stmt.setString(1, props.get(DbzConnectorConfig.PG_SCHEMA_NAME));
+                        stmt.setString(2, props.get(DbzConnectorConfig.TABLE_NAME));
                         var res = stmt.executeQuery();
                         while (res.next()) {
                             var ret = res.getString(1);
@@ -219,9 +226,9 @@ private void validateDbProperties(
                     try (var stmt = conn.prepareStatement(sqlStmts.getProperty("postgres.pk"))) {
                         stmt.setString(
                                 1,
-                                props.get(ConnectorConfig.PG_SCHEMA_NAME)
+                                props.get(DbzConnectorConfig.PG_SCHEMA_NAME)
                                         + "."
-                                        + props.get(ConnectorConfig.TABLE_NAME));
+                                        + props.get(DbzConnectorConfig.TABLE_NAME));
 
                         var res = stmt.executeQuery();
                         var pkFields = new HashSet<String>();
@@ -237,8 +244,8 @@ private void validateDbProperties(
                     // check whether source schema match table schema on upstream
                     try (var stmt =
                             conn.prepareStatement(sqlStmts.getProperty("postgres.table_schema"))) {
-                        stmt.setString(1, props.get(ConnectorConfig.PG_SCHEMA_NAME));
-                        stmt.setString(2, props.get(ConnectorConfig.TABLE_NAME));
+                        stmt.setString(1, props.get(DbzConnectorConfig.PG_SCHEMA_NAME));
+                        stmt.setString(2, props.get(DbzConnectorConfig.TABLE_NAME));
                         var res = stmt.executeQuery();
                         var sourceSchema = validate.getTableSchema();
                         int index = 0;
@@ -263,6 +270,159 @@ private void validateDbProperties(
                             }
                         }
                     }
+                    // check whether user is superuser or replication role
+                    try (var stmt =
+                            conn.prepareStatement(sqlStmts.getProperty("postgres.role.check"))) {
+                        stmt.setString(1, props.get(DbzConnectorConfig.USER));
+                        var res = stmt.executeQuery();
+                        while (res.next()) {
+                            if (!res.getBoolean(1)) {
+                                throw new StatusException(
+                                        Status.INTERNAL.withDescription(
+                                                "Postgres user must be superuser or replication role to start walsender."));
+                            }
+                        }
+                    }
+                    // check whether user has select privilege on table for initial snapshot
+                    try (var stmt =
+                            conn.prepareStatement(
+                                    sqlStmts.getProperty("postgres.table_privilege.check"))) {
+                        stmt.setString(1, props.get(DbzConnectorConfig.TABLE_NAME));
+                        stmt.setString(2, props.get(DbzConnectorConfig.USER));
+                        var res = stmt.executeQuery();
+                        while (res.next()) {
+                            if (!res.getBoolean(1)) {
+                                throw new StatusException(
+                                        Status.INTERNAL.withDescription(
+                                                "Postgres user must have select privilege on table "
+                                                        + props.get(
+                                                                DbzConnectorConfig.TABLE_NAME)));
+                            }
+                        }
+                    }
+                    // check whether publication exists
+                    boolean publicationExists = false;
+                    boolean partialPublication = false;
+                    try (var stmt = conn.createStatement()) {
+                        var res =
+                                stmt.executeQuery(
+                                        sqlStmts.getProperty("postgres.publication_att_exists"));
+                        while (res.next()) {
+                            partialPublication = res.getBoolean(1);
+                        }
+                    }
+                    // pg 15 and up supports partial publication of table
+                    // check whether publication covers all columns
+                    if (partialPublication) {
+                        try (var stmt =
+                                conn.prepareStatement(
+                                        sqlStmts.getProperty("postgres.publication_att"))) {
+                            stmt.setString(1, props.get(DbzConnectorConfig.PG_SCHEMA_NAME));
+                            stmt.setString(2, props.get(DbzConnectorConfig.TABLE_NAME));
+                            var res = stmt.executeQuery();
+                            while (res.next()) {
+                                String[] columnsPub =
+                                        (String[]) res.getArray("attnames").getArray();
+                                var sourceSchema = validate.getTableSchema();
+                                for (int i = 0; i < sourceSchema.getColumnsCount(); i++) {
+                                    String columnName = sourceSchema.getColumns(i).getName();
+                                    if (Arrays.stream(columnsPub).noneMatch(columnName::equals)) {
+                                        throw new StatusException(
+                                                Status.INTERNAL.withDescription(
+                                                        "The publication 'dbz_publication' does not cover all necessary columns in table "
+                                                                + props.get(
+                                                                        DbzConnectorConfig
+                                                                                .TABLE_NAME)));
+                                    }
+                                    if (i == sourceSchema.getColumnsCount() - 1) {
+                                        publicationExists = true;
+                                    }
+                                }
+                                if (publicationExists) {
+                                    LOG.info("publication exists");
+                                    break;
+                                }
+                            }
+                        }
+                    } else { // check directly whether publication exists
+                        try (var stmt =
+                                conn.prepareStatement(
+                                        sqlStmts.getProperty("postgres.publication_cnt"))) {
+                            stmt.setString(1, props.get(DbzConnectorConfig.PG_SCHEMA_NAME));
+                            stmt.setString(2, props.get(DbzConnectorConfig.TABLE_NAME));
+                            var res = stmt.executeQuery();
+                            while (res.next()) {
+                                if (res.getInt("count") > 0) {
+                                    publicationExists = true;
+                                    LOG.info("publication exists");
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    // if publication does not exist, check permission to create publication
+                    if (!publicationExists) {
+                        // check create privilege on database
+                        try (var stmt =
+                                conn.prepareStatement(
+                                        sqlStmts.getProperty(
+                                                "postgres.database_privilege.check"))) {
+                            stmt.setString(1, props.get(DbzConnectorConfig.USER));
+                            stmt.setString(2, props.get(DbzConnectorConfig.DB_NAME));
+                            stmt.setString(3, props.get(DbzConnectorConfig.USER));
+                            var res = stmt.executeQuery();
+                            while (res.next()) {
+                                if (!res.getBoolean(1)) {
+                                    throw new StatusException(
+                                            Status.INTERNAL.withDescription(
+                                                    "Postgres user must have create privilege on database"
+                                                            + props.get(
+                                                                    DbzConnectorConfig.DB_NAME)));
+                                }
+                            }
+                        }
+                        // check ownership on table
+                        boolean isTableOwner = false;
+                        String owner = null;
+                        // check if user is owner
+                        try (var stmt =
+                                conn.prepareStatement(
+                                        sqlStmts.getProperty("postgres.table_owner"))) {
+                            stmt.setString(1, props.get(DbzConnectorConfig.PG_SCHEMA_NAME));
+                            stmt.setString(2, props.get(DbzConnectorConfig.TABLE_NAME));
+                            var res = stmt.executeQuery();
+                            while (res.next()) {
+                                owner = res.getString("tableowner");
+                                if (owner.equals(props.get(DbzConnectorConfig.USER))) {
+                                    isTableOwner = true;
+                                    break;
+                                }
+                            }
+                        }
+                        // if user is not owner, check if user belongs to owner group
+                        if (!isTableOwner && !owner.isEmpty()) {
+                            try (var stmt =
+                                    conn.prepareStatement(
+                                            sqlStmts.getProperty("postgres.users_of_group"))) {
+                                stmt.setString(1, owner);
+                                var res = stmt.executeQuery();
+                                while (res.next()) {
+                                    String[] users = (String[]) res.getArray("members").getArray();
+                                    if (Arrays.stream(users)
+                                            .anyMatch(props.get(DbzConnectorConfig.USER)::equals)) {
+                                        isTableOwner = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        if (!isTableOwner) {
+                            throw new StatusException(
+                                    Status.INTERNAL.withDescription(
+                                            "Postgres user must be owner of table "
+                                                    + props.get(DbzConnectorConfig.TABLE_NAME)));
+                        }
+                    }
                     break;
                 default:
                     break;
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/common/DbzConnectorConfig.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/common/DbzConnectorConfig.java
new file mode 100644
index 0000000000000..cff7e0dc2940d
--- /dev/null
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/common/DbzConnectorConfig.java
@@ -0,0 +1,141 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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.
+
+package com.risingwave.sourcenode.common;
+
+import com.risingwave.connector.api.source.SourceTypeE;
+import com.risingwave.connector.cdc.debezium.internal.ConfigurableOffsetBackingStore;
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.text.StringSubstitutor;
+
+public class DbzConnectorConfig {
+
+    /* Common configs */
+    public static final String HOST = "hostname";
+    public static final String PORT = "port";
+    public static final String USER = "username";
+    public static final String PASSWORD = "password";
+
+    public static final String DB_NAME = "database.name";
+    public static final String TABLE_NAME = "table.name";
+
+    /* MySQL specified configs */
+    public static final String MYSQL_SERVER_ID = "server.id";
+
+    /* Postgres specified configs */
+    public static final String PG_SLOT_NAME = "slot.name";
+    public static final String PG_SCHEMA_NAME = "schema.name";
+
+    private static final String MYSQL_CONFIG_FILE = "mysql.properties";
+    private static final String POSTGRES_CONFIG_FILE = "postgres.properties";
+
+    public static Map<String, String> extractDebeziumProperties(Map<String, String> properties) {
+        // retain only debezium properties if any
+        var userProps = new HashMap<>(properties);
+        userProps.remove(DbzConnectorConfig.HOST);
+        userProps.remove(DbzConnectorConfig.PORT);
+        userProps.remove(DbzConnectorConfig.USER);
+        userProps.remove(DbzConnectorConfig.PASSWORD);
+        userProps.remove(DbzConnectorConfig.DB_NAME);
+        userProps.remove(DbzConnectorConfig.TABLE_NAME);
+        userProps.remove(DbzConnectorConfig.MYSQL_SERVER_ID);
+        userProps.remove(DbzConnectorConfig.PG_SLOT_NAME);
+        userProps.remove(DbzConnectorConfig.PG_SCHEMA_NAME);
+        return userProps;
+    }
+
+    private final long sourceId;
+
+    private final SourceTypeE sourceType;
+
+    private final Properties resolvedDbzProps;
+
+    public long getSourceId() {
+        return sourceId;
+    }
+
+    public SourceTypeE getSourceType() {
+        return sourceType;
+    }
+
+    public Properties getResolvedDebeziumProps() {
+        return resolvedDbzProps;
+    }
+
+    public DbzConnectorConfig(
+            SourceTypeE source, long sourceId, String startOffset, Map<String, String> userProps) {
+        var dbzProps = new Properties();
+        try (var input = getClass().getClassLoader().getResourceAsStream("debezium.properties")) {
+            assert input != null;
+            dbzProps.load(input);
+        } catch (IOException e) {
+            throw new RuntimeException("failed to load debezium.properties", e);
+        }
+
+        StringSubstitutor substitutor = new StringSubstitutor(userProps);
+        if (source == SourceTypeE.MYSQL) {
+            var mysqlProps = initiateDbConfig(MYSQL_CONFIG_FILE, substitutor);
+            // if offset is specified, we will continue binlog reading from the specified offset
+            if (null != startOffset && !startOffset.isBlank()) {
+                // 'snapshot.mode=schema_only_recovery' must be configured if binlog offset is
+                // specified.
+                // It only snapshots the schemas, not the data, and continue binlog reading from the
+                // specified offset
+                mysqlProps.setProperty("snapshot.mode", "schema_only_recovery");
+                mysqlProps.setProperty(
+                        ConfigurableOffsetBackingStore.OFFSET_STATE_VALUE, startOffset);
+            }
+
+            dbzProps.putAll(mysqlProps);
+        } else if (source == SourceTypeE.POSTGRES) {
+            var postgresProps = initiateDbConfig(POSTGRES_CONFIG_FILE, substitutor);
+
+            // if offset is specified, we will continue reading changes from the specified offset
+            if (null != startOffset && !startOffset.isBlank()) {
+                postgresProps.setProperty("snapshot.mode", "never");
+                postgresProps.setProperty(
+                        ConfigurableOffsetBackingStore.OFFSET_STATE_VALUE, startOffset);
+            }
+            dbzProps.putAll(postgresProps);
+        } else {
+            throw new RuntimeException("unsupported source type: " + source);
+        }
+
+        var otherProps = extractDebeziumProperties(userProps);
+        dbzProps.putAll(otherProps);
+
+        this.sourceId = sourceId;
+        this.sourceType = source;
+        this.resolvedDbzProps = dbzProps;
+    }
+
+    private Properties initiateDbConfig(String fileName, StringSubstitutor substitutor) {
+        var dbProps = new Properties();
+        try (var input = getClass().getClassLoader().getResourceAsStream(fileName)) {
+            assert input != null;
+            var inputStr = IOUtils.toString(input, StandardCharsets.UTF_8);
+            var resolvedStr = substitutor.replace(inputStr);
+            dbProps.load(new StringReader(resolvedStr));
+        } catch (IOException e) {
+            throw new RuntimeException("failed to load " + fileName, e);
+        }
+        return dbProps;
+    }
+}
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/common/DebeziumCdcUtils.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/common/DebeziumCdcUtils.java
deleted file mode 100644
index d4ecc4fe7c132..0000000000000
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/common/DebeziumCdcUtils.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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.
-
-package com.risingwave.sourcenode.common;
-
-import java.util.Properties;
-
-public class DebeziumCdcUtils {
-
-    /** Common config properties for Debeizum CDC connectors */
-    public static Properties createCommonConfig() {
-        var props = new Properties();
-        // capture decimal type in doule values, which may result in a loss of precision but is
-        // easier to use
-        // https://debezium.io/documentation/reference/stable/connectors/mysql.html#mysql-property-decimal-handling-mode
-        props.setProperty("decimal.handling.mode", "double");
-
-        // Add a converter for `Date` data type, which convert `Date` into a string
-        props.setProperty("converters", "datetime");
-        props.setProperty(
-                "datetime.type",
-                "com.risingwave.connector.cdc.debezium.converters.DatetimeTypeConverter");
-        props.setProperty("max.batch.size", "1024");
-        props.setProperty("max.queue.size", "8192");
-        return props;
-    }
-}
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DefaultCdcEngine.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzCdcEngine.java
similarity index 71%
rename from java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DefaultCdcEngine.java
rename to java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzCdcEngine.java
index 1a18ac7f4a731..b9f85ec33b1b2 100644
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DefaultCdcEngine.java
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzCdcEngine.java
@@ -15,37 +15,34 @@
 package com.risingwave.sourcenode.core;
 
 import com.risingwave.connector.api.source.CdcEngine;
-import com.risingwave.connector.api.source.SourceConfig;
 import com.risingwave.proto.ConnectorServiceProto;
 import io.debezium.embedded.Connect;
 import io.debezium.engine.DebeziumEngine;
 import io.debezium.heartbeat.Heartbeat;
+import java.util.Properties;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
-public class DefaultCdcEngine implements CdcEngine {
+public class DbzCdcEngine implements CdcEngine {
     static final int DEFAULT_QUEUE_CAPACITY = 16;
 
     private final DebeziumEngine<?> engine;
-    private final CdcEventConsumer consumer;
-    private final SourceConfig config;
+    private final DbzCdcEventConsumer consumer;
+    private final long id;
 
     /** If config is not valid will throw exceptions */
-    public DefaultCdcEngine(SourceConfig config, DebeziumEngine.CompletionCallback callback) {
-        var dbzHeartbeatPrefix =
-                config.getProperties().getProperty(Heartbeat.HEARTBEAT_TOPICS_PREFIX.name());
+    public DbzCdcEngine(long id, Properties config, DebeziumEngine.CompletionCallback callback) {
+        var dbzHeartbeatPrefix = config.getProperty(Heartbeat.HEARTBEAT_TOPICS_PREFIX.name());
         var consumer =
-                new CdcEventConsumer(
-                        config.getId(),
-                        dbzHeartbeatPrefix,
-                        new ArrayBlockingQueue<>(DEFAULT_QUEUE_CAPACITY));
+                new DbzCdcEventConsumer(
+                        id, dbzHeartbeatPrefix, new ArrayBlockingQueue<>(DEFAULT_QUEUE_CAPACITY));
 
         // Builds a debezium engine but not start it
-        this.config = config;
+        this.id = id;
         this.consumer = consumer;
         this.engine =
                 DebeziumEngine.create(Connect.class)
-                        .using(config.getProperties())
+                        .using(config)
                         .using(callback)
                         .notifying(consumer)
                         .build();
@@ -59,7 +56,7 @@ public void run() {
 
     @Override
     public long getId() {
-        return config.getId();
+        return id;
     }
 
     public void stop() throws Exception {
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DefaultCdcEngineRunner.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzCdcEngineRunner.java
similarity index 65%
rename from java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DefaultCdcEngineRunner.java
rename to java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzCdcEngineRunner.java
index eebe3e30b3373..68104c226924d 100644
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DefaultCdcEngineRunner.java
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzCdcEngineRunner.java
@@ -16,7 +16,7 @@
 
 import com.risingwave.connector.api.source.*;
 import com.risingwave.proto.ConnectorServiceProto;
-import io.debezium.engine.DebeziumEngine;
+import com.risingwave.sourcenode.common.DbzConnectorConfig;
 import io.grpc.stub.StreamObserver;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -25,44 +25,40 @@
 import org.slf4j.LoggerFactory;
 
 /** Single-thread engine runner */
-public class DefaultCdcEngineRunner implements CdcEngineRunner {
-    static final Logger LOG = LoggerFactory.getLogger(DefaultCdcEngineRunner.class);
+public class DbzCdcEngineRunner implements CdcEngineRunner {
+    static final Logger LOG = LoggerFactory.getLogger(DbzCdcEngineRunner.class);
 
     private final ExecutorService executor;
     private final AtomicBoolean running = new AtomicBoolean(false);
     private final CdcEngine engine;
 
-    public DefaultCdcEngineRunner(CdcEngine engine) {
+    public DbzCdcEngineRunner(CdcEngine engine) {
         this.executor = Executors.newSingleThreadExecutor();
         this.engine = engine;
     }
 
     public static CdcEngineRunner newCdcEngineRunner(
-            long sourceId,
-            SourceConfig config,
+            DbzConnectorConfig config,
             StreamObserver<ConnectorServiceProto.GetEventStreamResponse> responseObserver) {
-        DefaultCdcEngineRunner runner = null;
+        DbzCdcEngineRunner runner = null;
         try {
             var engine =
-                    new DefaultCdcEngine(
-                            config,
-                            new DebeziumEngine.CompletionCallback() {
-                                @Override
-                                public void handle(
-                                        boolean success, String message, Throwable error) {
-                                    if (!success) {
-                                        responseObserver.onError(error);
-                                        LOG.error(
-                                                "failed to run the engine. message: {}",
-                                                message,
-                                                error);
-                                    } else {
-                                        responseObserver.onCompleted();
-                                    }
+                    new DbzCdcEngine(
+                            config.getSourceId(),
+                            config.getResolvedDebeziumProps(),
+                            (success, message, error) -> {
+                                if (!success) {
+                                    responseObserver.onError(error);
+                                    LOG.error(
+                                            "the engine terminated with error. message: {}",
+                                            message,
+                                            error);
+                                } else {
+                                    responseObserver.onCompleted();
                                 }
                             });
 
-            runner = new DefaultCdcEngineRunner(engine);
+            runner = new DbzCdcEngineRunner(engine);
         } catch (Exception e) {
             LOG.error("failed to create the CDC engine", e);
         }
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/CdcEventConsumer.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzCdcEventConsumer.java
similarity index 97%
rename from java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/CdcEventConsumer.java
rename to java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzCdcEventConsumer.java
index 5324bd92827e3..499e97b48b704 100644
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/CdcEventConsumer.java
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzCdcEventConsumer.java
@@ -33,16 +33,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CdcEventConsumer
+public class DbzCdcEventConsumer
         implements DebeziumEngine.ChangeConsumer<ChangeEvent<SourceRecord, SourceRecord>> {
-    static final Logger LOG = LoggerFactory.getLogger(CdcEventConsumer.class);
+    static final Logger LOG = LoggerFactory.getLogger(DbzCdcEventConsumer.class);
 
     private final BlockingQueue<GetEventStreamResponse> outputChannel;
     private final long sourceId;
     private final JsonConverter converter;
     private final String heartbeatTopicPrefix;
 
-    CdcEventConsumer(
+    DbzCdcEventConsumer(
             long sourceId,
             String heartbeatTopicPrefix,
             BlockingQueue<GetEventStreamResponse> store) {
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DefaultSourceHandler.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzSourceHandler.java
similarity index 70%
rename from java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DefaultSourceHandler.java
rename to java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzSourceHandler.java
index 82e0af3e4c446..ee7c2aea839cf 100644
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DefaultSourceHandler.java
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/DbzSourceHandler.java
@@ -14,33 +14,29 @@
 
 package com.risingwave.sourcenode.core;
 
-import com.risingwave.connector.api.source.SourceConfig;
 import com.risingwave.connector.api.source.SourceHandler;
+import com.risingwave.metrics.ConnectorNodeMetrics;
 import com.risingwave.proto.ConnectorServiceProto.GetEventStreamResponse;
+import com.risingwave.sourcenode.common.DbzConnectorConfig;
 import io.grpc.Context;
 import io.grpc.stub.ServerCallStreamObserver;
 import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** Default handler for RPC request */
-public class DefaultSourceHandler implements SourceHandler {
-    static final Logger LOG = LoggerFactory.getLogger(DefaultSourceHandler.class);
+/** * handler for starting a debezium source connectors */
+public class DbzSourceHandler implements SourceHandler {
+    static final Logger LOG = LoggerFactory.getLogger(DbzSourceHandler.class);
 
-    private final SourceConfig config;
+    private final DbzConnectorConfig config;
 
-    private DefaultSourceHandler(SourceConfig config) {
+    public DbzSourceHandler(DbzConnectorConfig config) {
         this.config = config;
     }
 
-    public static DefaultSourceHandler newWithConfig(SourceConfig config) {
-        return new DefaultSourceHandler(config);
-    }
-
     @Override
-    public void handle(ServerCallStreamObserver<GetEventStreamResponse> responseObserver) {
-        var runner =
-                DefaultCdcEngineRunner.newCdcEngineRunner(config.getId(), config, responseObserver);
+    public void startSource(ServerCallStreamObserver<GetEventStreamResponse> responseObserver) {
+        var runner = DbzCdcEngineRunner.newCdcEngineRunner(config, responseObserver);
         if (runner == null) {
             responseObserver.onCompleted();
             return;
@@ -49,7 +45,7 @@ public void handle(ServerCallStreamObserver<GetEventStreamResponse> responseObse
         try {
             // Start the engine
             runner.start();
-            LOG.info("Start consuming events of table {}", config.getId());
+            LOG.info("Start consuming events of table {}", config.getSourceId());
             while (runner.isRunning()) {
                 try {
                     // Thread will block on the channel to get output from engine
@@ -62,10 +58,13 @@ public void handle(ServerCallStreamObserver<GetEventStreamResponse> responseObse
                             // wait a bit to avoid OOM
                             Thread.sleep(500);
                         }
-
+                        ConnectorNodeMetrics.incSourceRowsReceived(
+                                config.getSourceType().toString(),
+                                String.valueOf(config.getSourceId()),
+                                resp.getEventsCount());
                         LOG.debug(
                                 "Engine#{}: emit one chunk {} events to network ",
-                                config.getId(),
+                                config.getSourceId(),
                                 resp.getEventsCount());
                         responseObserver.onNext(resp);
                     }
@@ -73,7 +72,7 @@ public void handle(ServerCallStreamObserver<GetEventStreamResponse> responseObse
                     if (Context.current().isCancelled()) {
                         LOG.info(
                                 "Engine#{}: Connection broken detected, stop the engine",
-                                config.getId());
+                                config.getSourceId());
                         runner.stop();
                     }
                 } catch (InterruptedException e) {
@@ -85,9 +84,9 @@ public void handle(ServerCallStreamObserver<GetEventStreamResponse> responseObse
             try {
                 runner.stop();
             } catch (Exception e) {
-                LOG.warn("Failed to stop Engine#{}", config.getId(), e);
+                LOG.warn("Failed to stop Engine#{}", config.getSourceId(), e);
             }
         }
-        LOG.info("End consuming events of table {}", config.getId());
+        LOG.info("End consuming events of table {}", config.getSourceId());
     }
 }
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/SourceHandlerFactory.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/SourceHandlerFactory.java
index 51877adba7a3e..8692f25da25dd 100644
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/SourceHandlerFactory.java
+++ b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/core/SourceHandlerFactory.java
@@ -14,11 +14,10 @@
 
 package com.risingwave.sourcenode.core;
 
-import com.risingwave.connector.api.source.ConnectorConfig;
 import com.risingwave.connector.api.source.SourceHandler;
 import com.risingwave.connector.api.source.SourceTypeE;
-import com.risingwave.sourcenode.mysql.MySqlSourceConfig;
-import com.risingwave.sourcenode.postgres.PostgresSourceConfig;
+import com.risingwave.sourcenode.common.DbzConnectorConfig;
+import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,17 +25,9 @@ public abstract class SourceHandlerFactory {
     static final Logger LOG = LoggerFactory.getLogger(SourceHandlerFactory.class);
 
     public static SourceHandler createSourceHandler(
-            SourceTypeE type, long sourceId, String startOffset, ConnectorConfig userProps) {
-        switch (type) {
-            case MYSQL:
-                return DefaultSourceHandler.newWithConfig(
-                        new MySqlSourceConfig(sourceId, startOffset, userProps));
-            case POSTGRES:
-                return DefaultSourceHandler.newWithConfig(
-                        new PostgresSourceConfig(sourceId, startOffset, userProps));
-            default:
-                LOG.warn("unknown source type: {}", type);
-                return null;
-        }
+            SourceTypeE source, long sourceId, String startOffset, Map<String, String> userProps) {
+        var config = new DbzConnectorConfig(source, sourceId, startOffset, userProps);
+        LOG.info("resolved config for source#{}: {}", sourceId, config.getResolvedDebeziumProps());
+        return new DbzSourceHandler(config);
     }
 }
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/mysql/MySqlSourceConfig.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/mysql/MySqlSourceConfig.java
deleted file mode 100644
index 78f36e8bcf7f9..0000000000000
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/mysql/MySqlSourceConfig.java
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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.
-
-package com.risingwave.sourcenode.mysql;
-
-import com.risingwave.connector.api.source.ConnectorConfig;
-import com.risingwave.connector.api.source.SourceConfig;
-import com.risingwave.connector.api.source.SourceTypeE;
-import com.risingwave.connector.cdc.debezium.internal.ConfigurableOffsetBackingStore;
-import com.risingwave.sourcenode.common.DebeziumCdcUtils;
-import java.util.Properties;
-
-/** MySQL Source Config */
-public class MySqlSourceConfig implements SourceConfig {
-    static final String DB_SERVER_NAME_PREFIX = "RW_CDC_";
-    private final Properties props = DebeziumCdcUtils.createCommonConfig();
-    private final long id;
-    private final String sourceName;
-
-    public MySqlSourceConfig(long sourceId, String startOffset, ConnectorConfig userProps) {
-        id = sourceId;
-        props.setProperty("connector.class", "io.debezium.connector.mysql.MySqlConnector");
-        props.setProperty(
-                "offset.storage", ConfigurableOffsetBackingStore.class.getCanonicalName());
-
-        props.setProperty(
-                "database.history", "io.debezium.relational.history.MemoryDatabaseHistory");
-        // if offset is specified, we will continue binlog reading from the specified offset
-        if (null != startOffset && !startOffset.isBlank()) {
-            // 'snapshot.mode=schema_only_recovery' must be configured if binlog offset is
-            // specified.
-            // It only snapshots the schemas, not the data, and continue binlog reading from the
-            // specified offset
-            props.setProperty("snapshot.mode", "schema_only_recovery");
-            props.setProperty(ConfigurableOffsetBackingStore.OFFSET_STATE_VALUE, startOffset);
-        }
-
-        // Begin of connector configs
-        props.setProperty("database.hostname", userProps.get(ConnectorConfig.HOST));
-        props.setProperty("database.port", userProps.get(ConnectorConfig.PORT));
-        props.setProperty("database.user", userProps.get(ConnectorConfig.USER));
-        props.setProperty("database.password", userProps.get(ConnectorConfig.PASSWORD));
-
-        props.setProperty("database.include.list", userProps.get(ConnectorConfig.DB_NAME));
-        // only captures data of the specified table
-        String tableFilter =
-                userProps.getNonNull(ConnectorConfig.DB_NAME)
-                        + "."
-                        + userProps.getNonNull(ConnectorConfig.TABLE_NAME);
-        props.setProperty("table.include.list", tableFilter);
-
-        // disable schema change events for current stage
-        props.setProperty("include.schema.changes", "false");
-
-        // ServerId must be unique since the connector will join the mysql cluster as a client.
-        // By default, we generate serverId by adding a fixed number to the sourceId generated by
-        // Meta. We may allow user to specify the ID in the future.
-        props.setProperty("database.server.id", userProps.get(ConnectorConfig.MYSQL_SERVER_ID));
-        props.setProperty("database.server.name", DB_SERVER_NAME_PREFIX + tableFilter);
-
-        // host:port:database.table
-        sourceName =
-                userProps.get(ConnectorConfig.HOST)
-                        + ":"
-                        + userProps.get(ConnectorConfig.PORT)
-                        + ":"
-                        + userProps.get(ConnectorConfig.DB_NAME)
-                        + "."
-                        + userProps.get(ConnectorConfig.TABLE_NAME);
-
-        props.setProperty("name", sourceName);
-
-        // pass through debezium properties if any
-        var dbzProperties = ConnectorConfig.extractDebeziumProperties(userProps);
-        props.putAll(dbzProperties);
-    }
-
-    @Override
-    public long getId() {
-        return id;
-    }
-
-    @Override
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    @Override
-    public SourceTypeE getSourceType() {
-        return SourceTypeE.MYSQL;
-    }
-
-    @Override
-    public Properties getProperties() {
-        return props;
-    }
-}
diff --git a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/postgres/PostgresSourceConfig.java b/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/postgres/PostgresSourceConfig.java
deleted file mode 100644
index 6b492397dcb90..0000000000000
--- a/java/connector-node/risingwave-connector-service/src/main/java/com/risingwave/sourcenode/postgres/PostgresSourceConfig.java
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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.
-
-package com.risingwave.sourcenode.postgres;
-
-import com.risingwave.connector.api.source.ConnectorConfig;
-import com.risingwave.connector.api.source.SourceConfig;
-import com.risingwave.connector.api.source.SourceTypeE;
-import com.risingwave.connector.cdc.debezium.internal.ConfigurableOffsetBackingStore;
-import com.risingwave.sourcenode.common.DebeziumCdcUtils;
-import io.debezium.heartbeat.Heartbeat;
-import java.time.Duration;
-import java.util.Properties;
-
-/** Postgres Source Config */
-public class PostgresSourceConfig implements SourceConfig {
-    static final String DB_SERVER_NAME_PREFIX = "RW_CDC_";
-    private final Properties props = DebeziumCdcUtils.createCommonConfig();
-    private final long id;
-    private final String sourceName;
-    private static final long DEFAULT_HEARTBEAT_MS = Duration.ofMinutes(5).toMillis();
-
-    public PostgresSourceConfig(long sourceId, String startOffset, ConnectorConfig userProps) {
-        id = sourceId;
-        props.setProperty("connector.class", "io.debezium.connector.postgresql.PostgresConnector");
-        props.setProperty(
-                "offset.storage", ConfigurableOffsetBackingStore.class.getCanonicalName());
-        props.setProperty(
-                "database.history", "io.debezium.relational.history.MemoryDatabaseHistory");
-
-        // if offset is specified, we will continue reading changes from the specified offset
-        if (null != startOffset && !startOffset.isBlank()) {
-            props.setProperty("snapshot.mode", "never");
-            props.setProperty(ConfigurableOffsetBackingStore.OFFSET_STATE_VALUE, startOffset);
-        }
-
-        String dbName = userProps.getNonNull(ConnectorConfig.DB_NAME);
-        String schema = userProps.getNonNull(ConnectorConfig.PG_SCHEMA_NAME);
-        String table = userProps.getNonNull(ConnectorConfig.TABLE_NAME);
-
-        // Begin of connector configs
-        props.setProperty("database.hostname", userProps.get(ConnectorConfig.HOST));
-        props.setProperty("database.port", userProps.get(ConnectorConfig.PORT));
-        props.setProperty("database.user", userProps.get(ConnectorConfig.USER));
-        props.setProperty("database.password", userProps.get(ConnectorConfig.PASSWORD));
-        props.setProperty("database.dbname", dbName);
-        // The name of the PostgreSQL logical decoding plug-in installed on the PostgreSQL server.
-        // Supported values are decoderbufs, and pgoutput.
-        // The wal2json plug-in is deprecated and scheduled for removal.
-        // see
-        // https://debezium.io/documentation/reference/1.9/connectors/postgresql.html#postgresql-property-plugin-name
-        props.setProperty("plugin.name", "pgoutput");
-
-        // The name of the PostgreSQL logical decoding slot that was created for streaming changes
-        // from a particular plug-in for a particular database/schema. The server uses this slot to
-        // stream events
-        // to the Debezium connector that you are configuring.
-        // Slot names must conform to PostgreSQL replication slot naming rules,
-        // which state: "Each replication slot has a name, which can contain lower-case letters,
-        // numbers, and the underscore character."
-        props.setProperty("slot.name", userProps.get(ConnectorConfig.PG_SLOT_NAME));
-
-        // Sending heartbeat messages enables the connector to send the latest retrieved LSN to the
-        // database, which allows the database to reclaim disk space being
-        // used by no longer needed WAL files.
-        // https://debezium.io/documentation/reference/1.9/connectors/postgresql.html#postgresql-property-heartbeat-interval-ms
-        props.setProperty("heartbeat.interval.ms", String.valueOf(DEFAULT_HEARTBEAT_MS));
-        props.setProperty(
-                Heartbeat.HEARTBEAT_TOPICS_PREFIX.name(),
-                Heartbeat.HEARTBEAT_TOPICS_PREFIX.defaultValueAsString());
-
-        String tableFilter = schema + "." + table;
-        props.setProperty("table.include.list", tableFilter);
-        props.setProperty("database.server.name", DB_SERVER_NAME_PREFIX + tableFilter);
-
-        // host:port:database.schema.table
-        sourceName =
-                userProps.getNonNull(ConnectorConfig.HOST)
-                        + ":"
-                        + userProps.getNonNull(ConnectorConfig.PORT)
-                        + ":"
-                        + dbName
-                        + "."
-                        + schema
-                        + "."
-                        + table;
-        props.setProperty("name", sourceName);
-
-        // pass through debezium properties if any
-        var dbzProperties = ConnectorConfig.extractDebeziumProperties(userProps);
-        props.putAll(dbzProperties);
-    }
-
-    @Override
-    public long getId() {
-        return id;
-    }
-
-    @Override
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    @Override
-    public SourceTypeE getSourceType() {
-        return SourceTypeE.POSTGRES;
-    }
-
-    @Override
-    public Properties getProperties() {
-        return props;
-    }
-}
diff --git a/java/connector-node/risingwave-connector-service/src/main/resources/debezium.properties b/java/connector-node/risingwave-connector-service/src/main/resources/debezium.properties
new file mode 100644
index 0000000000000..666e547188d9a
--- /dev/null
+++ b/java/connector-node/risingwave-connector-service/src/main/resources/debezium.properties
@@ -0,0 +1,8 @@
+# Store common debezium configs shared by all connectors
+decimal.handling.mode=double
+converters=datetime
+datetime.type=com.risingwave.connector.cdc.debezium.converters.DatetimeTypeConverter
+max.batch.size=1024
+max.queue.size=8192
+
+time.precision.mode=adaptive_time_microseconds
diff --git a/java/connector-node/risingwave-connector-service/src/main/resources/mysql.properties b/java/connector-node/risingwave-connector-service/src/main/resources/mysql.properties
new file mode 100644
index 0000000000000..d7b9b384ca4b1
--- /dev/null
+++ b/java/connector-node/risingwave-connector-service/src/main/resources/mysql.properties
@@ -0,0 +1,21 @@
+# configs for mysql connector
+connector.class=io.debezium.connector.mysql.MySqlConnector
+offset.storage=com.risingwave.connector.cdc.debezium.internal.ConfigurableOffsetBackingStore
+database.history=io.debezium.relational.history.MemoryDatabaseHistory
+# default snapshot mode to initial
+snapshot.mode=${debezium.snapshot.mode:-initial}
+
+database.hostname=${hostname}
+database.port=${port}
+database.user=${username}
+database.password=${password}
+
+database.include.list=${database.name}
+table.include.list=${database.name}.${table.name}
+
+# default to disable schema change events
+include.schema.changes=${debezium.include.schema.changes:-false}
+database.server.id=${server.id}
+database.server.name=RW_CDC_${database.name}.${table.name}
+
+name=${hostname}:${port}:${database.name}.${table.name}
diff --git a/java/connector-node/risingwave-connector-service/src/main/resources/postgres.properties b/java/connector-node/risingwave-connector-service/src/main/resources/postgres.properties
new file mode 100644
index 0000000000000..05e10d44f0eb9
--- /dev/null
+++ b/java/connector-node/risingwave-connector-service/src/main/resources/postgres.properties
@@ -0,0 +1,30 @@
+# configs for postgres conneoctor
+connector.class=io.debezium.connector.postgresql.PostgresConnector
+offset.storage=com.risingwave.connector.cdc.debezium.internal.ConfigurableOffsetBackingStore
+database.history=io.debezium.relational.history.MemoryDatabaseHistory
+# default snapshot mode to initial
+snapshot.mode=${debezium.snapshot.mode:-initial}
+
+database.hostname=${hostname}
+database.port=${port}
+database.user=${username}
+database.password=${password}
+
+database.dbname=${database.name}
+table.include.list=${schema.name}.${table.name}
+
+# The name of the PostgreSQL replication slot
+slot.name=${slot.name}
+
+# default plugin name is 'pgoutput'
+plugin.name=${debezium.plugin.name:-pgoutput}
+
+# allow to auto create publication for given tables
+publication.autocreate.mode=${debezium.publication.autocreate.mode:-filtered}
+
+# default heartbeat interval 5 mins
+heartbeat.interval.ms=${debezium.heartbeat.interval.ms:-300000}
+heartbeat.topics.prefix=${debezium.heartbeat.topics.prefix:-RW_CDC_HeartBeat_}
+
+database.server.name=RW_CDC_${database.name}.${table.name}
+name=${hostname}:${port}:${database.name}.${schema.name}.${table.name}
diff --git a/java/connector-node/risingwave-connector-service/src/main/resources/validate_sql.properties b/java/connector-node/risingwave-connector-service/src/main/resources/validate_sql.properties
index 0f84c4401baa9..bff8753a85d06 100644
--- a/java/connector-node/risingwave-connector-service/src/main/resources/validate_sql.properties
+++ b/java/connector-node/risingwave-connector-service/src/main/resources/validate_sql.properties
@@ -8,3 +8,28 @@ postgres.table=SELECT EXISTS ( SELECT FROM pg_tables WHERE schemaname = ? AND ta
 postgres.pk=SELECT a.attname, format_type(a.atttypid, a.atttypmod) AS data_type FROM pg_index i JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey) WHERE i.indrelid = ?::regclass AND i.indisprimary
 postgres.table_schema=SELECT column_name, data_type FROM information_schema.columns WHERE table_schema = ? AND table_name = ? ORDER BY ordinal_position
 postgres.slot.check=SELECT slot_name FROM pg_replication_slots WHERE slot_name = ?
+postgres.role.check=SELECT rolreplication OR rolsuper FROM pg_roles WHERE rolname = ?
+postgres.database_privilege.check=SELECT has_database_privilege(?, ?, 'create') FROM pg_roles WHERE rolname = ?
+postgres.table_privilege.check=SELECT (COUNT(*) = 1) FROM information_schema.role_table_grants WHERE table_name = ? AND grantee = ? and privilege_type = 'SELECT'
+postgres.table_owner=SELECT tableowner FROM pg_tables WHERE schemaname = ? and tablename = ?
+postgres.publication_att_exists=SELECT count(*) > 0 FROM information_schema.columns WHERE table_name = 'pg_publication_tables' AND column_name = 'attnames'
+postgres.publication_att=SELECT attnames FROM pg_publication_tables WHERE schemaname = ? AND tablename = ? AND pubname = 'dbz_publication'
+postgres.publication_cnt=SELECT COUNT(*) AS count FROM pg_publication_tables WHERE schemaname = ? AND tablename = ? AND pubname = 'dbz_publication'
+postgres.users_of_group=WITH RECURSIVE base (g, m) AS (( \
+SELECT r1.rolname as group, ARRAY_AGG(DISTINCT(r2.rolname)) as members FROM pg_auth_members am \
+INNER JOIN pg_roles r1 ON r1.oid = am.roleid \
+INNER JOIN pg_roles r2 ON r2.oid = am.member \
+WHERE r1.rolname = ? \
+GROUP BY r1.rolname \
+) \
+UNION ALL ( \
+WITH groups AS (SELECT DISTINCT(UNNEST(m)) AS g FROM base) \
+SELECT r1.rolname as group, ARRAY_AGG(DISTINCT(r2.rolname)) as members FROM pg_auth_members am \
+INNER JOIN pg_roles r1 ON r1.oid = am.roleid \
+INNER JOIN pg_roles r2 ON r2.oid = am.member \
+INNER JOIN groups ON r1.rolname = groups.g \
+GROUP BY r1.rolname \
+) \
+), \
+tmp AS (SELECT DISTINCT(UNNEST(m)) AS members FROM base) \
+SELECT ARRAY_AGG(members) AS members FROM tmp
diff --git a/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/IcebergSinkFactory.java b/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/IcebergSinkFactory.java
index 424f7e415d58f..1cdb1edf0e468 100644
--- a/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/IcebergSinkFactory.java
+++ b/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/IcebergSinkFactory.java
@@ -39,7 +39,7 @@ public class IcebergSinkFactory implements SinkFactory {
 
     private static final Logger LOG = LoggerFactory.getLogger(IcebergSinkFactory.class);
 
-    public static final String SINK_MODE_PROP = "sink.mode";
+    public static final String SINK_TYPE_PROP = "type";
     public static final String WAREHOUSE_PATH_PROP = "warehouse.path";
     public static final String DATABASE_NAME_PROP = "database.name";
     public static final String TABLE_NAME_PROP = "table.name";
@@ -58,7 +58,7 @@ public class IcebergSinkFactory implements SinkFactory {
 
     @Override
     public SinkBase create(TableSchema tableSchema, Map<String, String> tableProperties) {
-        String mode = tableProperties.get(SINK_MODE_PROP);
+        String mode = tableProperties.get(SINK_TYPE_PROP);
         String warehousePath = getWarehousePath(tableProperties);
         String databaseName = tableProperties.get(DATABASE_NAME_PROP);
         String tableName = tableProperties.get(TABLE_NAME_PROP);
@@ -93,7 +93,7 @@ public SinkBase create(TableSchema tableSchema, Map<String, String> tablePropert
     @Override
     public void validate(
             TableSchema tableSchema, Map<String, String> tableProperties, SinkType sinkType) {
-        if (!tableProperties.containsKey(SINK_MODE_PROP) // only append-only, upsert
+        if (!tableProperties.containsKey(SINK_TYPE_PROP) // only append-only, upsert
                 || !tableProperties.containsKey(WAREHOUSE_PATH_PROP)
                 || !tableProperties.containsKey(DATABASE_NAME_PROP)
                 || !tableProperties.containsKey(TABLE_NAME_PROP)) {
@@ -101,14 +101,14 @@ public void validate(
                     .withDescription(
                             String.format(
                                     "%s, %s, %s or %s is not specified",
-                                    SINK_MODE_PROP,
+                                    SINK_TYPE_PROP,
                                     WAREHOUSE_PATH_PROP,
                                     DATABASE_NAME_PROP,
                                     TABLE_NAME_PROP))
                     .asRuntimeException();
         }
 
-        String mode = tableProperties.get(SINK_MODE_PROP);
+        String mode = tableProperties.get(SINK_TYPE_PROP);
         String databaseName = tableProperties.get(DATABASE_NAME_PROP);
         String tableName = tableProperties.get(TABLE_NAME_PROP);
         String warehousePath = getWarehousePath(tableProperties);
diff --git a/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/SinkRowMap.java b/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/SinkRowMap.java
index 7bad8abea65ef..a817e715a45d3 100644
--- a/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/SinkRowMap.java
+++ b/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/SinkRowMap.java
@@ -19,6 +19,7 @@
 import io.grpc.Status;
 import java.util.List;
 import java.util.TreeMap;
+import org.apache.iceberg.data.Record;
 
 public class SinkRowMap {
     TreeMap<List<Comparable<Object>>, SinkRowOp> map = new TreeMap<>(new PkComparator());
@@ -27,7 +28,7 @@ public void clear() {
         map.clear();
     }
 
-    public void insert(List<Comparable<Object>> key, SinkRow row) {
+    public void insert(List<Comparable<Object>> key, Record row) {
         if (!map.containsKey(key)) {
             map.put(key, SinkRowOp.insertOp(row));
         } else {
@@ -42,19 +43,20 @@ public void insert(List<Comparable<Object>> key, SinkRow row) {
         }
     }
 
-    public void delete(List<Comparable<Object>> key, SinkRow row) {
+    public void delete(List<Comparable<Object>> key, Record row) {
         if (!map.containsKey(key)) {
             map.put(key, SinkRowOp.deleteOp(row));
         } else {
             SinkRowOp sinkRowOp = map.get(key);
-            SinkRow insert = sinkRowOp.getInsert();
+            Record insert = sinkRowOp.getInsert();
             if (insert == null) {
                 throw Status.FAILED_PRECONDITION
                         .withDescription("try to double delete a primary key")
                         .asRuntimeException();
             }
-            assertRowValuesEqual(insert, row);
-            SinkRow delete = sinkRowOp.getDelete();
+            // TODO: may enable it again
+            //            assertRowValuesEqual(insert, row);
+            Record delete = sinkRowOp.getDelete();
             if (delete != null) {
                 map.put(key, SinkRowOp.deleteOp(delete));
             } else {
diff --git a/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/SinkRowOp.java b/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/SinkRowOp.java
index 1ac28644a75b2..67b42b078914a 100644
--- a/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/SinkRowOp.java
+++ b/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/SinkRowOp.java
@@ -14,14 +14,14 @@
 
 package com.risingwave.connector;
 
-import com.risingwave.connector.api.sink.SinkRow;
 import io.grpc.Status;
+import org.apache.iceberg.data.Record;
 
 public class SinkRowOp {
-    private final SinkRow delete;
-    private final SinkRow insert;
+    private final Record delete;
+    private final Record insert;
 
-    public static SinkRowOp insertOp(SinkRow row) {
+    public static SinkRowOp insertOp(Record row) {
         if (row == null) {
             throw Status.FAILED_PRECONDITION
                     .withDescription("row op must not be null to initialize insertOp")
@@ -30,7 +30,7 @@ public static SinkRowOp insertOp(SinkRow row) {
         return new SinkRowOp(null, row);
     }
 
-    public static SinkRowOp deleteOp(SinkRow row) {
+    public static SinkRowOp deleteOp(Record row) {
         if (row == null) {
             throw Status.FAILED_PRECONDITION
                     .withDescription("row op must not be null to initialize deleteOp")
@@ -39,7 +39,7 @@ public static SinkRowOp deleteOp(SinkRow row) {
         return new SinkRowOp(row, null);
     }
 
-    public static SinkRowOp updateOp(SinkRow delete, SinkRow insert) {
+    public static SinkRowOp updateOp(Record delete, Record insert) {
         if (delete == null || insert == null) {
             throw Status.FAILED_PRECONDITION
                     .withDescription("row ops must not be null initialize updateOp")
@@ -48,7 +48,7 @@ public static SinkRowOp updateOp(SinkRow delete, SinkRow insert) {
         return new SinkRowOp(delete, insert);
     }
 
-    private SinkRowOp(SinkRow delete, SinkRow insert) {
+    private SinkRowOp(Record delete, Record insert) {
         this.delete = delete;
         this.insert = insert;
     }
@@ -57,11 +57,11 @@ public boolean isDelete() {
         return insert == null && delete != null;
     }
 
-    public SinkRow getDelete() {
+    public Record getDelete() {
         return delete;
     }
 
-    public SinkRow getInsert() {
+    public Record getInsert() {
         return insert;
     }
 }
diff --git a/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/UpsertIcebergSink.java b/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/UpsertIcebergSink.java
index a0522602a4c32..8c26f7b3659e2 100644
--- a/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/UpsertIcebergSink.java
+++ b/java/connector-node/risingwave-sink-iceberg/src/main/java/com/risingwave/connector/UpsertIcebergSink.java
@@ -75,7 +75,7 @@ public UpsertIcebergSink(
                         .collect(Collectors.toList());
     }
 
-    private Record newRecord(Schema schema, SinkRow row) {
+    private static Record newRecord(Schema schema, SinkRow row) {
         Record record = GenericRecord.create(schema);
         for (int i = 0; i < schema.columns().size(); i++) {
             record.set(i, row.get(i));
@@ -174,10 +174,10 @@ public void write(Iterator<SinkRow> rows) {
                 }
                 switch (row.getOp()) {
                     case INSERT:
-                        sinkRowMap.insert(getKeyFromRow(row), row);
+                        sinkRowMap.insert(getKeyFromRow(row), newRecord(rowSchema, row));
                         break;
                     case DELETE:
-                        sinkRowMap.delete(getKeyFromRow(row), row);
+                        sinkRowMap.delete(getKeyFromRow(row), newRecord(deleteRowSchema, row));
                         break;
                     case UPDATE_DELETE:
                         if (updateBufferExists) {
@@ -186,7 +186,7 @@ public void write(Iterator<SinkRow> rows) {
                                             "an UPDATE_INSERT should precede an UPDATE_DELETE")
                                     .asRuntimeException();
                         }
-                        sinkRowMap.delete(getKeyFromRow(row), row);
+                        sinkRowMap.delete(getKeyFromRow(row), newRecord(deleteRowSchema, row));
                         updateBufferExists = true;
                         break;
                     case UPDATE_INSERT:
@@ -196,7 +196,7 @@ public void write(Iterator<SinkRow> rows) {
                                             "an UPDATE_INSERT should precede an UPDATE_DELETE")
                                     .asRuntimeException();
                         }
-                        sinkRowMap.insert(getKeyFromRow(row), row);
+                        sinkRowMap.insert(getKeyFromRow(row), newRecord(rowSchema, row));
                         updateBufferExists = false;
                         break;
                     default:
@@ -217,13 +217,13 @@ public void sync() {
                     newEqualityDeleteWriter(entry.getKey());
             DataWriter<Record> dataWriter = newDataWriter(entry.getKey());
             for (SinkRowOp sinkRowOp : entry.getValue().map.values()) {
-                SinkRow insert = sinkRowOp.getInsert();
-                SinkRow delete = sinkRowOp.getDelete();
+                Record insert = sinkRowOp.getInsert();
+                Record delete = sinkRowOp.getDelete();
                 if (insert != null) {
-                    dataWriter.write(newRecord(rowSchema, insert));
+                    dataWriter.write(insert);
                 }
                 if (delete != null) {
-                    equalityDeleteWriter.write(newRecord(deleteRowSchema, delete));
+                    equalityDeleteWriter.write(delete);
                 }
             }
             try {
diff --git a/java/connector-node/risingwave-sink-iceberg/src/test/java/com/risingwave/connector/IcebergSinkFactoryTest.java b/java/connector-node/risingwave-sink-iceberg/src/test/java/com/risingwave/connector/IcebergSinkFactoryTest.java
index 6ff0ce99e38a8..832ac2746f973 100644
--- a/java/connector-node/risingwave-sink-iceberg/src/test/java/com/risingwave/connector/IcebergSinkFactoryTest.java
+++ b/java/connector-node/risingwave-sink-iceberg/src/test/java/com/risingwave/connector/IcebergSinkFactoryTest.java
@@ -64,7 +64,7 @@ public void testCreate() throws IOException {
                         sinkFactory.create(
                                 TableSchema.getMockTableSchema(),
                                 Map.of(
-                                        IcebergSinkFactory.SINK_MODE_PROP,
+                                        IcebergSinkFactory.SINK_TYPE_PROP,
                                         sinkMode,
                                         IcebergSinkFactory.WAREHOUSE_PATH_PROP,
                                         warehousePath,
diff --git a/java/connector-node/risingwave-sink-iceberg/src/test/java/com/risingwave/connector/SinkRowMapTest.java b/java/connector-node/risingwave-sink-iceberg/src/test/java/com/risingwave/connector/SinkRowMapTest.java
index f4cdd8d988c71..c5048aca40762 100644
--- a/java/connector-node/risingwave-sink-iceberg/src/test/java/com/risingwave/connector/SinkRowMapTest.java
+++ b/java/connector-node/risingwave-sink-iceberg/src/test/java/com/risingwave/connector/SinkRowMapTest.java
@@ -21,6 +21,10 @@
 import com.risingwave.proto.Data;
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.data.GenericRecord;
+import org.apache.iceberg.data.Record;
+import org.apache.iceberg.types.Types;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -31,29 +35,42 @@ public void testInsert() {
         SinkRow row = new ArraySinkRow(Data.Op.OP_UNSPECIFIED, 1);
         List<Comparable<Object>> key = new ArrayList<>();
         key.add((Comparable<Object>) row.get(0));
+        Schema schema = new Schema(Types.NestedField.optional(0, "id", Types.IntegerType.get()));
+        Record r = GenericRecord.create(schema);
+        r.set(0, row.get(0));
 
-        sinkRowMap.insert(key, row);
+        sinkRowMap.insert(key, r);
         assertEquals(1, sinkRowMap.map.size());
         assertEquals(null, sinkRowMap.map.get(key).getDelete());
-        assertEquals(row, sinkRowMap.map.get(key).getInsert());
+        assertEquals(r, sinkRowMap.map.get(key).getInsert());
     }
 
     @Test
     public void testInsertAfterDelete() {
         SinkRowMap sinkRowMap = new SinkRowMap();
+        Schema schema =
+                new Schema(
+                        Types.NestedField.optional(0, "id", Types.IntegerType.get()),
+                        Types.NestedField.optional(1, "name", Types.StringType.get()));
 
         SinkRow row1 = new ArraySinkRow(Data.Op.OP_UNSPECIFIED, 1, "Alice");
         List<Comparable<Object>> key1 = new ArrayList<>();
         key1.add((Comparable<Object>) row1.get(0));
+        Record r1 = GenericRecord.create(schema);
+        r1.set(0, row1.get(0));
+        r1.set(1, row1.get(1));
         SinkRow row2 = new ArraySinkRow(Data.Op.OP_UNSPECIFIED, 1, "Bob");
         List<Comparable<Object>> key2 = new ArrayList<>();
         key2.add((Comparable<Object>) row2.get(0));
+        Record r2 = GenericRecord.create(schema);
+        r2.set(0, row2.get(0));
+        r2.set(1, row2.get(1));
 
-        sinkRowMap.delete(key1, row1);
-        sinkRowMap.insert(key1, row2);
+        sinkRowMap.delete(key1, r1);
+        sinkRowMap.insert(key1, r2);
         assertEquals(1, sinkRowMap.map.size());
-        assertEquals(row1, sinkRowMap.map.get(key1).getDelete());
-        assertEquals(row2, sinkRowMap.map.get(key1).getInsert());
+        assertEquals(r1, sinkRowMap.map.get(key1).getDelete());
+        assertEquals(r2, sinkRowMap.map.get(key1).getInsert());
     }
 
     @Test
@@ -62,11 +79,14 @@ public void testInsertAfterInsert() {
         SinkRow row = new ArraySinkRow(Data.Op.OP_UNSPECIFIED, 1);
         List<Comparable<Object>> key = new ArrayList<>();
         key.add((Comparable<Object>) row.get(0));
+        Schema schema = new Schema(Types.NestedField.optional(0, "id", Types.IntegerType.get()));
+        Record r = GenericRecord.create(schema);
+        r.set(0, row.get(0));
 
-        sinkRowMap.insert(key, row);
+        sinkRowMap.insert(key, r);
         boolean exceptionThrown = false;
         try {
-            sinkRowMap.insert(key, row);
+            sinkRowMap.insert(key, r);
         } catch (RuntimeException e) {
             exceptionThrown = true;
             Assert.assertTrue(
@@ -87,10 +107,14 @@ public void testDelete() {
         List<Comparable<Object>> key = new ArrayList<>();
         key.add((Comparable<Object>) row.get(0));
 
-        sinkRowMap.delete(key, row);
+        Schema schema = new Schema(Types.NestedField.optional(0, "id", Types.IntegerType.get()));
+        Record r = GenericRecord.create(schema);
+        r.set(0, row.get(0));
+
+        sinkRowMap.delete(key, r);
         assertEquals(1, sinkRowMap.map.size());
         assertEquals(null, sinkRowMap.map.get(key).getInsert());
-        assertEquals(row, sinkRowMap.map.get(key).getDelete());
+        assertEquals(r, sinkRowMap.map.get(key).getDelete());
     }
 
     @Test
@@ -100,10 +124,14 @@ public void testDeleteAfterDelete() {
         List<Comparable<Object>> key = new ArrayList<>();
         key.add((Comparable<Object>) row.get(0));
 
-        sinkRowMap.delete(key, row);
+        Schema schema = new Schema(Types.NestedField.optional(0, "id", Types.IntegerType.get()));
+        Record r = GenericRecord.create(schema);
+        r.set(0, row.get(0));
+
+        sinkRowMap.delete(key, r);
         boolean exceptionThrown = false;
         try {
-            sinkRowMap.delete(key, row);
+            sinkRowMap.delete(key, r);
         } catch (RuntimeException e) {
             exceptionThrown = true;
             Assert.assertTrue(
@@ -122,8 +150,12 @@ public void testDeleteAfterInsert() {
         List<Comparable<Object>> key = new ArrayList<>();
         key.add((Comparable<Object>) row.get(0));
 
-        sinkRowMap.insert(key, row);
-        sinkRowMap.delete(key, row);
+        Schema schema = new Schema(Types.NestedField.optional(0, "id", Types.IntegerType.get()));
+        Record r = GenericRecord.create(schema);
+        r.set(0, row.get(0));
+
+        sinkRowMap.insert(key, r);
+        sinkRowMap.delete(key, r);
         assertEquals(0, sinkRowMap.map.size());
     }
 
@@ -131,19 +163,31 @@ public void testDeleteAfterInsert() {
     public void testDeleteAfterUpdate() {
         SinkRowMap sinkRowMap = new SinkRowMap();
 
+        Schema schema =
+                new Schema(
+                        Types.NestedField.optional(0, "id", Types.IntegerType.get()),
+                        Types.NestedField.optional(1, "name", Types.StringType.get()));
+
         SinkRow row1 = new ArraySinkRow(Data.Op.OP_UNSPECIFIED, 1, "Alice");
         List<Comparable<Object>> key1 = new ArrayList<>();
         key1.add((Comparable<Object>) row1.get(0));
+        Record r1 = GenericRecord.create(schema);
+        r1.set(0, row1.get(0));
+        r1.set(1, row1.get(1));
+
         SinkRow row2 = new ArraySinkRow(Data.Op.OP_UNSPECIFIED, 1, "Clare");
         List<Comparable<Object>> key2 = new ArrayList<>();
         key2.add((Comparable<Object>) row2.get(0));
+        Record r2 = GenericRecord.create(schema);
+        r2.set(0, row2.get(0));
+        r2.set(1, row2.get(1));
 
-        sinkRowMap.delete(key1, row1);
-        sinkRowMap.insert(key2, row2);
-        sinkRowMap.delete(key2, row2);
+        sinkRowMap.delete(key1, r1);
+        sinkRowMap.insert(key2, r2);
+        sinkRowMap.delete(key2, r2);
         assertEquals(1, sinkRowMap.map.size());
         assertEquals(null, sinkRowMap.map.get(key1).getInsert());
-        assertEquals(row1, sinkRowMap.map.get(key1).getDelete());
+        assertEquals(r1, sinkRowMap.map.get(key1).getDelete());
     }
 
     @Test
@@ -153,7 +197,10 @@ public void testClear() {
         SinkRow row = new ArraySinkRow(Data.Op.OP_UNSPECIFIED, 1);
         List<Comparable<Object>> key = new ArrayList<>();
         key.add((Comparable<Object>) row.get(0));
-        sinkRowMap.insert(key, row);
+        Schema schema = new Schema(Types.NestedField.optional(0, "id", Types.IntegerType.get()));
+        Record r = GenericRecord.create(schema);
+        r.set(0, row.get(0));
+        sinkRowMap.insert(key, r);
 
         sinkRowMap.clear();
         assertEquals(0, sinkRowMap.map.size());
diff --git a/java/connector-node/risingwave-sink-jdbc/src/main/java/com/risingwave/connector/JDBCSinkFactory.java b/java/connector-node/risingwave-sink-jdbc/src/main/java/com/risingwave/connector/JDBCSinkFactory.java
index 2f3c6d420087d..8e03db0032432 100644
--- a/java/connector-node/risingwave-sink-jdbc/src/main/java/com/risingwave/connector/JDBCSinkFactory.java
+++ b/java/connector-node/risingwave-sink-jdbc/src/main/java/com/risingwave/connector/JDBCSinkFactory.java
@@ -56,12 +56,18 @@ public void validate(
         String tableName = tableProperties.get(TABLE_NAME_PROP);
         Set<String> jdbcColumns = new HashSet<>();
         Set<String> jdbcPk = new HashSet<>();
+        Set<String> jdbcTableNames = new HashSet<>();
 
         try (Connection conn = DriverManager.getConnection(jdbcUrl);
+                ResultSet tableNamesResultSet =
+                        conn.getMetaData().getTables(null, null, "%", null);
                 ResultSet columnResultSet =
                         conn.getMetaData().getColumns(null, null, tableName, null);
                 ResultSet pkResultSet =
                         conn.getMetaData().getPrimaryKeys(null, null, tableName); ) {
+            while (tableNamesResultSet.next()) {
+                jdbcTableNames.add(tableNamesResultSet.getString("TABLE_NAME"));
+            }
             while (columnResultSet.next()) {
                 jdbcColumns.add(columnResultSet.getString("COLUMN_NAME"));
             }
@@ -69,7 +75,15 @@ public void validate(
                 jdbcPk.add(pkResultSet.getString("COLUMN_NAME"));
             }
         } catch (SQLException e) {
-            throw Status.INTERNAL.withCause(e).asRuntimeException();
+            throw Status.INVALID_ARGUMENT
+                    .withDescription("failed to connect to target database: " + e.getSQLState())
+                    .asRuntimeException();
+        }
+
+        if (!jdbcTableNames.contains(tableName)) {
+            throw Status.INVALID_ARGUMENT
+                    .withDescription("table not found: " + tableName)
+                    .asRuntimeException();
         }
 
         // Check that all columns in tableSchema exist in the JDBC table.
diff --git a/java/connector-node/risingwave-source-test/pom.xml b/java/connector-node/risingwave-source-test/pom.xml
index 6da046213366b..8959ebb39467a 100644
--- a/java/connector-node/risingwave-source-test/pom.xml
+++ b/java/connector-node/risingwave-source-test/pom.xml
@@ -17,6 +17,18 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/java/connector-node/risingwave-source-test/src/test/java/com/risingwave/connector/PostgresSourceTest.java b/java/connector-node/risingwave-source-test/src/test/java/com/risingwave/connector/PostgresSourceTest.java
index fe0b35a15b048..e1ed443c67fc6 100644
--- a/java/connector-node/risingwave-source-test/src/test/java/com/risingwave/connector/PostgresSourceTest.java
+++ b/java/connector-node/risingwave-source-test/src/test/java/com/risingwave/connector/PostgresSourceTest.java
@@ -17,12 +17,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 
 import com.risingwave.proto.ConnectorServiceProto;
-import io.grpc.Grpc;
-import io.grpc.InsecureChannelCredentials;
-import io.grpc.Server;
-import io.grpc.ServerBuilder;
+import com.risingwave.proto.Data;
+import io.grpc.*;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -41,7 +40,7 @@ public class PostgresSourceTest {
     private static final Logger LOG = LoggerFactory.getLogger(PostgresSourceTest.class.getName());
 
     private static final PostgreSQLContainer<?> pg =
-            new PostgreSQLContainer<>("postgres:12.3-alpine")
+            new PostgreSQLContainer<>("postgres:15-alpine")
                     .withDatabaseName("test")
                     .withUsername("postgres")
                     .withCommand("postgres -c wal_level=logical -c max_wal_senders=10");
@@ -145,6 +144,69 @@ public void testLines() throws InterruptedException, SQLException {
         connection.close();
     }
 
+    // test whether validation catches permission errors
+    @Test
+    public void testPermissionCheck() {
+        Connection connection = SourceTestClient.connect(pgDataSource);
+        String query =
+                "CREATE TABLE IF NOT EXISTS orders (o_key BIGINT NOT NULL, o_val INT, PRIMARY KEY (o_key))";
+        SourceTestClient.performQuery(connection, query);
+        // create a partial publication, check whether error is reported
+        query = "CREATE PUBLICATION dbz_publication FOR TABLE orders (o_key)";
+        SourceTestClient.performQuery(connection, query);
+        ConnectorServiceProto.TableSchema tableSchema =
+                ConnectorServiceProto.TableSchema.newBuilder()
+                        .addColumns(
+                                ConnectorServiceProto.TableSchema.Column.newBuilder()
+                                        .setName("o_key")
+                                        .setDataType(Data.DataType.TypeName.INT64)
+                                        .build())
+                        .addColumns(
+                                ConnectorServiceProto.TableSchema.Column.newBuilder()
+                                        .setName("o_val")
+                                        .setDataType(Data.DataType.TypeName.INT32)
+                                        .build())
+                        .addPkIndices(0)
+                        .build();
+        Iterator<ConnectorServiceProto.GetEventStreamResponse> eventStream1 =
+                testClient.getEventStreamValidate(
+                        pg,
+                        ConnectorServiceProto.SourceType.POSTGRES,
+                        tableSchema,
+                        "test",
+                        "orders");
+        StatusRuntimeException exception1 =
+                assertThrows(
+                        StatusRuntimeException.class,
+                        () -> {
+                            eventStream1.hasNext();
+                        });
+        assertEquals(
+                exception1.getMessage(),
+                "INVALID_ARGUMENT: INTERNAL: The publication 'dbz_publication' does not cover all necessary columns in table orders");
+        query = "DROP PUBLICATION dbz_publication";
+        SourceTestClient.performQuery(connection, query);
+        // revoke superuser and replication, check if reports error
+        query = "ALTER USER " + pg.getUsername() + " nosuperuser noreplication";
+        SourceTestClient.performQuery(connection, query);
+        Iterator<ConnectorServiceProto.GetEventStreamResponse> eventStream2 =
+                testClient.getEventStreamValidate(
+                        pg,
+                        ConnectorServiceProto.SourceType.POSTGRES,
+                        tableSchema,
+                        "test",
+                        "orders");
+        StatusRuntimeException exception2 =
+                assertThrows(
+                        StatusRuntimeException.class,
+                        () -> {
+                            eventStream2.hasNext();
+                        });
+        assertEquals(
+                exception2.getMessage(),
+                "INVALID_ARGUMENT: INTERNAL: Postgres user must be superuser or replication role to start walsender.");
+    }
+
     // generates test cases for the risingwave debezium parser
     @Ignore
     @Test
diff --git a/java/connector-node/risingwave-source-test/src/test/java/com/risingwave/connector/SourceTestClient.java b/java/connector-node/risingwave-source-test/src/test/java/com/risingwave/connector/SourceTestClient.java
index ea0a601fbf699..950e847f6d65e 100644
--- a/java/connector-node/risingwave-source-test/src/test/java/com/risingwave/connector/SourceTestClient.java
+++ b/java/connector-node/risingwave-source-test/src/test/java/com/risingwave/connector/SourceTestClient.java
@@ -88,6 +88,40 @@ protected static DataSource getDataSource(JdbcDatabaseContainer<?> container) {
         return new HikariDataSource(hikariConfig);
     }
 
+    protected Iterator<ConnectorServiceProto.GetEventStreamResponse> getEventStreamValidate(
+            JdbcDatabaseContainer<?> container,
+            ConnectorServiceProto.SourceType sourceType,
+            ConnectorServiceProto.TableSchema tableSchema,
+            String databaseName,
+            String tableName) {
+        String port = String.valueOf(URI.create(container.getJdbcUrl().substring(5)).getPort());
+        ConnectorServiceProto.GetEventStreamRequest req =
+                ConnectorServiceProto.GetEventStreamRequest.newBuilder()
+                        .setValidate(
+                                ConnectorServiceProto.GetEventStreamRequest.ValidateProperties
+                                        .newBuilder()
+                                        .setSourceId(0)
+                                        .setSourceType(sourceType)
+                                        .setTableSchema(tableSchema)
+                                        .putProperties("hostname", container.getHost())
+                                        .putProperties("port", port)
+                                        .putProperties("username", container.getUsername())
+                                        .putProperties("password", container.getPassword())
+                                        .putProperties("database.name", databaseName)
+                                        .putProperties("table.name", tableName)
+                                        .putProperties("schema.name", "public") // pg only
+                                        .putProperties("slot.name", "orders") // pg only
+                                        .putProperties("server.id", "1")) // mysql only
+                        .build();
+        Iterator<ConnectorServiceProto.GetEventStreamResponse> responses = null;
+        try {
+            responses = blockingStub.getEventStream(req);
+        } catch (StatusRuntimeException e) {
+            fail("RPC failed: {}", e.getStatus());
+        }
+        return responses;
+    }
+
     protected Iterator<ConnectorServiceProto.GetEventStreamResponse> getEventStreamStart(
             JdbcDatabaseContainer<?> container,
             ConnectorServiceProto.SourceType sourceType,
diff --git a/java/pom.xml b/java/pom.xml
index fe24bacc97bf1..88b87e7ae9efb 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -33,6 +33,8 @@
         <spotless.version>2.27.1</spotless.version>
         <log4j.version>2.20.0</log4j.version>
         <commons.cli.version>1.5.0</commons.cli.version>
+        <commons.io.version>2.11.0</commons.io.version>
+        <commons.text.version>1.10.0</commons.text.version>
         <debezium.version>1.9.7.Final</debezium.version>
         <jackson.version>2.13.5</jackson.version>
         <spark_sql.version>3.3.1</spark_sql.version>
@@ -60,6 +62,16 @@
                 <artifactId>commons-cli</artifactId>
                 <version>${commons.cli.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>${commons.text.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
diff --git a/java/tools/maven/checkstyle.xml b/java/tools/maven/checkstyle.xml
index 33649434a3266..4bd0d510e0fad 100644
--- a/java/tools/maven/checkstyle.xml
+++ b/java/tools/maven/checkstyle.xml
@@ -165,11 +165,6 @@ This file is based on the checkstyle file of Apache Beam.
         <!-- Enforce Java-style array declarations -->
         <module name="ArrayTypeStyle"/>
 
-        <module name="TodoComment">
-            <!-- Checks that disallowed strings are not used in comments.  -->
-            <property name="format" value="(FIXME)|(XXX)|(@author)"/>
-        </module>
-
         <!--
 
         IMPORT CHECKS
diff --git a/proto/batch_plan.proto b/proto/batch_plan.proto
index 3ffdda271d647..21c9f42ee0ade 100644
--- a/proto/batch_plan.proto
+++ b/proto/batch_plan.proto
@@ -184,8 +184,8 @@ message SortMergeJoinNode {
 
 message HopWindowNode {
   uint32 time_col = 1;
-  data.IntervalUnit window_slide = 2;
-  data.IntervalUnit window_size = 3;
+  data.Interval window_slide = 2;
+  data.Interval window_size = 3;
   repeated uint32 output_indices = 4;
   repeated expr.ExprNode window_start_exprs = 5;
   repeated expr.ExprNode window_end_exprs = 6;
diff --git a/proto/catalog.proto b/proto/catalog.proto
index 23c1780434226..0b463427be27d 100644
--- a/proto/catalog.proto
+++ b/proto/catalog.proto
@@ -73,11 +73,12 @@ message Sink {
   uint32 database_id = 3;
   string name = 4;
   repeated plan_common.ColumnCatalog columns = 5;
-  repeated common.ColumnOrder pk = 6;
+  // Primary key derived from the SQL by the frontend.
+  repeated common.ColumnOrder plan_pk = 6;
   repeated uint32 dependent_relations = 7;
   repeated int32 distribution_key = 8;
-  // pk_indices of the corresponding materialize operator's output.
-  repeated int32 stream_key = 9;
+  // User-defined primary key indices for the upsert sink.
+  repeated int32 downstream_pk = 9;
   SinkType sink_type = 10;
   uint32 owner = 11;
   map<string, string> properties = 12;
@@ -182,6 +183,7 @@ message Table {
   // `[0..columns.len()]`.
   repeated int32 value_indices = 20;
   string definition = 21;
+  // Used to control whether handling pk conflict for incoming data.
   HandleConflictBehavior handle_pk_conflict_behavior = 22;
   // Anticipated read prefix pattern (number of fields) for the table, which can be utilized
   // for implementing the table's bloom filter or other storage optimization techniques.
@@ -194,9 +196,10 @@ message Table {
 }
 
 enum HandleConflictBehavior {
-  NO_CHECK_UNSPECIFIED = 0;
+  CONFLICT_BEHAVIOR_UNSPECIFIED = 0;
   OVERWRITE = 1;
   IGNORE = 2;
+  NO_CHECK = 3;
 }
 
 message View {
diff --git a/proto/common.proto b/proto/common.proto
index 546232538b84a..c7787072df08b 100644
--- a/proto/common.proto
+++ b/proto/common.proto
@@ -82,17 +82,15 @@ enum Direction {
   DIRECTION_DESCENDING = 2;
 }
 
-// TODO(rc): enable `NULLS FIRST | LAST`
-// enum NullsAre {
-//   NULLS_ARE_UNSPECIFIED = 0;
-//   NULLS_ARE_SMALLEST = 1;
-//   NULLS_ARE_LARGEST = 2;
-// }
+enum NullsAre {
+  NULLS_ARE_UNSPECIFIED = 0;
+  NULLS_ARE_LARGEST = 1;
+  NULLS_ARE_SMALLEST = 2;
+}
 
 message OrderType {
   Direction direction = 1;
-  // TODO(rc): enable `NULLS FIRST | LAST`
-  // NullsAre nulls_are = 2;
+  NullsAre nulls_are = 2;
 }
 
 // Column index with an order type (ASC or DESC). Used to represent a sort key (`repeated ColumnOrder`).
diff --git a/proto/connector_service.proto b/proto/connector_service.proto
index 6f005a7e5d41b..19c83ad50bdea 100644
--- a/proto/connector_service.proto
+++ b/proto/connector_service.proto
@@ -32,6 +32,7 @@ message SinkConfig {
 enum SinkPayloadFormat {
   FORMAT_UNSPECIFIED = 0;
   JSON = 1;
+  STREAM_CHUNK = 2;
 }
 
 message SinkStreamRequest {
@@ -49,8 +50,13 @@ message SinkStreamRequest {
       repeated RowOp row_ops = 1;
     }
 
+    message StreamChunkPayload {
+      bytes binary_data = 1;
+    }
+
     oneof payload {
       JsonPayload json_payload = 1;
+      StreamChunkPayload stream_chunk_payload = 2;
     }
 
     uint64 batch_id = 3;
diff --git a/proto/data.proto b/proto/data.proto
index e2f58a7b2e20f..4b8510ccc4cb3 100644
--- a/proto/data.proto
+++ b/proto/data.proto
@@ -7,7 +7,7 @@ import "common.proto";
 option java_package = "com.risingwave.proto";
 option optimize_for = SPEED;
 
-message IntervalUnit {
+message Interval {
   int32 months = 1;
   int32 days = 2;
   int64 usecs = 3;
diff --git a/proto/ddl_service.proto b/proto/ddl_service.proto
index 81c8ead1f851c..ab568ee6da27f 100644
--- a/proto/ddl_service.proto
+++ b/proto/ddl_service.proto
@@ -139,6 +139,22 @@ message CreateTableResponse {
   uint64 version = 3;
 }
 
+message AlterRelationNameRequest {
+  oneof relation {
+    uint32 table_id = 1;
+    uint32 view_id = 2;
+    uint32 index_id = 3;
+    uint32 sink_id = 4;
+    uint32 source_id = 5;
+  }
+  string new_name = 20;
+}
+
+message AlterRelationNameResponse {
+  common.Status status = 1;
+  uint64 version = 2;
+}
+
 message CreateFunctionRequest {
   catalog.Function function = 1;
 }
@@ -279,6 +295,7 @@ service DdlService {
   rpc CreateMaterializedView(CreateMaterializedViewRequest) returns (CreateMaterializedViewResponse);
   rpc DropMaterializedView(DropMaterializedViewRequest) returns (DropMaterializedViewResponse);
   rpc CreateTable(CreateTableRequest) returns (CreateTableResponse);
+  rpc AlterRelationName(AlterRelationNameRequest) returns (AlterRelationNameResponse);
   rpc DropTable(DropTableRequest) returns (DropTableResponse);
   rpc RisectlListStateTables(RisectlListStateTablesRequest) returns (RisectlListStateTablesResponse);
   rpc CreateView(CreateViewRequest) returns (CreateViewResponse);
diff --git a/proto/expr.proto b/proto/expr.proto
index cc47f2242a145..11952d18edebc 100644
--- a/proto/expr.proto
+++ b/proto/expr.proto
@@ -95,6 +95,16 @@ message ExprNode {
     REGEXP_MATCH = 232;
     POW = 233;
     EXP = 234;
+    CHR = 235;
+    STARTS_WITH = 236;
+    INITCAP = 237;
+    LPAD = 238;
+    RPAD = 239;
+    REVERSE = 240;
+    STRPOS = 241;
+    TO_ASCII = 242;
+    TO_HEX = 243;
+    QUOTE_IDENT = 244;
 
     // Boolean comparison
     IS_TRUE = 301;
@@ -120,6 +130,7 @@ message ExprNode {
     ARRAY_PREPEND = 533;
     FORMAT_TYPE = 534;
     ARRAY_DISTINCT = 535;
+    ARRAY_LENGTH = 536;
 
     // Jsonb functions
 
diff --git a/proto/hummock.proto b/proto/hummock.proto
index 29c90aedeee22..9b0d8e9df70c0 100644
--- a/proto/hummock.proto
+++ b/proto/hummock.proto
@@ -71,6 +71,13 @@ message GroupMetaChange {
   repeated uint32 table_ids_remove = 2;
 }
 
+message GroupTableChange {
+  repeated uint32 table_ids = 1;
+  uint64 target_group_id = 2;
+  uint64 origin_group_id = 3;
+  uint64 new_sst_start_id = 4;
+}
+
 message GroupDestroy {}
 
 message GroupDelta {
@@ -79,6 +86,7 @@ message GroupDelta {
     GroupConstruct group_construct = 2;
     GroupDestroy group_destroy = 3;
     GroupMetaChange group_meta_change = 4;
+    GroupTableChange group_table_change = 5;
   }
 }
 
@@ -358,18 +366,25 @@ message CompactTaskProgress {
   uint32 num_ssts_uploaded = 3;
 }
 
-message ReportCompactionTaskProgressRequest {
+// The measurement of the workload on a compactor to determine whether it is idle.
+message CompactorWorkload {
+  uint32 cpu = 1;
+}
+
+message CompactorHeartbeatRequest {
   uint32 context_id = 1;
   repeated CompactTaskProgress progress = 2;
+  CompactorWorkload workload = 3;
 }
 
-message ReportCompactionTaskProgressResponse {
+message CompactorHeartbeatResponse {
   common.Status status = 1;
 }
 
 message SubscribeCompactTasksRequest {
   uint32 context_id = 1;
   uint64 max_concurrent_task_number = 2;
+  uint32 cpu_core_num = 3;
 }
 
 message ValidationTask {
@@ -563,7 +578,7 @@ service HummockManagerService {
   rpc TriggerCompactionDeterministic(TriggerCompactionDeterministicRequest) returns (TriggerCompactionDeterministicResponse);
   rpc DisableCommitEpoch(DisableCommitEpochRequest) returns (DisableCommitEpochResponse);
   rpc ReportCompactionTasks(ReportCompactionTasksRequest) returns (ReportCompactionTasksResponse);
-  rpc ReportCompactionTaskProgress(ReportCompactionTaskProgressRequest) returns (ReportCompactionTaskProgressResponse);
+  rpc CompactorHeartbeat(CompactorHeartbeatRequest) returns (CompactorHeartbeatResponse);
   rpc PinSnapshot(PinSnapshotRequest) returns (PinSnapshotResponse);
   rpc PinSpecificSnapshot(PinSpecificSnapshotRequest) returns (PinSnapshotResponse);
   rpc GetEpoch(GetEpochRequest) returns (GetEpochResponse);
@@ -581,6 +596,7 @@ service HummockManagerService {
   rpc RiseCtlUpdateCompactionConfig(RiseCtlUpdateCompactionConfigRequest) returns (RiseCtlUpdateCompactionConfigResponse);
   rpc InitMetadataForReplay(InitMetadataForReplayRequest) returns (InitMetadataForReplayResponse);
   rpc SetCompactorRuntimeConfig(SetCompactorRuntimeConfigRequest) returns (SetCompactorRuntimeConfigResponse);
+  rpc GetScaleCompactor(GetScaleCompactorRequest) returns (GetScaleCompactorResponse);
   rpc PinVersion(PinVersionRequest) returns (PinVersionResponse);
   rpc SplitCompactionGroup(SplitCompactionGroupRequest) returns (SplitCompactionGroupResponse);
 }
@@ -619,6 +635,15 @@ message HummockVersionStats {
   map<uint32, TableStats> table_stats = 2;
 }
 
+message GetScaleCompactorRequest {}
+
+message GetScaleCompactorResponse {
+  uint64 suggest_cores = 1;
+  uint64 running_cores = 2;
+  uint64 total_cores = 3;
+  uint64 waiting_compaction_bytes = 4;
+}
+
 message WriteLimits {
   message WriteLimit {
     repeated uint32 table_ids = 1;
diff --git a/proto/meta.proto b/proto/meta.proto
index c30fd81d83f45..cd9f044d4f988 100644
--- a/proto/meta.proto
+++ b/proto/meta.proto
@@ -13,6 +13,17 @@ import "user.proto";
 option java_package = "com.risingwave.proto";
 option optimize_for = SPEED;
 
+message GetTelemetryInfoRequest {}
+
+message TelemetryInfoResponse {
+  optional string tracking_id = 1;
+}
+
+service TelemetryInfoService {
+  // Request telemetry info from meta node
+  rpc GetTelemetryInfo(GetTelemetryInfoRequest) returns (TelemetryInfoResponse);
+}
+
 message HeartbeatRequest {
   message ExtraInfo {
     oneof info {
@@ -240,6 +251,21 @@ message MetaSnapshot {
   SnapshotVersion version = 13;
 }
 
+message Relation {
+  oneof relation_info {
+    catalog.Table table = 1;
+    catalog.Source source = 2;
+    catalog.Sink sink = 3;
+    catalog.Index index = 4;
+    catalog.View view = 5;
+    catalog.Function function = 6;
+  }
+}
+
+message RelationGroup {
+  repeated Relation relations = 1;
+}
+
 message SubscribeResponse {
   enum Operation {
     UNSPECIFIED = 0;
@@ -254,12 +280,6 @@ message SubscribeResponse {
   oneof info {
     catalog.Database database = 4;
     catalog.Schema schema = 5;
-    catalog.Table table = 6;
-    catalog.Source source = 7;
-    catalog.Sink sink = 8;
-    catalog.Index index = 9;
-    catalog.View view = 10;
-    catalog.Function function = 18;
     user.UserInfo user = 11;
     FragmentParallelUnitMapping parallel_unit_mapping = 12;
     common.WorkerNode node = 13;
@@ -269,6 +289,7 @@ message SubscribeResponse {
     backup_service.MetaBackupManifestId meta_backup_manifest_id = 17;
     SystemParams system_params = 19;
     hummock.WriteLimits hummock_write_limits = 20;
+    RelationGroup relation_group = 21;
   }
 }
 
@@ -344,6 +365,7 @@ message SystemParams {
   optional string data_directory = 7;
   optional string backup_storage_url = 8;
   optional string backup_storage_directory = 9;
+  optional bool telemetry_enabled = 10;
 }
 
 message GetSystemParamsRequest {}
diff --git a/proto/plan_common.proto b/proto/plan_common.proto
index b904703afafbe..98d4db458a487 100644
--- a/proto/plan_common.proto
+++ b/proto/plan_common.proto
@@ -4,6 +4,7 @@ package plan_common;
 
 import "common.proto";
 import "data.proto";
+import "expr.proto";
 
 option java_package = "com.risingwave.proto";
 option optimize_for = SPEED;
@@ -26,6 +27,8 @@ message ColumnDesc {
   // For example, when the type is created from a protobuf schema file,
   // this field will store the message name.
   string type_name = 5;
+  // Optional description for the generated column.
+  GeneratedColumnDesc generated_column = 6;
 }
 
 message ColumnCatalog {
@@ -33,12 +36,16 @@ message ColumnCatalog {
   bool is_hidden = 2;
 }
 
+message GeneratedColumnDesc {
+  expr.ExprNode expr = 1;
+}
+
 message StorageTableDesc {
   uint32 table_id = 1;
   repeated ColumnDesc columns = 2;
   // TODO: may refactor primary key representations
   repeated common.ColumnOrder pk = 3;
-  repeated uint32 dist_key_indices = 4;
+  repeated uint32 dist_key_in_pk_indices = 4;
   uint32 retention_seconds = 5;
   repeated uint32 value_indices = 6;
   uint32 read_prefix_len_hint = 7;
diff --git a/proto/stream_plan.proto b/proto/stream_plan.proto
index 9ecaa4cd2510d..088fd3844ae0d 100644
--- a/proto/stream_plan.proto
+++ b/proto/stream_plan.proto
@@ -18,6 +18,8 @@ message AddMutation {
   }
   // New dispatchers for each actor.
   map<uint32, Dispatchers> actor_dispatchers = 1;
+  // All actors to be added (to the main connected component of the graph) in this update.
+  repeated uint32 added_actors = 3;
   // We may embed a source change split mutation here.
   // TODO: we may allow multiple mutations in a single barrier.
   map<uint32, source.ConnectorSplits> actor_splits = 2;
@@ -146,8 +148,8 @@ message SinkDesc {
   string name = 2;
   string definition = 3;
   repeated plan_common.ColumnDesc columns = 4;
-  repeated common.ColumnOrder pk = 5;
-  repeated uint32 stream_key = 6;
+  repeated common.ColumnOrder plan_pk = 5;
+  repeated uint32 downstream_pk = 6;
   repeated uint32 distribution_key = 7;
   map<string, string> properties = 8;
   catalog.SinkType sink_type = 9;
@@ -178,19 +180,14 @@ message FilterNode {
 // - When creating index, `column_orders` will contain both
 //   arrange columns and pk columns, while distribution key will be arrange columns.
 message MaterializeNode {
+  reserved 4;
+  reserved "handle_pk_conflict_behavior";
+
   uint32 table_id = 1;
   // Column indexes and orders of primary key.
   repeated common.ColumnOrder column_orders = 2;
   // Used for internal table states.
   catalog.Table table = 3;
-  // Used to handle pk conflict, open it when upstream executor is source executor.
-  HandleConflictBehavior handle_pk_conflict_behavior = 4;
-}
-
-enum HandleConflictBehavior {
-  NO_CHECK_UNSPECIFIED = 0;
-  OVERWRITE = 1;
-  IGNORE = 2;
 }
 
 message AggCallState {
@@ -261,11 +258,28 @@ message GroupTopNNode {
   bool with_ties = 6;
 }
 
+message DeltaExpression {
+  expr.ExprNode.Type delta_type = 1;
+  expr.ExprNode delta = 2;
+}
+
+message InequalityPair {
+  // Input index of greater side of inequality.
+  uint32 key_required_larger = 1;
+  // Input index of less side of inequality.
+  uint32 key_required_smaller = 2;
+  // Whether this condition is used to clean state table of `HashJoinExecutor`.
+  bool clean_state = 3;
+  // greater >= less + delta_expression, if `None`, it represents that greater >= less
+  DeltaExpression delta_expression = 4;
+}
+
 message HashJoinNode {
   plan_common.JoinType join_type = 1;
   repeated int32 left_key = 2;
   repeated int32 right_key = 3;
   expr.ExprNode condition = 4;
+  repeated InequalityPair inequality_pairs = 5;
   // Used for internal table states.
   catalog.Table left_table = 6;
   // Used for internal table states.
@@ -343,8 +357,8 @@ message DeltaIndexJoinNode {
 
 message HopWindowNode {
   uint32 time_col = 1;
-  data.IntervalUnit window_slide = 2;
-  data.IntervalUnit window_size = 3;
+  data.Interval window_slide = 2;
+  data.Interval window_size = 3;
   repeated uint32 output_indices = 4;
   repeated expr.ExprNode window_start_exprs = 5;
   repeated expr.ExprNode window_end_exprs = 6;
@@ -429,14 +443,15 @@ message ArrangementInfo {
 // Special node for shared state, which will only be produced in fragmenter. ArrangeNode will
 // produce a special Materialize executor, which materializes data for downstream to query.
 message ArrangeNode {
+  reserved 4;
+  reserved "handle_pk_conflict_behavior";
+
   // Info about the arrangement
   ArrangementInfo table_info = 1;
   // Hash key of the materialize node, which is a subset of pk.
   repeated uint32 distribution_key = 2;
   // Used for internal table states.
   catalog.Table table = 3;
-  // Used to control whether doing sanity check, open it when upstream executor is source executor.
-  HandleConflictBehavior handle_pk_conflict_behavior = 4;
 }
 
 // Special node for shared state. LookupNode will join an arrangement with a stream.
diff --git a/proto/task_service.proto b/proto/task_service.proto
index 0be05132472fa..f6d061cb9a707 100644
--- a/proto/task_service.proto
+++ b/proto/task_service.proto
@@ -26,6 +26,7 @@ message TaskInfoResponse {
     FINISHED = 6;
     FAILED = 7;
     ABORTED = 8;
+    CANCELLED = 9;
   }
   batch_plan.TaskId task_id = 1;
   TaskStatus task_status = 2;
@@ -39,11 +40,11 @@ message CreateTaskRequest {
   common.BatchQueryEpoch epoch = 3;
 }
 
-message AbortTaskRequest {
+message CancelTaskRequest {
   batch_plan.TaskId task_id = 1;
 }
 
-message AbortTaskResponse {
+message CancelTaskResponse {
   common.Status status = 1;
 }
 
@@ -63,8 +64,8 @@ message ExecuteRequest {
 
 service TaskService {
   rpc CreateTask(CreateTaskRequest) returns (stream TaskInfoResponse);
-  // Abort an already-died (self execution-failure, previous aborted, completed) task will still succeed.
-  rpc AbortTask(AbortTaskRequest) returns (AbortTaskResponse);
+  // Cancel an already-died (self execution-failure, previous aborted, completed) task will still succeed.
+  rpc CancelTask(CancelTaskRequest) returns (CancelTaskResponse);
   rpc Execute(ExecuteRequest) returns (stream GetDataResponse);
 }
 
diff --git a/risedev.yml b/risedev.yml
index bc822805d011b..08f70054fe626 100644
--- a/risedev.yml
+++ b/risedev.yml
@@ -133,7 +133,7 @@ profile:
       - use: meta-node
       - use: compute-node
       - use: frontend
-      # If you want to use hdfs as storage backend, configure hdfs namenode and root path:
+      # If you want to use webhdfs as storage backend, configure hdfs namenode and root path:
       - use: opendal
         engine: webhdfs
         namenode: "127.0.0.1:9870"
@@ -148,7 +148,7 @@ profile:
       - use: meta-node
       - use: compute-node
       - use: frontend
-      # If you want to use google cloud stoage as storage backend, configure hdfs namenode and root path:
+      # If you want to use google cloud stoage as storage backend, configure bucket name and root path:
       - use: opendal
         engine: gcs
         bucket: bucket-name
@@ -163,10 +163,25 @@ profile:
       - use: meta-node
       - use: compute-node
       - use: frontend
-      # If you want to use google cloud stoage as storage backend, configure hdfs namenode and root path:
+      # If you want to use oss as storage backend, configure bucket name and root path:
       - use: opendal
         engine: oss
-        bucket: "risingwave-oss-wcy"
+        bucket: test-bucket
+        root: risingwave
+      - use: compactor
+      # - use: prometheus
+      # - use: grafana
+
+  azblob:
+    steps:
+      # - use: etcd
+      - use: meta-node
+      - use: compute-node
+      - use: frontend
+      # If you want to use azblob as storage backend, configure bucket(container) name and root path:
+      - use: opendal
+        engine: azblob
+        bucket: test-bucket
         root: risingwave
       - use: compactor
       # - use: prometheus
@@ -192,6 +207,7 @@ profile:
 
   3etcd-3meta:
     steps:
+      - use: minio
       - use: etcd
         unsafe-no-fsync: true
         port: 2388
@@ -219,9 +235,11 @@ profile:
         port: 25690
         dashboard-port: 25691
         exporter-port: 21250
+      - use: compactor
 
   3etcd-3meta-1cn-1fe:
     steps:
+      - use: minio
       - use: etcd
         unsafe-no-fsync: true
         port: 2388
@@ -249,6 +267,7 @@ profile:
         port: 25690
         dashboard-port: 25691
         exporter-port: 21250
+      - use: compactor
       - use: compute-node
       - use: frontend
 
@@ -474,18 +493,16 @@ profile:
       - use: etcd
         unsafe-no-fsync: true
       - use: meta-node
+        enable-in-memory-kv-state-backend: true
       - use: compute-node
         port: 5687
         exporter-port: 1222
-        enable-in-memory-kv-state-backend: true
       - use: compute-node
         port: 5688
         exporter-port: 1223
-        enable-in-memory-kv-state-backend: true
       - use: compute-node
         port: 5689
         exporter-port: 1224
-        enable-in-memory-kv-state-backend: true
       - use: frontend
         port: 4565
         exporter-port: 2222
@@ -502,8 +519,8 @@ profile:
   ci-3cn-3fe-opendal-fs-backend:
     config-path: src/config/ci.toml
     steps:
-      # - use: etcd
-      #   unsafe-no-fsync: true
+      - use: etcd
+        unsafe-no-fsync: true
       - use: meta-node
       - use: opendal
         engine: fs
@@ -755,18 +772,9 @@ template:
     # Jaeger used by this compute node
     provide-jaeger: "jaeger*"
 
-    # Sanity check: should use shared storage if there're multiple compute nodes
-    provide-compute-node: "compute-node*"
-
-    # Sanity check: should start at lease one compactor if using shared object store
-    provide-compactor: "compactor*"
-
     # If `user-managed` is true, this service will be started by user with the above config
     user-managed: false
 
-    # Whether to enable in-memory pure KV state backend
-    enable-in-memory-kv-state-backend: false
-
     # Total available memory for the compute node in bytes
     total-memory-bytes: 8589934592
 
@@ -811,6 +819,24 @@ template:
     # Prometheus nodes used by dashboard service
     provide-prometheus: "prometheus*"
 
+    # Sanity check: should use shared storage if there're multiple compute nodes
+    provide-compute-node: "compute-node*"
+
+    # Sanity check: should start at lease one compactor if using shared object store
+    provide-compactor: "compactor*"
+
+    # Minio instances used by the cluster
+    provide-minio: "minio*"
+
+    # OpenDAL storage backend used by the cluster
+    provide-opendal: "opendal*"
+
+    # AWS s3 bucket used by the cluster
+    provide-aws-s3: "aws-s3*"
+
+    # Whether to enable in-memory pure KV state backend
+    enable-in-memory-kv-state-backend: false
+
   prometheus:
     # Advertise address of Prometheus
     address: "127.0.0.1"
@@ -854,6 +880,9 @@ template:
     # Frontend used by this Prometheus instance
     provide-frontend: "frontend*"
 
+    # Connector-node used by this Prometheus instance
+    provide-connector-node: "connector*"
+
   frontend:
     # Advertise address of frontend
     address: "127.0.0.1"
@@ -895,14 +924,9 @@ template:
     # Id of this instance
     id: compactor-${port}
 
-    # Minio instances used by this compute node
+    # Minio instances used by this compactor
     provide-minio: "minio*"
 
-    # AWS s3 bucket used by this compute node
-    provide-opendal: "opendal*"
-    # AWS s3 bucket used by this compute node
-    provide-aws-s3: "aws-s3*"
-
     # Meta-nodes used by this compute node
     provide-meta-node: "meta-node*"
 
@@ -919,6 +943,9 @@ template:
     # Connector node listen port
     port: 50051
 
+    # Prometheus exporter listen port
+    exporter-port: 50052
+
     # Id of this instance
     id: connector-${port}
 
@@ -957,7 +984,7 @@ template:
 
     engine: hdfs
 
-    namenode: 127.0.0.1:9000"
+    namenode: 127.0.0.1:9000
 
     bucket: risingwave-test
 
diff --git a/src/batch/Cargo.toml b/src/batch/Cargo.toml
index ca3202bfe29b9..a53866cfde301 100644
--- a/src/batch/Cargo.toml
+++ b/src/batch/Cargo.toml
@@ -62,7 +62,7 @@ criterion = { version = "0.4", features = ["async_tokio", "async"] }
 rand = "0.8"
 tempfile = "3"
 
-[target.'cfg(target_os = "linux")'.dev-dependencies]
+[target.'cfg(unix)'.dev-dependencies]
 tikv-jemallocator = "0.5"
 
 [[bench]]
diff --git a/src/batch/benches/expand.rs b/src/batch/benches/expand.rs
index 9096c86d9ab0e..7c94cd6e176df 100644
--- a/src/batch/benches/expand.rs
+++ b/src/batch/benches/expand.rs
@@ -15,12 +15,12 @@ pub mod utils;
 
 use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
 use risingwave_batch::executor::{BoxedExecutor, ExpandExecutor};
-use risingwave_common::enable_jemalloc_on_linux;
+use risingwave_common::enable_jemalloc_on_unix;
 use risingwave_common::types::DataType;
 use tokio::runtime::Runtime;
 use utils::{create_input, execute_executor};
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 fn create_expand_executor(
     column_subsets: Vec<Vec<usize>>,
diff --git a/src/batch/benches/filter.rs b/src/batch/benches/filter.rs
index 8cc78dcfbe414..95318dfcf20fd 100644
--- a/src/batch/benches/filter.rs
+++ b/src/batch/benches/filter.rs
@@ -16,86 +16,19 @@ pub mod utils;
 
 use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
 use risingwave_batch::executor::{BoxedExecutor, FilterExecutor};
-use risingwave_common::enable_jemalloc_on_linux;
-use risingwave_common::types::{DataType, ScalarImpl};
-use risingwave_common::util::value_encoding::serialize_datum;
-use risingwave_expr::expr::build_from_prost;
-use risingwave_pb::data::data_type::TypeName;
-use risingwave_pb::data::Datum as ProstDatum;
-use risingwave_pb::expr::expr_node::RexNode;
-use risingwave_pb::expr::expr_node::Type::{
-    ConstantValue as TConstValue, Equal, InputRef, Modulus,
-};
-use risingwave_pb::expr::{ExprNode, FunctionCall};
+use risingwave_common::enable_jemalloc_on_unix;
+use risingwave_common::types::DataType;
+use risingwave_expr::expr::build_from_pretty;
 use tokio::runtime::Runtime;
 use utils::{create_input, execute_executor};
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 fn create_filter_executor(chunk_size: usize, chunk_num: usize) -> BoxedExecutor {
     const CHUNK_SIZE: usize = 1024;
     let input = create_input(&[DataType::Int64], chunk_size, chunk_num);
-
-    // Expression: $1 % 2 == 0
-    let expr = {
-        let input_ref1 = ExprNode {
-            expr_type: InputRef as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::InputRef(0)),
-        };
-
-        let literal2 = ExprNode {
-            expr_type: TConstValue as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: serialize_datum(Some(ScalarImpl::Int64(2)).as_ref()),
-            })),
-        };
-
-        // $1 % 2
-        let mod2 = ExprNode {
-            expr_type: Modulus as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![input_ref1, literal2],
-            })),
-        };
-
-        let literal0 = ExprNode {
-            expr_type: TConstValue as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: serialize_datum(Some(ScalarImpl::Int64(0)).as_ref()),
-            })),
-        };
-
-        // $1 % 2 == 0
-        ExprNode {
-            expr_type: Equal as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Boolean as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![mod2, literal0],
-            })),
-        }
-    };
-
     Box::new(FilterExecutor::new(
-        build_from_prost(&expr).unwrap(),
+        build_from_pretty("(equal:boolean (modulus:int8 $0:int8 2:int8) 0:int8)"),
         input,
         "FilterBenchmark".to_string(),
         CHUNK_SIZE,
diff --git a/src/batch/benches/hash_agg.rs b/src/batch/benches/hash_agg.rs
index 0e5ec4dd175db..06200ef4700b2 100644
--- a/src/batch/benches/hash_agg.rs
+++ b/src/batch/benches/hash_agg.rs
@@ -18,14 +18,14 @@ use itertools::Itertools;
 use risingwave_batch::executor::{BoxedExecutor, HashAggExecutor};
 use risingwave_common::catalog::{Field, Schema};
 use risingwave_common::types::DataType;
-use risingwave_common::{enable_jemalloc_on_linux, hash};
+use risingwave_common::{enable_jemalloc_on_unix, hash};
 use risingwave_expr::expr::AggKind;
 use risingwave_expr::vector_op::agg::AggStateFactory;
 use risingwave_pb::expr::{AggCall, InputRef};
 use tokio::runtime::Runtime;
 use utils::{create_input, execute_executor};
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 fn create_agg_call(
     input_schema: &Schema,
diff --git a/src/batch/benches/hash_join.rs b/src/batch/benches/hash_join.rs
index fa853bc515dbe..63b6739901720 100644
--- a/src/batch/benches/hash_join.rs
+++ b/src/batch/benches/hash_join.rs
@@ -19,20 +19,12 @@ use risingwave_batch::executor::hash_join::HashJoinExecutor;
 use risingwave_batch::executor::test_utils::{gen_projected_data, MockExecutor};
 use risingwave_batch::executor::{BoxedExecutor, JoinType};
 use risingwave_common::catalog::schema_test_utils::field_n;
-use risingwave_common::types::{DataType, ScalarImpl};
-use risingwave_common::util::value_encoding::serialize_datum;
-use risingwave_common::{enable_jemalloc_on_linux, hash};
-use risingwave_expr::expr::build_from_prost;
-use risingwave_pb::data::data_type::TypeName;
-use risingwave_pb::data::Datum as ProstDatum;
-use risingwave_pb::expr::expr_node::RexNode;
-use risingwave_pb::expr::expr_node::Type::{
-    ConstantValue as TConstValue, GreaterThan, InputRef, Modulus,
-};
-use risingwave_pb::expr::{ExprNode, FunctionCall};
+use risingwave_common::types::DataType;
+use risingwave_common::{enable_jemalloc_on_unix, hash};
+use risingwave_expr::expr::build_from_pretty;
 use utils::bench_join;
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 fn create_hash_join_executor(
     join_type: JoinType,
@@ -43,75 +35,16 @@ fn create_hash_join_executor(
     right_chunk_num: usize,
 ) -> BoxedExecutor {
     const CHUNK_SIZE: usize = 1024;
-    let left_mod123 = {
-        let input_ref = ExprNode {
-            expr_type: InputRef as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::InputRef(0)),
-        };
-        let literal123 = ExprNode {
-            expr_type: TConstValue as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: serialize_datum(Some(ScalarImpl::Int64(123)).as_ref()),
-            })),
-        };
-        ExprNode {
-            expr_type: Modulus as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![input_ref, literal123],
-            })),
-        }
-    };
-    let right_mod456 = {
-        let input_ref = ExprNode {
-            expr_type: InputRef as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::InputRef(0)),
-        };
-        let literal456 = ExprNode {
-            expr_type: TConstValue as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: serialize_datum(Some(ScalarImpl::Int64(456)).as_ref()),
-            })),
-        };
-        ExprNode {
-            expr_type: Modulus as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![input_ref, literal456],
-            })),
-        }
-    };
+
     let left_input = gen_projected_data(
         left_chunk_size,
         left_chunk_num,
-        build_from_prost(&left_mod123).unwrap(),
+        build_from_pretty("(modulus:int8 $0:int8 123:int8)"),
     );
     let right_input = gen_projected_data(
         right_chunk_size,
         right_chunk_num,
-        build_from_prost(&right_mod456).unwrap(),
+        build_from_pretty("(modulus:int8 $0:int8 456:int8)"),
     );
 
     let mut left_child = Box::new(MockExecutor::new(field_n::<1>(DataType::Int64)));
@@ -126,39 +59,7 @@ fn create_hash_join_executor(
         _ => vec![0, 1],
     };
 
-    let cond = if with_cond {
-        let left_input_ref = ExprNode {
-            expr_type: InputRef as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::InputRef(0)),
-        };
-        let literal100 = ExprNode {
-            expr_type: TConstValue as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: serialize_datum(Some(ScalarImpl::Int64(100)).as_ref()),
-            })),
-        };
-        Some(ExprNode {
-            expr_type: GreaterThan as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![left_input_ref, literal100],
-            })),
-        })
-    } else {
-        None
-    }
-    .map(|expr| build_from_prost(&expr).unwrap());
+    let cond = with_cond.then(|| build_from_pretty("(greater_than:int8 $0:int8 100:int8)"));
 
     Box::new(HashJoinExecutor::<hash::Key64>::new(
         join_type,
diff --git a/src/batch/benches/limit.rs b/src/batch/benches/limit.rs
index 90136ce705dda..45d1fc3d17b35 100644
--- a/src/batch/benches/limit.rs
+++ b/src/batch/benches/limit.rs
@@ -16,12 +16,12 @@ pub mod utils;
 
 use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
 use risingwave_batch::executor::{BoxedExecutor, LimitExecutor};
-use risingwave_common::enable_jemalloc_on_linux;
+use risingwave_common::enable_jemalloc_on_unix;
 use risingwave_common::types::DataType;
 use tokio::runtime::Runtime;
 use utils::{create_input, execute_executor};
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 fn create_limit_executor(
     chunk_size: usize,
diff --git a/src/batch/benches/nested_loop_join.rs b/src/batch/benches/nested_loop_join.rs
index b8d39508b2424..27bb638910b15 100644
--- a/src/batch/benches/nested_loop_join.rs
+++ b/src/batch/benches/nested_loop_join.rs
@@ -15,20 +15,12 @@ pub mod utils;
 
 use criterion::{criterion_group, criterion_main, Criterion};
 use risingwave_batch::executor::{BoxedExecutor, JoinType, NestedLoopJoinExecutor};
-use risingwave_common::enable_jemalloc_on_linux;
-use risingwave_common::types::{DataType, ScalarImpl};
-use risingwave_common::util::value_encoding::serialize_datum;
-use risingwave_expr::expr::build_from_prost;
-use risingwave_pb::data::data_type::TypeName;
-use risingwave_pb::data::Datum as ProstDatum;
-use risingwave_pb::expr::expr_node::RexNode;
-use risingwave_pb::expr::expr_node::Type::{
-    ConstantValue as TConstValue, Equal, InputRef, Modulus,
-};
-use risingwave_pb::expr::{ExprNode, FunctionCall};
+use risingwave_common::enable_jemalloc_on_unix;
+use risingwave_common::types::DataType;
+use risingwave_expr::expr::build_from_pretty;
 use utils::{bench_join, create_input};
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 fn create_nested_loop_join_executor(
     join_type: JoinType,
@@ -42,85 +34,6 @@ fn create_nested_loop_join_executor(
     let left_input = create_input(&[DataType::Int64], left_chunk_size, left_chunk_num);
     let right_input = create_input(&[DataType::Int64], right_chunk_size, right_chunk_num);
 
-    // Expression: $1 % 2 == $2 % 3
-    let join_expr = {
-        let left_input_ref = ExprNode {
-            expr_type: InputRef as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::InputRef(0)),
-        };
-
-        let right_input_ref = ExprNode {
-            expr_type: InputRef as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::InputRef(1)),
-        };
-
-        let literal2 = ExprNode {
-            expr_type: TConstValue as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: serialize_datum(Some(ScalarImpl::Int64(2)).as_ref()),
-            })),
-        };
-
-        let literal3 = ExprNode {
-            expr_type: TConstValue as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: serialize_datum(Some(ScalarImpl::Int64(3)).as_ref()),
-            })),
-        };
-
-        // $1 % 2
-        let left_mod2 = ExprNode {
-            expr_type: Modulus as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![left_input_ref, literal2],
-            })),
-        };
-
-        // $2 % 3
-        let right_mod3 = ExprNode {
-            expr_type: Modulus as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![right_input_ref, literal3],
-            })),
-        };
-
-        // $1 % 2 == $2 % 3
-        ExprNode {
-            expr_type: Equal as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Boolean as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![left_mod2, right_mod3],
-            })),
-        }
-    };
-
     let output_indices = match join_type {
         JoinType::LeftSemi | JoinType::LeftAnti => vec![0],
         JoinType::RightSemi | JoinType::RightAnti => vec![0],
@@ -128,7 +41,11 @@ fn create_nested_loop_join_executor(
     };
 
     Box::new(NestedLoopJoinExecutor::new(
-        build_from_prost(&join_expr).unwrap(),
+        build_from_pretty(
+            "(equal:boolean
+                (modulus:int8 $0:int8 2:int8) 
+                (modulus:int8 $1:int8 3:int8))",
+        ),
         join_type,
         output_indices,
         left_input,
diff --git a/src/batch/benches/sort.rs b/src/batch/benches/sort.rs
index f8de2fa730e9c..d99670f04ad44 100644
--- a/src/batch/benches/sort.rs
+++ b/src/batch/benches/sort.rs
@@ -16,13 +16,13 @@ pub mod utils;
 
 use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
 use risingwave_batch::executor::{BoxedExecutor, SortExecutor};
-use risingwave_common::enable_jemalloc_on_linux;
+use risingwave_common::enable_jemalloc_on_unix;
 use risingwave_common::types::DataType;
 use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
 use tokio::runtime::Runtime;
 use utils::{create_input, execute_executor};
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 fn create_order_by_executor(
     chunk_size: usize,
diff --git a/src/batch/benches/top_n.rs b/src/batch/benches/top_n.rs
index 9d3a51a8a0320..717fcab2d497a 100644
--- a/src/batch/benches/top_n.rs
+++ b/src/batch/benches/top_n.rs
@@ -16,13 +16,13 @@ pub mod utils;
 
 use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
 use risingwave_batch::executor::{BoxedExecutor, TopNExecutor};
-use risingwave_common::enable_jemalloc_on_linux;
+use risingwave_common::enable_jemalloc_on_unix;
 use risingwave_common::types::DataType;
 use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
 use tokio::runtime::Runtime;
 use utils::{create_input, execute_executor};
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 fn create_top_n_executor(
     chunk_size: usize,
diff --git a/src/batch/src/executor/filter.rs b/src/batch/src/executor/filter.rs
index 0a4ee63e306f7..919ccfff594e0 100644
--- a/src/batch/src/executor/filter.rs
+++ b/src/batch/src/executor/filter.rs
@@ -124,17 +124,11 @@ impl FilterExecutor {
 mod tests {
     use assert_matches::assert_matches;
     use futures::stream::StreamExt;
-    use risingwave_common::array::{Array, DataChunk, ListValue};
+    use risingwave_common::array::{Array, DataChunk};
     use risingwave_common::catalog::{Field, Schema};
     use risingwave_common::test_prelude::DataChunkTestExt;
-    use risingwave_common::types::{DataType, Scalar};
-    use risingwave_common::util::value_encoding::serialize_datum;
-    use risingwave_expr::expr::build_from_prost;
-    use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::Datum as ProstDatum;
-    use risingwave_pb::expr::expr_node::Type::InputRef;
-    use risingwave_pb::expr::expr_node::{RexNode, Type};
-    use risingwave_pb::expr::{ExprNode, FunctionCall};
+    use risingwave_common::types::DataType;
+    use risingwave_expr::expr::build_from_pretty;
 
     use crate::executor::test_utils::MockExecutor;
     use crate::executor::{Executor, FilterExecutor};
@@ -174,9 +168,8 @@ mod tests {
         mock_executor.add(chunk);
 
         // Initialize filter executor
-        let expr = make_filter_expression(Type::GreaterThan);
         let filter_executor = Box::new(FilterExecutor {
-            expr: build_from_prost(&expr).unwrap(),
+            expr: build_from_pretty("(greater_than:boolean $0:int4[] {2}:int4[])"),
             child: Box::new(mock_executor),
             identity: "FilterExecutor".to_string(),
             chunk_size: CHUNK_SIZE,
@@ -217,54 +210,6 @@ mod tests {
         assert_matches!(res, None);
     }
 
-    fn make_filter_expression(kind: Type) -> ExprNode {
-        use risingwave_common::types::ScalarImpl;
-        let lhs = ExprNode {
-            expr_type: InputRef as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::List as i32,
-                field_type: vec![risingwave_pb::data::DataType {
-                    type_name: TypeName::Int32 as i32,
-                    is_nullable: true,
-                    ..Default::default()
-                }],
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::InputRef(0)),
-        };
-        let rhs = ExprNode {
-            expr_type: Type::ConstantValue as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::List as i32,
-                field_type: vec![risingwave_pb::data::DataType {
-                    type_name: TypeName::Int32 as i32,
-                    ..Default::default()
-                }],
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: serialize_datum(
-                    Some(ScalarImpl::List(ListValue::new(vec![Some(
-                        2.to_scalar_value(),
-                    )])))
-                    .as_ref(),
-                ),
-            })),
-        };
-        let function_call = FunctionCall {
-            children: vec![lhs, rhs],
-        };
-        let return_type = risingwave_pb::data::DataType {
-            type_name: risingwave_pb::data::data_type::TypeName::Boolean as i32,
-            ..Default::default()
-        };
-        ExprNode {
-            expr_type: kind as i32,
-            return_type: Some(return_type),
-            rex_node: Some(RexNode::FuncCall(function_call)),
-        }
-    }
-
     #[tokio::test]
     async fn test_filter_executor() {
         let schema = Schema {
@@ -281,9 +226,8 @@ mod tests {
              4 1
              3 3",
         ));
-        let expr = make_expression(Type::Equal);
         let filter_executor = Box::new(FilterExecutor {
-            expr: build_from_prost(&expr).unwrap(),
+            expr: build_from_pretty("(equal:boolean $0:int4 $1:int4)"),
             child: Box::new(mock_executor),
             identity: "FilterExecutor".to_string(),
             chunk_size: CHUNK_SIZE,
@@ -305,32 +249,4 @@ mod tests {
         let res = stream.next().await;
         assert_matches!(res, None);
     }
-
-    fn make_expression(kind: Type) -> ExprNode {
-        let lhs = make_inputref(0);
-        let rhs = make_inputref(1);
-        let function_call = FunctionCall {
-            children: vec![lhs, rhs],
-        };
-        let return_type = risingwave_pb::data::DataType {
-            type_name: risingwave_pb::data::data_type::TypeName::Boolean as i32,
-            ..Default::default()
-        };
-        ExprNode {
-            expr_type: kind as i32,
-            return_type: Some(return_type),
-            rex_node: Some(RexNode::FuncCall(function_call)),
-        }
-    }
-
-    fn make_inputref(idx: usize) -> ExprNode {
-        ExprNode {
-            expr_type: InputRef as i32,
-            return_type: Some(risingwave_pb::data::DataType {
-                type_name: TypeName::Int32 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::InputRef(idx as _)),
-        }
-    }
 }
diff --git a/src/batch/src/executor/generic_exchange.rs b/src/batch/src/executor/generic_exchange.rs
index b3f1565352ad0..38adff661ad38 100644
--- a/src/batch/src/executor/generic_exchange.rs
+++ b/src/batch/src/executor/generic_exchange.rs
@@ -21,7 +21,7 @@ use risingwave_common::error::{Result, RwError};
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_common::util::select_all;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
-use risingwave_pb::batch_plan::ExchangeSource as ProstExchangeSource;
+use risingwave_pb::batch_plan::PbExchangeSource;
 use risingwave_pb::plan_common::Field as NodeField;
 use risingwave_rpc_client::ComputeClientPoolRef;
 
@@ -36,7 +36,7 @@ use super::BatchTaskMetricsWithTaskLabels;
 use crate::executor::{BoxedDataChunkStream, BoxedExecutor, BoxedExecutorBuilder, Executor};
 
 pub struct GenericExchangeExecutor<CS, C> {
-    proto_sources: Vec<ProstExchangeSource>,
+    proto_sources: Vec<PbExchangeSource>,
     /// Mock-able CreateSource.
     source_creators: Vec<CS>,
     context: C,
@@ -56,7 +56,7 @@ pub trait CreateSource: Send {
     async fn create_source(
         &self,
         context: impl BatchTaskContext,
-        prost_source: &ProstExchangeSource,
+        prost_source: &PbExchangeSource,
     ) -> Result<ExchangeSourceImpl>;
 }
 
@@ -76,7 +76,7 @@ impl CreateSource for DefaultCreateSource {
     async fn create_source(
         &self,
         context: impl BatchTaskContext,
-        prost_source: &ProstExchangeSource,
+        prost_source: &PbExchangeSource,
     ) -> Result<ExchangeSourceImpl> {
         let peer_addr = prost_source.get_host()?.into();
         let task_output_id = prost_source.get_task_output_id()?;
@@ -127,7 +127,7 @@ impl BoxedExecutorBuilder for GenericExchangeExecutorBuilder {
         )?;
 
         ensure!(!node.get_sources().is_empty());
-        let proto_sources: Vec<ProstExchangeSource> = node.get_sources().to_vec();
+        let proto_sources: Vec<PbExchangeSource> = node.get_sources().to_vec();
         let source_creators =
             vec![DefaultCreateSource::new(source.context().client_pool()); proto_sources.len()];
 
@@ -189,7 +189,7 @@ impl<CS: 'static + Send + CreateSource, C: BatchTaskContext> GenericExchangeExec
 
     #[try_stream(boxed, ok = DataChunk, error = RwError)]
     async fn data_chunk_stream(
-        prost_source: ProstExchangeSource,
+        prost_source: PbExchangeSource,
         source_creator: CS,
         context: C,
         metrics: Option<BatchTaskMetricsWithTaskLabels>,
@@ -264,7 +264,7 @@ mod tests {
             let chunks = vec![Some(chunk); 100];
             let fake_exchange_source = FakeExchangeSource::new(chunks);
             let fake_create_source = FakeCreateSource::new(fake_exchange_source);
-            proto_sources.push(ProstExchangeSource::default());
+            proto_sources.push(PbExchangeSource::default());
             source_creators.push(fake_create_source);
         }
 
diff --git a/src/batch/src/executor/group_top_n.rs b/src/batch/src/executor/group_top_n.rs
index 20024c232758a..8d0da917b0b3c 100644
--- a/src/batch/src/executor/group_top_n.rs
+++ b/src/batch/src/executor/group_top_n.rs
@@ -25,8 +25,8 @@ use risingwave_common::error::{Result, RwError};
 use risingwave_common::hash::{HashKey, HashKeyDispatcher};
 use risingwave_common::types::DataType;
 use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
-use risingwave_common::util::encoding_for_comparison::encode_chunk;
 use risingwave_common::util::iter_util::ZipEqFast;
+use risingwave_common::util::memcmp_encoding::encode_chunk;
 use risingwave_common::util::sort_util::ColumnOrder;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 
diff --git a/src/batch/src/executor/hash_agg.rs b/src/batch/src/executor/hash_agg.rs
index 42178ca5c7acb..04b70d1315149 100644
--- a/src/batch/src/executor/hash_agg.rs
+++ b/src/batch/src/executor/hash_agg.rs
@@ -270,7 +270,7 @@ mod tests {
     use risingwave_common::catalog::{Field, Schema};
     use risingwave_common::test_prelude::DataChunkTestExt;
     use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::DataType as ProstDataType;
+    use risingwave_pb::data::PbDataType;
     use risingwave_pb::expr::agg_call::Type;
     use risingwave_pb::expr::{AggCall, InputRef};
 
@@ -309,12 +309,12 @@ mod tests {
             r#type: Type::Sum as i32,
             args: vec![InputRef {
                 index: 2,
-                r#type: Some(ProstDataType {
+                r#type: Some(PbDataType {
                     type_name: TypeName::Int32 as i32,
                     ..Default::default()
                 }),
             }],
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: TypeName::Int64 as i32,
                 ..Default::default()
             }),
@@ -382,7 +382,7 @@ mod tests {
         let agg_call = AggCall {
             r#type: Type::Count as i32,
             args: vec![],
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: TypeName::Int64 as i32,
                 ..Default::default()
             }),
diff --git a/src/batch/src/executor/hop_window.rs b/src/batch/src/executor/hop_window.rs
index c5c598b3baa80..f5f7e68201b5c 100644
--- a/src/batch/src/executor/hop_window.rs
+++ b/src/batch/src/executor/hop_window.rs
@@ -20,7 +20,7 @@ use risingwave_common::array::column::Column;
 use risingwave_common::array::{DataChunk, Vis};
 use risingwave_common::catalog::{Field, Schema};
 use risingwave_common::error::{Result, RwError};
-use risingwave_common::types::{DataType, IntervalUnit};
+use risingwave_common::types::{DataType, Interval};
 use risingwave_expr::expr::{build_from_prost, BoxedExpression};
 use risingwave_expr::ExprError;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
@@ -34,8 +34,8 @@ pub struct HopWindowExecutor {
     identity: String,
     schema: Schema,
     time_col_idx: usize,
-    window_slide: IntervalUnit,
-    window_size: IntervalUnit,
+    window_slide: Interval,
+    window_size: Interval,
     window_start_exprs: Vec<BoxedExpression>,
     window_end_exprs: Vec<BoxedExpression>,
     output_indices: Vec<usize>,
@@ -111,8 +111,8 @@ impl HopWindowExecutor {
         child: BoxedExecutor,
         schema: Schema,
         time_col_idx: usize,
-        window_slide: IntervalUnit,
-        window_size: IntervalUnit,
+        window_slide: Interval,
+        window_size: Interval,
         identity: String,
         window_start_exprs: Vec<BoxedExpression>,
         window_end_exprs: Vec<BoxedExpression>,
@@ -211,7 +211,7 @@ mod tests {
     use futures::stream::StreamExt;
     use risingwave_common::array::{DataChunk, DataChunkTestExt};
     use risingwave_common::catalog::{Field, Schema};
-    use risingwave_common::types::test_utils::IntervalUnitTestExt;
+    use risingwave_common::types::test_utils::IntervalTestExt;
     use risingwave_common::types::DataType;
     use risingwave_expr::expr::test_utils::make_hop_window_expression;
 
@@ -220,9 +220,9 @@ mod tests {
 
     fn create_executor(
         output_indices: Vec<usize>,
-        window_slide: IntervalUnit,
-        window_size: IntervalUnit,
-        window_offset: IntervalUnit,
+        window_slide: Interval,
+        window_size: Interval,
+        window_offset: Interval,
     ) -> Box<HopWindowExecutor> {
         let field1 = Field::unnamed(DataType::Int64);
         let field2 = Field::unnamed(DataType::Int64);
@@ -268,10 +268,10 @@ mod tests {
 
     #[tokio::test]
     async fn test_window_offset() {
-        async fn test_window_offset_helper(window_offset: IntervalUnit) -> DataChunk {
+        async fn test_window_offset_helper(window_offset: Interval) -> DataChunk {
             let default_indices = (0..3 + 2).collect_vec();
-            let window_slide = IntervalUnit::from_minutes(15);
-            let window_size = IntervalUnit::from_minutes(30);
+            let window_slide = Interval::from_minutes(15);
+            let window_size = Interval::from_minutes(30);
             let executor =
                 create_executor(default_indices, window_slide, window_size, window_offset);
             let mut stream = executor.execute();
@@ -282,11 +282,11 @@ mod tests {
         for offset in 0..window_size {
             for coefficient in -5..0 {
                 assert_eq!(
-                    test_window_offset_helper(IntervalUnit::from_minutes(
+                    test_window_offset_helper(Interval::from_minutes(
                         coefficient * window_size + offset
                     ))
                     .await,
-                    test_window_offset_helper(IntervalUnit::from_minutes(
+                    test_window_offset_helper(Interval::from_minutes(
                         (coefficient - 1) * window_size + offset
                     ))
                     .await
@@ -296,11 +296,11 @@ mod tests {
         for offset in 0..window_size {
             for coefficient in 0..5 {
                 assert_eq!(
-                    test_window_offset_helper(IntervalUnit::from_minutes(
+                    test_window_offset_helper(Interval::from_minutes(
                         coefficient * window_size + offset
                     ))
                     .await,
-                    test_window_offset_helper(IntervalUnit::from_minutes(
+                    test_window_offset_helper(Interval::from_minutes(
                         (coefficient + 1) * window_size + offset
                     ))
                     .await
@@ -309,13 +309,13 @@ mod tests {
         }
         for offset in -window_size..window_size {
             assert_eq!(
-                test_window_offset_helper(IntervalUnit::from_minutes(window_size + offset)).await,
-                test_window_offset_helper(IntervalUnit::from_minutes(-window_size + offset)).await
+                test_window_offset_helper(Interval::from_minutes(window_size + offset)).await,
+                test_window_offset_helper(Interval::from_minutes(-window_size + offset)).await
             );
         }
 
         assert_eq!(
-            test_window_offset_helper(IntervalUnit::from_minutes(-31)).await,
+            test_window_offset_helper(Interval::from_minutes(-31)).await,
             DataChunk::from_pretty(
                 &"I I TS        TS        TS
                 1 1 ^10:00:00 ^09:44:00 ^10:14:00
@@ -330,7 +330,7 @@ mod tests {
             )
         );
         assert_eq!(
-            test_window_offset_helper(IntervalUnit::from_minutes(29)).await,
+            test_window_offset_helper(Interval::from_minutes(29)).await,
             DataChunk::from_pretty(
                 &"I I TS        TS        TS
                 1 1 ^10:00:00 ^09:44:00 ^10:14:00
@@ -350,9 +350,9 @@ mod tests {
     async fn test_execute() {
         let default_indices = (0..3 + 2).collect_vec();
 
-        let window_slide = IntervalUnit::from_minutes(15);
-        let window_size = IntervalUnit::from_minutes(30);
-        let window_offset = IntervalUnit::from_minutes(0);
+        let window_slide = Interval::from_minutes(15);
+        let window_size = Interval::from_minutes(30);
+        let window_offset = Interval::from_minutes(0);
         let executor = create_executor(default_indices, window_slide, window_size, window_offset);
 
         let mut stream = executor.execute();
@@ -394,9 +394,9 @@ mod tests {
     }
     #[tokio::test]
     async fn test_output_indices() {
-        let window_slide = IntervalUnit::from_minutes(15);
-        let window_size = IntervalUnit::from_minutes(30);
-        let window_offset = IntervalUnit::from_minutes(0);
+        let window_slide = Interval::from_minutes(15);
+        let window_size = Interval::from_minutes(30);
+        let window_offset = Interval::from_minutes(0);
         let executor = create_executor(vec![1, 3, 4, 2], window_slide, window_size, window_offset);
 
         let mut stream = executor.execute();
diff --git a/src/batch/src/executor/insert.rs b/src/batch/src/executor/insert.rs
index 00388a054f704..365f4571e6ff8 100644
--- a/src/batch/src/executor/insert.rs
+++ b/src/batch/src/executor/insert.rs
@@ -17,9 +17,8 @@ use std::iter::repeat;
 use anyhow::Context;
 use futures::future::try_join_all;
 use futures_async_stream::try_stream;
-use risingwave_common::array::{
-    ArrayBuilder, DataChunk, I64Array, Op, PrimitiveArrayBuilder, StreamChunk,
-};
+use risingwave_common::array::serial_array::SerialArray;
+use risingwave_common::array::{ArrayBuilder, DataChunk, Op, PrimitiveArrayBuilder, StreamChunk};
 use risingwave_common::catalog::{Field, Schema, TableId, TableVersionId};
 use risingwave_common::error::{Result, RwError};
 use risingwave_common::types::DataType;
@@ -73,7 +72,7 @@ impl InsertExecutor {
                 table_schema
             } else {
                 Schema {
-                    fields: vec![Field::unnamed(DataType::Int64)],
+                    fields: vec![Field::unnamed(DataType::Serial)],
                 }
             },
             identity,
@@ -123,7 +122,7 @@ impl InsertExecutor {
             // If the user does not specify the primary key, then we need to add a column as the
             // primary key.
             if let Some(row_id_index) = self.row_id_index {
-                let row_id_col = I64Array::from_iter(repeat(None).take(cap));
+                let row_id_col = SerialArray::from_iter(repeat(None).take(cap));
                 columns.insert(row_id_index, row_id_col.into())
             }
 
@@ -212,12 +211,14 @@ mod tests {
     use futures::StreamExt;
     use itertools::Itertools;
     use risingwave_common::array::{Array, ArrayImpl, I32Array, StructArray};
+    use risingwave_common::cache::CachePriority;
     use risingwave_common::catalog::{
         schema_test_utils, ColumnDesc, ColumnId, INITIAL_TABLE_VERSION_ID,
     };
     use risingwave_common::column_nonnull;
     use risingwave_common::types::DataType;
     use risingwave_source::dml_manager::DmlManager;
+    use risingwave_storage::hummock::CachePolicy;
     use risingwave_storage::memory::MemoryStateStore;
     use risingwave_storage::store::{ReadOptions, StateStoreReadExt};
 
@@ -244,7 +245,7 @@ mod tests {
         // Schema of the table
         let mut schema = schema_test_utils::ii();
         schema.fields.push(struct_field);
-        schema.fields.push(Field::unnamed(DataType::Int64)); // row_id column
+        schema.fields.push(Field::unnamed(DataType::Serial)); // row_id column
 
         let row_id_index = Some(3);
 
@@ -354,6 +355,7 @@ mod tests {
                     retention_seconds: None,
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await?;
diff --git a/src/batch/src/executor/join/distributed_lookup_join.rs b/src/batch/src/executor/join/distributed_lookup_join.rs
index c23ade15f1e34..f62fed32e6469 100644
--- a/src/batch/src/executor/join/distributed_lookup_join.rs
+++ b/src/batch/src/executor/join/distributed_lookup_join.rs
@@ -195,13 +195,13 @@ impl BoxedExecutorBuilder for DistributedLookupJoinExecutorBuilder {
             .map(|k| k.column_index as usize)
             .collect_vec();
 
-        let dist_key_indices = table_desc
-            .dist_key_indices
+        let dist_key_in_pk_indices = table_desc
+            .dist_key_in_pk_indices
             .iter()
             .map(|&k| k as usize)
             .collect_vec();
         // Lookup Join always contains distribution key, so we don't need vnode bitmap
-        let distribution = Distribution::all_vnodes(dist_key_indices);
+        let distribution = Distribution::all_vnodes(dist_key_in_pk_indices);
         let table_option = TableOption {
             retention_seconds: if table_desc.retention_seconds > 0 {
                 Some(table_desc.retention_seconds)
diff --git a/src/batch/src/executor/join/hash_join.rs b/src/batch/src/executor/join/hash_join.rs
index e5eac41512a4f..a5684bf089df4 100644
--- a/src/batch/src/executor/join/hash_join.rs
+++ b/src/batch/src/executor/join/hash_join.rs
@@ -1799,8 +1799,7 @@ mod tests {
     use risingwave_common::test_prelude::DataChunkTestExt;
     use risingwave_common::types::DataType;
     use risingwave_common::util::iter_util::ZipEqDebug;
-    use risingwave_expr::expr::{new_binary_expr, BoxedExpression, InputRefExpression};
-    use risingwave_pb::expr::expr_node::Type;
+    use risingwave_expr::expr::{build_from_pretty, BoxedExpression};
 
     use super::{
         ChunkedData, HashJoinExecutor, JoinType, LeftNonEquiJoinState, RightNonEquiJoinState, RowId,
@@ -1985,15 +1984,7 @@ mod tests {
         }
 
         fn create_cond() -> BoxedExpression {
-            let left_expr = InputRefExpression::new(DataType::Float32, 1);
-            let right_expr = InputRefExpression::new(DataType::Float64, 3);
-            new_binary_expr(
-                Type::LessThan,
-                DataType::Boolean,
-                Box::new(left_expr),
-                Box::new(right_expr),
-            )
-            .unwrap()
+            build_from_pretty("(less_than:boolean $1:float4 $3:float8)")
         }
 
         fn create_join_executor_with_chunk_size_and_executors(
diff --git a/src/batch/src/executor/join/local_lookup_join.rs b/src/batch/src/executor/join/local_lookup_join.rs
index 6fb7842444cda..4881c3accf9b1 100644
--- a/src/batch/src/executor/join/local_lookup_join.rs
+++ b/src/batch/src/executor/join/local_lookup_join.rs
@@ -32,8 +32,8 @@ use risingwave_pb::batch_plan::exchange_info::DistributionMode;
 use risingwave_pb::batch_plan::exchange_source::LocalExecutePlan::Plan;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::{
-    ExchangeInfo, ExchangeNode, ExchangeSource as ProstExchangeSource, LocalExecutePlan,
-    PlanFragment, PlanNode, RowSeqScanNode, TaskId as ProstTaskId, TaskOutputId,
+    ExchangeInfo, ExchangeNode, LocalExecutePlan, PbExchangeSource, PbTaskId, PlanFragment,
+    PlanNode, RowSeqScanNode, TaskOutputId,
 };
 use risingwave_pb::common::{BatchQueryEpoch, WorkerNode};
 use risingwave_pb::plan_common::StorageTableDesc;
@@ -77,20 +77,15 @@ pub type BoxedLookupExecutorBuilder = Box<dyn LookupExecutorBuilder>;
 impl<C: BatchTaskContext> InnerSideExecutorBuilder<C> {
     /// Gets the virtual node based on the given `scan_range`
     fn get_virtual_node(&self, scan_range: &ScanRange) -> Result<VirtualNode> {
-        let dist_keys = self
+        let dist_key_in_pk_indices = self
             .table_desc
-            .dist_key_indices
+            .dist_key_in_pk_indices
             .iter()
             .map(|&k| k as usize)
             .collect_vec();
-        let pk_indices = self
-            .table_desc
-            .pk
-            .iter()
-            .map(|col| col.column_index as usize)
-            .collect_vec();
 
-        let virtual_node = scan_range.try_compute_vnode(&dist_keys, &pk_indices);
+        let virtual_node =
+            scan_range.try_compute_vnode_with_dist_key_in_pk_indices(&dist_key_in_pk_indices);
         virtual_node.ok_or_else(|| internal_error("Could not compute vnode for lookup join"))
     }
 
@@ -118,8 +113,8 @@ impl<C: BatchTaskContext> InnerSideExecutorBuilder<C> {
         Ok(row_seq_scan_node)
     }
 
-    /// Creates the `ProstExchangeSource` using the given `id`.
-    fn build_prost_exchange_source(&self, id: &ParallelUnitId) -> Result<ProstExchangeSource> {
+    /// Creates the `PbExchangeSource` using the given `id`.
+    fn build_prost_exchange_source(&self, id: &ParallelUnitId) -> Result<PbExchangeSource> {
         let worker = self.pu_to_worker_mapping.get(id).ok_or_else(|| {
             internal_error("No worker node found for the given parallel unit id.")
         })?;
@@ -139,9 +134,9 @@ impl<C: BatchTaskContext> InnerSideExecutorBuilder<C> {
             epoch: Some(self.epoch.clone()),
         };
 
-        let prost_exchange_source = ProstExchangeSource {
+        let prost_exchange_source = PbExchangeSource {
             task_output_id: Some(TaskOutputId {
-                task_id: Some(ProstTaskId {
+                task_id: Some(PbTaskId {
                     // FIXME: We should replace this random generated uuid to current query_id for
                     // better dashboard. However, due to the lack of info of
                     // stage_id and task_id, we can not do it now. Now just make sure it will not
@@ -463,13 +458,10 @@ mod tests {
     use risingwave_common::array::{DataChunk, DataChunkTestExt};
     use risingwave_common::catalog::{Field, Schema};
     use risingwave_common::hash::HashKeyDispatcher;
-    use risingwave_common::types::{DataType, ScalarImpl};
+    use risingwave_common::types::DataType;
     use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
     use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
-    use risingwave_expr::expr::{
-        new_binary_expr, BoxedExpression, InputRefExpression, LiteralExpression,
-    };
-    use risingwave_pb::expr::expr_node::Type;
+    use risingwave_expr::expr::{build_from_pretty, BoxedExpression};
 
     use super::LocalLookupJoinExecutorArgs;
     use crate::executor::join::JoinType;
@@ -679,21 +671,9 @@ mod tests {
              2 5.5 2 5.5
              2 8.4 2 5.5",
         );
+        let condition = build_from_pretty("(less_than:boolean 5:int4 $3:float4)");
 
-        let condition = Some(
-            new_binary_expr(
-                Type::LessThan,
-                DataType::Boolean,
-                Box::new(LiteralExpression::new(
-                    DataType::Int32,
-                    Some(ScalarImpl::Int32(5)),
-                )),
-                Box::new(InputRefExpression::new(DataType::Float32, 3)),
-            )
-            .unwrap(),
-        );
-
-        do_test(JoinType::Inner, condition, false, expected).await;
+        do_test(JoinType::Inner, Some(condition), false, expected).await;
     }
 
     #[tokio::test]
@@ -708,21 +688,9 @@ mod tests {
              5 9.1 . .
              . .   . .",
         );
+        let condition = build_from_pretty("(less_than:boolean 5:int4 $3:float4)");
 
-        let condition = Some(
-            new_binary_expr(
-                Type::LessThan,
-                DataType::Boolean,
-                Box::new(LiteralExpression::new(
-                    DataType::Int32,
-                    Some(ScalarImpl::Int32(5)),
-                )),
-                Box::new(InputRefExpression::new(DataType::Float32, 3)),
-            )
-            .unwrap(),
-        );
-
-        do_test(JoinType::LeftOuter, condition, false, expected).await;
+        do_test(JoinType::LeftOuter, Some(condition), false, expected).await;
     }
 
     #[tokio::test]
@@ -733,21 +701,9 @@ mod tests {
              2 5.5
              2 8.4",
         );
+        let condition = build_from_pretty("(less_than:boolean 5:int4 $3:float4)");
 
-        let condition = Some(
-            new_binary_expr(
-                Type::LessThan,
-                DataType::Boolean,
-                Box::new(LiteralExpression::new(
-                    DataType::Int32,
-                    Some(ScalarImpl::Int32(5)),
-                )),
-                Box::new(InputRefExpression::new(DataType::Float32, 3)),
-            )
-            .unwrap(),
-        );
-
-        do_test(JoinType::LeftSemi, condition, false, expected).await;
+        do_test(JoinType::LeftSemi, Some(condition), false, expected).await;
     }
 
     #[tokio::test]
@@ -759,20 +715,8 @@ mod tests {
             5 9.1
             . .",
         );
+        let condition = build_from_pretty("(less_than:boolean 5:int4 $3:float4)");
 
-        let condition = Some(
-            new_binary_expr(
-                Type::LessThan,
-                DataType::Boolean,
-                Box::new(LiteralExpression::new(
-                    DataType::Int32,
-                    Some(ScalarImpl::Int32(5)),
-                )),
-                Box::new(InputRefExpression::new(DataType::Float32, 3)),
-            )
-            .unwrap(),
-        );
-
-        do_test(JoinType::LeftAnti, condition, false, expected).await;
+        do_test(JoinType::LeftAnti, Some(condition), false, expected).await;
     }
 }
diff --git a/src/batch/src/executor/join/mod.rs b/src/batch/src/executor/join/mod.rs
index 2c25ccbd6769e..4e077e3e92d16 100644
--- a/src/batch/src/executor/join/mod.rs
+++ b/src/batch/src/executor/join/mod.rs
@@ -31,7 +31,7 @@ use risingwave_common::error::Result;
 use risingwave_common::row::Row;
 use risingwave_common::types::{DataType, DatumRef};
 use risingwave_common::util::iter_util::ZipEqFast;
-use risingwave_pb::plan_common::JoinType as JoinTypeProst;
+use risingwave_pb::plan_common::JoinType as JoinTypePb;
 
 use crate::error::BatchError;
 
@@ -61,17 +61,17 @@ impl JoinType {
         )
     }
 
-    pub fn from_prost(prost: JoinTypeProst) -> Self {
+    pub fn from_prost(prost: JoinTypePb) -> Self {
         match prost {
-            JoinTypeProst::Inner => JoinType::Inner,
-            JoinTypeProst::LeftOuter => JoinType::LeftOuter,
-            JoinTypeProst::LeftSemi => JoinType::LeftSemi,
-            JoinTypeProst::LeftAnti => JoinType::LeftAnti,
-            JoinTypeProst::RightOuter => JoinType::RightOuter,
-            JoinTypeProst::RightSemi => JoinType::RightSemi,
-            JoinTypeProst::RightAnti => JoinType::RightAnti,
-            JoinTypeProst::FullOuter => JoinType::FullOuter,
-            JoinTypeProst::Unspecified => unreachable!(),
+            JoinTypePb::Inner => JoinType::Inner,
+            JoinTypePb::LeftOuter => JoinType::LeftOuter,
+            JoinTypePb::LeftSemi => JoinType::LeftSemi,
+            JoinTypePb::LeftAnti => JoinType::LeftAnti,
+            JoinTypePb::RightOuter => JoinType::RightOuter,
+            JoinTypePb::RightSemi => JoinType::RightSemi,
+            JoinTypePb::RightAnti => JoinType::RightAnti,
+            JoinTypePb::FullOuter => JoinType::FullOuter,
+            JoinTypePb::Unspecified => unreachable!(),
         }
     }
 
diff --git a/src/batch/src/executor/join/nested_loop_join.rs b/src/batch/src/executor/join/nested_loop_join.rs
index 5c229fa77ee5c..95821160bd02e 100644
--- a/src/batch/src/executor/join/nested_loop_join.rs
+++ b/src/batch/src/executor/join/nested_loop_join.rs
@@ -470,8 +470,7 @@ mod tests {
     use risingwave_common::array::*;
     use risingwave_common::catalog::{Field, Schema};
     use risingwave_common::types::DataType;
-    use risingwave_expr::expr::{new_binary_expr, InputRefExpression};
-    use risingwave_pb::expr::expr_node::Type;
+    use risingwave_expr::expr::build_from_pretty;
 
     use crate::executor::join::nested_loop_join::NestedLoopJoinExecutor;
     use crate::executor::join::JoinType;
@@ -587,13 +586,7 @@ mod tests {
             };
 
             Box::new(NestedLoopJoinExecutor::new(
-                new_binary_expr(
-                    Type::Equal,
-                    DataType::Boolean,
-                    Box::new(InputRefExpression::new(DataType::Int32, 0)),
-                    Box::new(InputRefExpression::new(DataType::Int32, 2)),
-                )
-                .unwrap(),
+                build_from_pretty("(equal:boolean $0:int4 $2:int4)"),
                 join_type,
                 output_indices,
                 left_child,
diff --git a/src/batch/src/executor/merge_sort_exchange.rs b/src/batch/src/executor/merge_sort_exchange.rs
index 3108ed5a8f0d2..d098cdc279f35 100644
--- a/src/batch/src/executor/merge_sort_exchange.rs
+++ b/src/batch/src/executor/merge_sort_exchange.rs
@@ -22,7 +22,7 @@ use risingwave_common::error::{Result, RwError};
 use risingwave_common::types::ToOwnedDatum;
 use risingwave_common::util::sort_util::{ColumnOrder, HeapElem};
 use risingwave_pb::batch_plan::plan_node::NodeBody;
-use risingwave_pb::batch_plan::ExchangeSource as ProstExchangeSource;
+use risingwave_pb::batch_plan::PbExchangeSource;
 
 use crate::exchange_source::ExchangeSourceImpl;
 use crate::executor::{
@@ -41,7 +41,7 @@ pub struct MergeSortExchangeExecutorImpl<CS, C> {
     source_inputs: Vec<Option<DataChunk>>,
     column_orders: Arc<Vec<ColumnOrder>>,
     min_heap: BinaryHeap<HeapElem>,
-    proto_sources: Vec<ProstExchangeSource>,
+    proto_sources: Vec<PbExchangeSource>,
     sources: Vec<ExchangeSourceImpl>, // impl
     /// Mock-able CreateSource.
     source_creators: Vec<CS>,
@@ -199,7 +199,7 @@ impl BoxedExecutorBuilder for MergeSortExchangeExecutorBuilder {
         let column_orders = Arc::new(column_orders);
 
         let exchange_node = sort_merge_node.get_exchange()?;
-        let proto_sources: Vec<ProstExchangeSource> = exchange_node.get_sources().to_vec();
+        let proto_sources: Vec<PbExchangeSource> = exchange_node.get_sources().to_vec();
         let source_creators =
             vec![DefaultCreateSource::new(source.context().client_pool()); proto_sources.len()];
         ensure!(!exchange_node.get_sources().is_empty());
@@ -253,11 +253,11 @@ mod tests {
         let fake_exchange_source = FakeExchangeSource::new(vec![Some(chunk)]);
         let fake_create_source = FakeCreateSource::new(fake_exchange_source);
 
-        let mut proto_sources: Vec<ProstExchangeSource> = vec![];
+        let mut proto_sources: Vec<PbExchangeSource> = vec![];
         let mut source_creators = vec![];
         let num_sources = 2;
         for _ in 0..num_sources {
-            proto_sources.push(ProstExchangeSource::default());
+            proto_sources.push(PbExchangeSource::default());
             source_creators.push(fake_create_source.clone());
         }
         let column_orders = Arc::new(vec![ColumnOrder {
diff --git a/src/batch/src/executor/order_by.rs b/src/batch/src/executor/order_by.rs
index 3d02af44e7cb9..864b8c15964d3 100644
--- a/src/batch/src/executor/order_by.rs
+++ b/src/batch/src/executor/order_by.rs
@@ -17,7 +17,7 @@ use risingwave_common::array::DataChunk;
 use risingwave_common::catalog::Schema;
 use risingwave_common::error::{Result, RwError};
 use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
-use risingwave_common::util::encoding_for_comparison::encode_chunk;
+use risingwave_common::util::memcmp_encoding::encode_chunk;
 use risingwave_common::util::sort_util::ColumnOrder;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 
@@ -140,10 +140,7 @@ mod tests {
     use risingwave_common::array::*;
     use risingwave_common::catalog::{Field, Schema};
     use risingwave_common::test_prelude::DataChunkTestExt;
-    use risingwave_common::types::{
-        DataType, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper,
-        OrderedF32, Scalar,
-    };
+    use risingwave_common::types::{DataType, Date, Interval, Scalar, Time, Timestamp, F32};
     use risingwave_common::util::sort_util::OrderType;
 
     use super::*;
@@ -379,12 +376,12 @@ mod tests {
             vec![
                 column! { Utf8Array, [Some("abc"), Some("b"), Some("abc"), Some("abcdefgh"), Some("b")] },
                 column! { DecimalArray, [None, Some(-3), None, None, Some(7)] },
-                column! { NaiveDateArray, [
-                Some(NaiveDateWrapper::with_days(123).unwrap()),
-                Some(NaiveDateWrapper::with_days(789).unwrap()),
-                Some(NaiveDateWrapper::with_days(456).unwrap()),
+                column! { DateArray, [
+                Some(Date::with_days(123).unwrap()),
+                Some(Date::with_days(789).unwrap()),
+                Some(Date::with_days(456).unwrap()),
                 None,
-                Some(NaiveDateWrapper::with_days(345).unwrap())] },
+                Some(Date::with_days(345).unwrap())] },
             ],
             5,
         );
@@ -397,12 +394,12 @@ mod tests {
             vec![
                 column! { Utf8Array, [Some("b"), Some("b"), Some("abcdefgh"), Some("abc"), Some("abc")] },
                 column! { DecimalArray, [Some(7), Some(-3), None, None, None] },
-                column! { NaiveDateArray, [
-                Some(NaiveDateWrapper::with_days(345).unwrap()),
-                Some(NaiveDateWrapper::with_days(789).unwrap()),
+                column! { DateArray, [
+                Some(Date::with_days(345).unwrap()),
+                Some(Date::with_days(789).unwrap()),
                 None,
-                Some(NaiveDateWrapper::with_days(123).unwrap()),
-                Some(NaiveDateWrapper::with_days(456).unwrap())] },
+                Some(Date::with_days(123).unwrap()),
+                Some(Date::with_days(456).unwrap())] },
             ],
             5,
         );
@@ -450,23 +447,23 @@ mod tests {
         // 7:89  .     .
         let input_chunk = DataChunk::new(
             vec![
-                column! { NaiveTimeArray, [
+                column! { TimeArray, [
                 None,
-                Some(NaiveTimeWrapper::with_secs_nano(4, 56).unwrap()),
+                Some(Time::with_secs_nano(4, 56).unwrap()),
                 None,
-                Some(NaiveTimeWrapper::with_secs_nano(4, 56).unwrap()),
-                Some(NaiveTimeWrapper::with_secs_nano(7, 89).unwrap())] },
-                column! { NaiveDateTimeArray, [
-                Some(NaiveDateTimeWrapper::with_secs_nsecs(1, 23).unwrap()),
-                Some(NaiveDateTimeWrapper::with_secs_nsecs(4, 56).unwrap()),
-                Some(NaiveDateTimeWrapper::with_secs_nsecs(7, 89).unwrap()),
-                Some(NaiveDateTimeWrapper::with_secs_nsecs(4, 56).unwrap()),
+                Some(Time::with_secs_nano(4, 56).unwrap()),
+                Some(Time::with_secs_nano(7, 89).unwrap())] },
+                column! { TimestampArray, [
+                Some(Timestamp::with_secs_nsecs(1, 23).unwrap()),
+                Some(Timestamp::with_secs_nsecs(4, 56).unwrap()),
+                Some(Timestamp::with_secs_nsecs(7, 89).unwrap()),
+                Some(Timestamp::with_secs_nsecs(4, 56).unwrap()),
                 None] },
                 column! { IntervalArray, [
                 None,
-                Some(IntervalUnit::from_month_day_usec(1, 2, 3)),
+                Some(Interval::from_month_day_usec(1, 2, 3)),
                 None,
-                Some(IntervalUnit::from_month_day_usec(4, 5, 6)),
+                Some(Interval::from_month_day_usec(4, 5, 6)),
                 None] },
             ],
             5,
@@ -478,21 +475,21 @@ mod tests {
         // .     7:89  .
         let output_chunk = DataChunk::new(
             vec![
-                column! { NaiveTimeArray, [
-                Some(NaiveTimeWrapper::with_secs_nano(4, 56).unwrap()),
-                Some(NaiveTimeWrapper::with_secs_nano(4, 56).unwrap()),
-                Some(NaiveTimeWrapper::with_secs_nano(7, 89).unwrap()),
+                column! { TimeArray, [
+                Some(Time::with_secs_nano(4, 56).unwrap()),
+                Some(Time::with_secs_nano(4, 56).unwrap()),
+                Some(Time::with_secs_nano(7, 89).unwrap()),
                 None,
                 None] },
-                column! { NaiveDateTimeArray, [
-                Some(NaiveDateTimeWrapper::with_secs_nsecs(4, 56).unwrap()),
-                Some(NaiveDateTimeWrapper::with_secs_nsecs(4, 56).unwrap()),
+                column! { TimestampArray, [
+                Some(Timestamp::with_secs_nsecs(4, 56).unwrap()),
+                Some(Timestamp::with_secs_nsecs(4, 56).unwrap()),
                 None,
-                Some(NaiveDateTimeWrapper::with_secs_nsecs(1, 23).unwrap()),
-                Some(NaiveDateTimeWrapper::with_secs_nsecs(7, 89).unwrap())] },
+                Some(Timestamp::with_secs_nsecs(1, 23).unwrap()),
+                Some(Timestamp::with_secs_nsecs(7, 89).unwrap())] },
                 column! { IntervalArray, [
-                Some(IntervalUnit::from_month_day_usec(4, 5, 6)),
-                Some(IntervalUnit::from_month_day_usec(1, 2, 3)),
+                Some(Interval::from_month_day_usec(4, 5, 6)),
+                Some(Interval::from_month_day_usec(1, 2, 3)),
                 None,
                 None,
                 None] },
@@ -564,13 +561,13 @@ mod tests {
                     struct_builder.append(Some(StructRef::ValueRef {
                         val: &StructValue::new(vec![
                             Some("abcd".into()),
-                            Some(OrderedF32::from(-1.2).to_scalar_value()),
+                            Some(F32::from(-1.2).to_scalar_value()),
                         ]),
                     }));
                     struct_builder.append(Some(StructRef::ValueRef {
                         val: &StructValue::new(vec![
                             Some("c".into()),
-                            Some(OrderedF32::from(0.0).to_scalar_value()),
+                            Some(F32::from(0.0).to_scalar_value()),
                         ]),
                     }));
                     struct_builder.append(Some(StructRef::ValueRef {
@@ -579,14 +576,11 @@ mod tests {
                     struct_builder.append(Some(StructRef::ValueRef {
                         val: &StructValue::new(vec![
                             Some("c".into()),
-                            Some(OrderedF32::from(0.0).to_scalar_value()),
+                            Some(F32::from(0.0).to_scalar_value()),
                         ]),
                     }));
                     struct_builder.append(Some(StructRef::ValueRef {
-                        val: &StructValue::new(vec![
-                            None,
-                            Some(OrderedF32::from(3.4).to_scalar_value()),
-                        ]),
+                        val: &StructValue::new(vec![None, Some(F32::from(3.4).to_scalar_value())]),
                     }));
                     struct_builder.finish().into()
                 },
@@ -633,29 +627,26 @@ mod tests {
                     struct_builder.append(Some(StructRef::ValueRef {
                         val: &StructValue::new(vec![
                             Some("abcd".into()),
-                            Some(OrderedF32::from(-1.2).to_scalar_value()),
+                            Some(F32::from(-1.2).to_scalar_value()),
                         ]),
                     }));
                     struct_builder.append(Some(StructRef::ValueRef {
                         val: &StructValue::new(vec![
                             Some("c".into()),
-                            Some(OrderedF32::from(0.0).to_scalar_value()),
+                            Some(F32::from(0.0).to_scalar_value()),
                         ]),
                     }));
                     struct_builder.append(Some(StructRef::ValueRef {
                         val: &StructValue::new(vec![
                             Some("c".into()),
-                            Some(OrderedF32::from(0.0).to_scalar_value()),
+                            Some(F32::from(0.0).to_scalar_value()),
                         ]),
                     }));
                     struct_builder.append(Some(StructRef::ValueRef {
                         val: &StructValue::new(vec![Some("c".into()), None]),
                     }));
                     struct_builder.append(Some(StructRef::ValueRef {
-                        val: &StructValue::new(vec![
-                            None,
-                            Some(OrderedF32::from(3.4).to_scalar_value()),
-                        ]),
+                        val: &StructValue::new(vec![None, Some(F32::from(3.4).to_scalar_value())]),
                     }));
                     struct_builder.finish().into()
                 },
diff --git a/src/batch/src/executor/project.rs b/src/batch/src/executor/project.rs
index 024eac9455d92..6a3b81e5ef7b8 100644
--- a/src/batch/src/executor/project.rs
+++ b/src/batch/src/executor/project.rs
@@ -12,13 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use futures_async_stream::try_stream;
+use std::sync::Arc;
+
+use futures::{Stream, StreamExt};
 use itertools::Itertools;
 use risingwave_common::array::column::Column;
 use risingwave_common::array::DataChunk;
 use risingwave_common::catalog::{Field, Schema};
 use risingwave_common::error::{Result, RwError};
-use risingwave_expr::expr::{build_from_prost, BoxedExpression};
+use risingwave_expr::expr::{build_from_prost, BoxedExpression, Expression};
+use risingwave_expr::ExprError;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 
 use crate::executor::{
@@ -43,26 +46,36 @@ impl Executor for ProjectExecutor {
     }
 
     fn execute(self: Box<Self>) -> BoxedDataChunkStream {
-        self.do_execute()
+        (*self).do_execute().boxed()
     }
 }
 
 impl ProjectExecutor {
-    #[try_stream(boxed, ok = DataChunk, error = RwError)]
-    async fn do_execute(mut self: Box<Self>) {
-        #[for_await]
-        for data_chunk in self.child.execute() {
-            let data_chunk = data_chunk?;
-            // let data_chunk = data_chunk.compact();
-            let mut arrays = Vec::with_capacity(self.expr.len());
-            for expr in &mut self.expr {
-                let column = Column::new(expr.eval(&data_chunk).await?);
-                arrays.push(column);
-            }
-            let (_, vis) = data_chunk.into_parts();
-            let ret = DataChunk::new(arrays, vis);
-            yield ret
-        }
+    fn do_execute(self) -> impl Stream<Item = Result<DataChunk>> + 'static {
+        let Self { expr, child, .. } = self;
+        let expr: Arc<[Box<dyn Expression>]> = expr.into();
+        child
+            .execute()
+            .map(move |data_chunk| {
+                let expr = expr.clone();
+                async move {
+                    let data_chunk = data_chunk?;
+                    let arrays = {
+                        let data_chunk = &data_chunk;
+                        let expr_futs = expr.iter().map(|expr| async move {
+                            Ok::<_, ExprError>(Column::new(expr.eval(data_chunk).await?))
+                        });
+                        let arrays: Vec<Column> = futures::future::join_all(expr_futs)
+                            .await
+                            .into_iter()
+                            .try_collect()?;
+                        arrays
+                    };
+                    let (_, vis) = data_chunk.into_parts();
+                    Ok::<_, RwError>(DataChunk::new(arrays, vis))
+                }
+            })
+            .buffered(16)
     }
 }
 
diff --git a/src/batch/src/executor/row_seq_scan.rs b/src/batch/src/executor/row_seq_scan.rs
index d8ac75300809b..5b8b97cf8bd5b 100644
--- a/src/batch/src/executor/row_seq_scan.rs
+++ b/src/batch/src/executor/row_seq_scan.rs
@@ -26,10 +26,10 @@ use risingwave_common::row::{OwnedRow, Row};
 use risingwave_common::types::{DataType, Datum};
 use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
 use risingwave_common::util::select_all;
-use risingwave_common::util::sort_util::{Direction, OrderType};
+use risingwave_common::util::sort_util::OrderType;
 use risingwave_common::util::value_encoding::deserialize_datum;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
-use risingwave_pb::batch_plan::{scan_range, ScanRange as ProstScanRange};
+use risingwave_pb::batch_plan::{scan_range, PbScanRange};
 use risingwave_pb::common::BatchQueryEpoch;
 use risingwave_pb::plan_common::StorageTableDesc;
 use risingwave_storage::store::PrefetchOptions;
@@ -75,7 +75,7 @@ impl ScanRange {
 
     /// Create a scan range from the prost representation.
     pub fn new(
-        scan_range: ProstScanRange,
+        scan_range: PbScanRange,
         mut pk_types: impl Iterator<Item = DataType>,
     ) -> Result<Self> {
         let pk_prefix = OwnedRow::new(
@@ -202,19 +202,19 @@ impl BoxedExecutorBuilder for RowSeqScanExecutorBuilder {
             .map(|k| k.column_index as usize)
             .collect_vec();
 
-        let dist_key_indices = table_desc
-            .dist_key_indices
+        let dist_key_in_pk_indices = table_desc
+            .dist_key_in_pk_indices
             .iter()
             .map(|&k| k as usize)
             .collect_vec();
         let distribution = match &seq_scan_node.vnode_bitmap {
             Some(vnodes) => Distribution {
                 vnodes: Bitmap::from(vnodes).into(),
-                dist_key_indices,
+                dist_key_in_pk_indices,
             },
             // This is possible for dml. vnode_bitmap is not filled by scheduler.
             // Or it's single distribution, e.g., distinct agg. We scan in a single executor.
-            None => Distribution::all_vnodes(dist_key_indices),
+            None => Distribution::all_vnodes(dist_key_in_pk_indices),
         };
 
         let table_option = TableOption {
@@ -406,9 +406,10 @@ impl<S: StateStore> RowSeqScanExecutor<S> {
         } = scan_range;
 
         let (start_bound, end_bound) =
-            match table.pk_serializer().get_order_types()[pk_prefix.len()].direction() {
-                Direction::Ascending => (next_col_bounds.0, next_col_bounds.1),
-                Direction::Descending => (next_col_bounds.1, next_col_bounds.0),
+            if table.pk_serializer().get_order_types()[pk_prefix.len()].is_ascending() {
+                (next_col_bounds.0, next_col_bounds.1)
+            } else {
+                (next_col_bounds.1, next_col_bounds.0)
             };
 
         // Range Scan.
diff --git a/src/batch/src/executor/sort_agg.rs b/src/batch/src/executor/sort_agg.rs
index b967ffc82a508..c8de03a8e6990 100644
--- a/src/batch/src/executor/sort_agg.rs
+++ b/src/batch/src/executor/sort_agg.rs
@@ -287,13 +287,11 @@ mod tests {
     use risingwave_common::catalog::{Field, Schema};
     use risingwave_common::test_prelude::DataChunkTestExt;
     use risingwave_common::types::DataType;
-    use risingwave_expr::expr::build_from_prost;
+    use risingwave_expr::expr::build_from_pretty;
     use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::DataType as ProstDataType;
+    use risingwave_pb::data::PbDataType;
     use risingwave_pb::expr::agg_call::Type;
-    use risingwave_pb::expr::expr_node::RexNode;
-    use risingwave_pb::expr::expr_node::Type::InputRef;
-    use risingwave_pb::expr::{AggCall, ExprNode, InputRef as ProstInputRef};
+    use risingwave_pb::expr::{AggCall, PbInputRef};
 
     use super::*;
     use crate::executor::test_utils::MockExecutor;
@@ -439,17 +437,8 @@ mod tests {
 
         let count_star = AggStateFactory::new(&prost)?.create_agg_state();
         let group_exprs: Vec<_> = (1..=2)
-            .map(|idx| {
-                build_from_prost(&ExprNode {
-                    expr_type: InputRef as i32,
-                    return_type: Some(ProstDataType {
-                        type_name: TypeName::Int32 as i32,
-                        ..Default::default()
-                    }),
-                    rex_node: Some(RexNode::InputRef(idx as _)),
-                })
-            })
-            .try_collect()?;
+            .map(|idx| build_from_pretty(format!("${idx}:int4")))
+            .collect();
 
         let sorted_groupers: Vec<_> = group_exprs
             .iter()
@@ -550,14 +539,14 @@ mod tests {
 
         let prost = AggCall {
             r#type: Type::Sum as i32,
-            args: vec![ProstInputRef {
+            args: vec![PbInputRef {
                 index: 0,
-                r#type: Some(ProstDataType {
+                r#type: Some(PbDataType {
                     type_name: TypeName::Int32 as i32,
                     ..Default::default()
                 }),
             }],
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: TypeName::Int64 as i32,
                 ..Default::default()
             }),
@@ -635,14 +624,14 @@ mod tests {
 
         let prost = AggCall {
             r#type: Type::Sum as i32,
-            args: vec![ProstInputRef {
+            args: vec![PbInputRef {
                 index: 0,
-                r#type: Some(ProstDataType {
+                r#type: Some(PbDataType {
                     type_name: TypeName::Int32 as i32,
                     ..Default::default()
                 }),
             }],
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: TypeName::Int64 as i32,
                 ..Default::default()
             }),
@@ -653,17 +642,8 @@ mod tests {
 
         let sum_agg = AggStateFactory::new(&prost)?.create_agg_state();
         let group_exprs: Vec<_> = (1..=2)
-            .map(|idx| {
-                build_from_prost(&ExprNode {
-                    expr_type: InputRef as i32,
-                    return_type: Some(ProstDataType {
-                        type_name: TypeName::Int32 as i32,
-                        ..Default::default()
-                    }),
-                    rex_node: Some(RexNode::InputRef(idx as _)),
-                })
-            })
-            .try_collect()?;
+            .map(|idx| build_from_pretty(format!("${idx}:int4")))
+            .collect();
 
         let sorted_groupers: Vec<_> = group_exprs
             .iter()
@@ -759,14 +739,14 @@ mod tests {
 
         let prost = AggCall {
             r#type: Type::Sum as i32,
-            args: vec![ProstInputRef {
+            args: vec![PbInputRef {
                 index: 0,
-                r#type: Some(ProstDataType {
+                r#type: Some(PbDataType {
                     type_name: TypeName::Int32 as i32,
                     ..Default::default()
                 }),
             }],
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: TypeName::Int64 as i32,
                 ..Default::default()
             }),
@@ -777,17 +757,8 @@ mod tests {
 
         let sum_agg = AggStateFactory::new(&prost)?.create_agg_state();
         let group_exprs: Vec<_> = (1..=2)
-            .map(|idx| {
-                build_from_prost(&ExprNode {
-                    expr_type: InputRef as i32,
-                    return_type: Some(ProstDataType {
-                        type_name: TypeName::Int32 as i32,
-                        ..Default::default()
-                    }),
-                    rex_node: Some(RexNode::InputRef(idx as _)),
-                })
-            })
-            .try_collect()?;
+            .map(|idx| build_from_pretty(format!("${idx}:int4")))
+            .collect();
 
         let sorted_groupers: Vec<_> = group_exprs
             .iter()
diff --git a/src/batch/src/executor/table_function.rs b/src/batch/src/executor/table_function.rs
index 3ce3374253957..60fc2480b9037 100644
--- a/src/batch/src/executor/table_function.rs
+++ b/src/batch/src/executor/table_function.rs
@@ -13,9 +13,10 @@
 // limitations under the License.
 
 use futures_async_stream::try_stream;
-use risingwave_common::array::DataChunk;
+use risingwave_common::array::{ArrayImpl, DataChunk};
 use risingwave_common::catalog::{Field, Schema};
 use risingwave_common::error::{Result, RwError};
+use risingwave_common::types::DataType;
 use risingwave_expr::table_function::{build_from_prost, BoxedTableFunction};
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 
@@ -58,8 +59,10 @@ impl TableFunctionExecutor {
             len += array.len();
             builder.append_array(&array);
         }
-        let ret = DataChunk::new(vec![builder.finish().into()], len);
-        yield ret
+        yield match builder.finish() {
+            ArrayImpl::Struct(s) => DataChunk::from(s),
+            array => DataChunk::new(vec![array.into()], len),
+        };
     }
 }
 
@@ -88,10 +91,17 @@ impl BoxedExecutorBuilder for TableFunctionExecutorBuilder {
 
         let table_function = build_from_prost(node.table_function.as_ref().unwrap(), chunk_size)?;
 
-        let fields = vec![Field::unnamed(table_function.return_type())];
+        let schema = if let DataType::Struct(fields) = table_function.return_type() {
+            (&*fields).into()
+        } else {
+            Schema {
+                // TODO: should be named
+                fields: vec![Field::unnamed(table_function.return_type())],
+            }
+        };
 
         Ok(Box::new(TableFunctionExecutor {
-            schema: Schema { fields },
+            schema,
             identity,
             table_function,
             chunk_size,
diff --git a/src/batch/src/executor/test_utils.rs b/src/batch/src/executor/test_utils.rs
index cad53e7d70fab..b0af6e5ae7d71 100644
--- a/src/batch/src/executor/test_utils.rs
+++ b/src/batch/src/executor/test_utils.rs
@@ -27,7 +27,7 @@ use risingwave_common::row::Row;
 use risingwave_common::types::{DataType, Datum, ToOwnedDatum};
 use risingwave_common::util::iter_util::{ZipEqDebug, ZipEqFast};
 use risingwave_expr::expr::BoxedExpression;
-use risingwave_pb::batch_plan::ExchangeSource as ProstExchangeSource;
+use risingwave_pb::batch_plan::PbExchangeSource;
 
 use crate::exchange_source::{ExchangeSource, ExchangeSourceImpl};
 use crate::executor::{
@@ -66,6 +66,7 @@ pub fn gen_sorted_data(
     batch_num: usize,
     start: String,
     step: u64,
+    offset: u64,
 ) -> Vec<DataChunk> {
     let mut data_gen = FieldGeneratorImpl::with_number_sequence(
         DataType::Int64,
@@ -73,6 +74,7 @@ pub fn gen_sorted_data(
         Some(i64::MAX.to_string()),
         0,
         step,
+        offset,
     )
     .unwrap();
     let mut ret = Vec::<DataChunk>::with_capacity(batch_num);
@@ -288,7 +290,7 @@ impl CreateSource for FakeCreateSource {
     async fn create_source(
         &self,
         _: impl BatchTaskContext,
-        _: &ProstExchangeSource,
+        _: &PbExchangeSource,
     ) -> Result<ExchangeSourceImpl> {
         Ok(ExchangeSourceImpl::Fake(self.fake_exchange_source.clone()))
     }
diff --git a/src/batch/src/executor/top_n.rs b/src/batch/src/executor/top_n.rs
index 37aaba8f8b95d..6ae829bdf5224 100644
--- a/src/batch/src/executor/top_n.rs
+++ b/src/batch/src/executor/top_n.rs
@@ -23,7 +23,7 @@ use risingwave_common::array::DataChunk;
 use risingwave_common::catalog::Schema;
 use risingwave_common::error::{Result, RwError};
 use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
-use risingwave_common::util::encoding_for_comparison::encode_chunk;
+use risingwave_common::util::memcmp_encoding::encode_chunk;
 use risingwave_common::util::sort_util::ColumnOrder;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 
diff --git a/src/batch/src/rpc/service/task_service.rs b/src/batch/src/rpc/service/task_service.rs
index b6b710127a8f0..a343685bde8c3 100644
--- a/src/batch/src/rpc/service/task_service.rs
+++ b/src/batch/src/rpc/service/task_service.rs
@@ -18,7 +18,7 @@ use std::sync::Arc;
 use risingwave_pb::batch_plan::TaskOutputId;
 use risingwave_pb::task_service::task_service_server::TaskService;
 use risingwave_pb::task_service::{
-    AbortTaskRequest, AbortTaskResponse, CreateTaskRequest, ExecuteRequest, GetDataResponse,
+    CancelTaskRequest, CancelTaskResponse, CreateTaskRequest, ExecuteRequest, GetDataResponse,
     TaskInfoResponse,
 };
 use tokio_stream::wrappers::ReceiverStream;
@@ -95,17 +95,15 @@ impl TaskService for BatchServiceImpl {
     }
 
     #[cfg_attr(coverage, no_coverage)]
-    async fn abort_task(
+    async fn cancel_task(
         &self,
-        req: Request<AbortTaskRequest>,
-    ) -> Result<Response<AbortTaskResponse>, Status> {
+        req: Request<CancelTaskRequest>,
+    ) -> Result<Response<CancelTaskResponse>, Status> {
         let req = req.into_inner();
         tracing::trace!("Aborting task: {:?}", req.get_task_id().unwrap());
-        self.mgr.abort_task(
-            req.get_task_id().expect("no task id found"),
-            "abort task request".to_string(),
-        );
-        Ok(Response::new(AbortTaskResponse { status: None }))
+        self.mgr
+            .cancel_task(req.get_task_id().expect("no task id found"));
+        Ok(Response::new(CancelTaskResponse { status: None }))
     }
 
     #[cfg_attr(coverage, no_coverage)]
diff --git a/src/batch/src/task/consistent_hash_shuffle_channel.rs b/src/batch/src/task/consistent_hash_shuffle_channel.rs
index 7e7abc75dbc1d..336b8c98c2879 100644
--- a/src/batch/src/task/consistent_hash_shuffle_channel.rs
+++ b/src/batch/src/task/consistent_hash_shuffle_channel.rs
@@ -21,7 +21,7 @@ use anyhow::anyhow;
 use itertools::Itertools;
 use risingwave_common::array::DataChunk;
 use risingwave_common::buffer::Bitmap;
-use risingwave_common::util::hash_util::Crc32FastBuilder;
+use risingwave_common::hash::VirtualNode;
 use risingwave_pb::batch_plan::exchange_info::ConsistentHashInfo;
 use risingwave_pb::batch_plan::*;
 use tokio::sync::mpsc;
@@ -54,20 +54,20 @@ fn generate_hash_values(
     chunk: &DataChunk,
     consistent_hash_info: &ConsistentHashInfo,
 ) -> BatchResult<Vec<usize>> {
-    let hasher_builder = Crc32FastBuilder;
-
-    let hash_values = chunk
-        .get_hash_values(
-            &consistent_hash_info
-                .key
-                .iter()
-                .map(|idx| *idx as usize)
-                .collect::<Vec<_>>(),
-            hasher_builder,
-        )
-        .iter_mut()
-        .map(|hash_value| consistent_hash_info.vmap[hash_value.to_vnode().to_index()] as usize)
+    let vnodes = VirtualNode::compute_chunk(
+        chunk,
+        &consistent_hash_info
+            .key
+            .iter()
+            .map(|idx| *idx as usize)
+            .collect::<Vec<_>>(),
+    );
+
+    let hash_values = vnodes
+        .iter()
+        .map(|vnode| consistent_hash_info.vmap[vnode.to_index()] as usize)
         .collect::<Vec<_>>();
+
     Ok(hash_values)
 }
 
diff --git a/src/batch/src/task/data_chunk_in_channel.rs b/src/batch/src/task/data_chunk_in_channel.rs
index 984c451e8119a..afb74a6e47203 100644
--- a/src/batch/src/task/data_chunk_in_channel.rs
+++ b/src/batch/src/task/data_chunk_in_channel.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use risingwave_common::array::DataChunk;
-use risingwave_pb::data::DataChunk as ProstDataChunk;
+use risingwave_pb::data::PbDataChunk;
 use tokio::sync::OnceCell;
 
 #[derive(Debug, Clone)]
@@ -21,7 +21,7 @@ pub(super) struct DataChunkInChannel {
     data_chunk: DataChunk,
     /// If the data chunk is only needed to transfer locally,
     /// this field should not be initialized.
-    prost_data_chunk: OnceCell<ProstDataChunk>,
+    prost_data_chunk: OnceCell<PbDataChunk>,
 }
 
 impl DataChunkInChannel {
@@ -32,7 +32,7 @@ impl DataChunkInChannel {
         }
     }
 
-    pub async fn to_protobuf(&self) -> ProstDataChunk {
+    pub async fn to_protobuf(&self) -> PbDataChunk {
         let prost_data_chunk = self
             .prost_data_chunk
             .get_or_init(|| async {
diff --git a/src/batch/src/task/task_execution.rs b/src/batch/src/task/task_execution.rs
index 4f37fc4fd2914..c9db773eab4a4 100644
--- a/src/batch/src/task/task_execution.rs
+++ b/src/batch/src/task/task_execution.rs
@@ -14,17 +14,16 @@
 
 use std::fmt::{Debug, Formatter};
 use std::future::Future;
+use std::panic::AssertUnwindSafe;
 use std::sync::Arc;
 use std::time::Duration;
 
-use futures::StreamExt;
+use futures::{FutureExt, StreamExt};
 use minitrace::prelude::*;
 use parking_lot::Mutex;
 use risingwave_common::array::DataChunk;
 use risingwave_common::error::{ErrorCode, Result, RwError};
-use risingwave_pb::batch_plan::{
-    PlanFragment, TaskId as ProstTaskId, TaskOutputId as ProstOutputId,
-};
+use risingwave_pb::batch_plan::{PbTaskId, PbTaskOutputId, PlanFragment};
 use risingwave_pb::common::BatchQueryEpoch;
 use risingwave_pb::task_service::task_info_response::TaskStatus;
 use risingwave_pb::task_service::{GetDataResponse, TaskInfoResponse};
@@ -139,8 +138,8 @@ impl Debug for TaskOutputId {
     }
 }
 
-impl From<&ProstTaskId> for TaskId {
-    fn from(prost: &ProstTaskId) -> Self {
+impl From<&PbTaskId> for TaskId {
+    fn from(prost: &PbTaskId) -> Self {
         TaskId {
             task_id: prost.task_id,
             stage_id: prost.stage_id,
@@ -150,8 +149,8 @@ impl From<&ProstTaskId> for TaskId {
 }
 
 impl TaskId {
-    pub fn to_prost(&self) -> ProstTaskId {
-        ProstTaskId {
+    pub fn to_prost(&self) -> PbTaskId {
+        PbTaskId {
             task_id: self.task_id,
             stage_id: self.stage_id,
             query_id: self.query_id.clone(),
@@ -159,10 +158,10 @@ impl TaskId {
     }
 }
 
-impl TryFrom<&ProstOutputId> for TaskOutputId {
+impl TryFrom<&PbTaskOutputId> for TaskOutputId {
     type Error = RwError;
 
-    fn try_from(prost: &ProstOutputId) -> Result<Self> {
+    fn try_from(prost: &PbTaskOutputId) -> Result<Self> {
         Ok(TaskOutputId {
             task_id: TaskId::from(prost.get_task_id()?),
             output_id: prost.get_output_id(),
@@ -171,8 +170,8 @@ impl TryFrom<&ProstOutputId> for TaskOutputId {
 }
 
 impl TaskOutputId {
-    pub fn to_prost(&self) -> ProstOutputId {
-        ProstOutputId {
+    pub fn to_prost(&self) -> PbTaskOutputId {
+        PbTaskOutputId {
             task_id: Some(self.task_id.to_prost()),
             output_id: self.output_id,
         }
@@ -299,7 +298,7 @@ pub struct BatchTaskExecution<C> {
 
 impl<C: BatchTaskContext> BatchTaskExecution<C> {
     pub fn new(
-        prost_tid: &ProstTaskId,
+        prost_tid: &PbTaskId,
         plan: PlanFragment,
         context: C,
         epoch: BatchQueryEpoch,
@@ -372,7 +371,6 @@ impl<C: BatchTaskContext> BatchTaskExecution<C> {
 
         // Clone `self` to make compiler happy because of the move block.
         let t_1 = self.clone();
-        let t_2 = self.clone();
         // Spawn task for real execution.
         let fut = async move {
             trace!("Executing plan [{:?}]", task_id);
@@ -396,9 +394,9 @@ impl<C: BatchTaskContext> BatchTaskExecution<C> {
 
             if let Some(task_metrics) = task_metrics {
                 let monitor = TaskMonitor::new();
-                let join_handle = t_2.runtime.spawn(monitor.instrument(task(task_id.clone())));
-                if let Err(join_error) = join_handle.await && join_error.is_panic() {
-                    error!("Batch task {:?} panic!", task_id);
+                let instrumented_task = AssertUnwindSafe(monitor.instrument(task(task_id.clone())));
+                if let Err(error) = instrumented_task.catch_unwind().await {
+                    error!("Batch task {:?} panic: {:?}", task_id, error);
                 }
                 let cumulative = monitor.cumulative();
                 let labels = &task_metrics.task_labels();
@@ -427,11 +425,9 @@ impl<C: BatchTaskContext> BatchTaskExecution<C> {
                     .task_slow_poll_duration
                     .with_label_values(labels)
                     .set(cumulative.total_slow_poll_duration.as_secs_f64());
-            } else {
-                let join_handle = t_2.runtime.spawn(task(task_id.clone()));
-                if let Err(join_error) = join_handle.await && join_error.is_panic() {
-                    error!("Batch task {:?} panic!", task_id);
-                }
+            } else if let Err(error) = AssertUnwindSafe(task(task_id.clone())).catch_unwind().await
+            {
+                error!("Batch task {:?} panic: {:?}", task_id, error);
             }
         };
 
@@ -448,6 +444,7 @@ impl<C: BatchTaskContext> BatchTaskExecution<C> {
             ctx2,
         );
         self.runtime.spawn(alloc_stat_wrap_fut);
+
         Ok(())
     }
 
@@ -492,8 +489,18 @@ impl<C: BatchTaskContext> BatchTaskExecution<C> {
                 // We prioritize abort signal over normal data chunks.
                 biased;
                 err_reason = &mut shutdown_rx => {
-                    state = TaskStatus::Aborted;
-                    error = Some(Aborted(err_reason.unwrap_or("".to_string())));
+                    match err_reason {
+                        Ok(reason_str) => {
+                            state = TaskStatus::Aborted;
+                            error = Some(Aborted(reason_str));
+                        }
+                        Err(_) => {
+                            // We use early close shutdown channel to cancel task.
+                            // Cancelling a task is different from aborting a task
+                            // in that it's not an error and should not be reported to user.
+                            state = TaskStatus::Cancelled;
+                        }
+                    }
                     break;
                 }
                 res = data_chunk_stream.next() => {
@@ -560,7 +567,7 @@ impl<C: BatchTaskContext> BatchTaskExecution<C> {
         }
     }
 
-    pub fn abort_task(&self, err_msg: String) {
+    pub fn abort(&self, err_msg: String) {
         if let Some(sender) = self.shutdown_tx.lock().take() {
             // No need to set state to be Aborted here cuz it will be set by shutdown receiver.
             // Stop task execution.
@@ -572,7 +579,14 @@ impl<C: BatchTaskContext> BatchTaskExecution<C> {
         };
     }
 
-    pub fn get_task_output(&self, output_id: &ProstOutputId) -> Result<TaskOutput> {
+    pub fn cancel(&self) {
+        if let Some(sender) = self.shutdown_tx.lock().take() {
+            // Drop sender directly to mark cancel without error.
+            drop(sender);
+        };
+    }
+
+    pub fn get_task_output(&self, output_id: &PbTaskOutputId) -> Result<TaskOutput> {
         let task_id = TaskId::from(output_id.get_task_id()?);
         let receiver = self.receivers.lock()[output_id.get_output_id() as usize]
             .take()
diff --git a/src/batch/src/task/task_manager.rs b/src/batch/src/task/task_manager.rs
index b9c89c794bff9..16fdf6ff4f3de 100644
--- a/src/batch/src/task/task_manager.rs
+++ b/src/batch/src/task/task_manager.rs
@@ -21,9 +21,7 @@ use parking_lot::Mutex;
 use risingwave_common::config::BatchConfig;
 use risingwave_common::error::ErrorCode::{self, TaskNotFound};
 use risingwave_common::error::Result;
-use risingwave_pb::batch_plan::{
-    PlanFragment, TaskId as ProstTaskId, TaskOutputId as ProstTaskOutputId,
-};
+use risingwave_pb::batch_plan::{PbTaskId, PbTaskOutputId, PlanFragment};
 use risingwave_pb::common::BatchQueryEpoch;
 use risingwave_pb::task_service::{GetDataResponse, TaskInfoResponse};
 use tokio::runtime::Runtime;
@@ -84,7 +82,7 @@ impl BatchManager {
 
     pub async fn fire_task(
         &self,
-        tid: &ProstTaskId,
+        tid: &PbTaskId,
         plan: PlanFragment,
         epoch: BatchQueryEpoch,
         context: ComputeNodeContext,
@@ -116,7 +114,7 @@ impl BatchManager {
         &self,
         tx: Sender<std::result::Result<GetDataResponse, Status>>,
         peer_addr: SocketAddr,
-        pb_task_output_id: &ProstTaskOutputId,
+        pb_task_output_id: &PbTaskOutputId,
     ) -> Result<()> {
         let task_id = TaskOutputId::try_from(pb_task_output_id)?;
         tracing::trace!(target: "events::compute::exchange", peer_addr = %peer_addr, from = ?task_id, "serve exchange RPC");
@@ -138,7 +136,7 @@ impl BatchManager {
         Ok(())
     }
 
-    pub fn take_output(&self, output_id: &ProstTaskOutputId) -> Result<TaskOutput> {
+    pub fn take_output(&self, output_id: &PbTaskOutputId) -> Result<TaskOutput> {
         let task_id = TaskId::from(output_id.get_task_id()?);
         self.tasks
             .lock()
@@ -147,12 +145,14 @@ impl BatchManager {
             .get_task_output(output_id)
     }
 
-    pub fn abort_task(&self, sid: &ProstTaskId, msg: String) {
+    pub fn cancel_task(&self, sid: &PbTaskId) {
         let sid = TaskId::from(sid);
         match self.tasks.lock().remove(&sid) {
             Some(task) => {
                 tracing::trace!("Removed task: {:?}", task.get_task_id());
-                task.abort_task(msg);
+                // Use `cancel` rather than `abort` here since this is not an error which should be
+                // propagated to upstream.
+                task.cancel();
                 self.metrics.task_num.dec()
             }
             None => {
@@ -234,7 +234,7 @@ impl BatchManager {
             let t = guard.get(&id).unwrap();
             // FIXME: `Abort` will not report error but truncated results to user. We should
             // consider throw error.
-            t.abort_task(reason);
+            t.abort(reason);
         }
     }
 
@@ -260,8 +260,8 @@ mod tests {
     use risingwave_pb::batch_plan::exchange_info::DistributionMode;
     use risingwave_pb::batch_plan::plan_node::NodeBody;
     use risingwave_pb::batch_plan::{
-        ExchangeInfo, PlanFragment, PlanNode, TableFunctionNode, TaskId as ProstTaskId,
-        TaskOutputId as ProstTaskOutputId, ValuesNode,
+        ExchangeInfo, PbTaskId, PbTaskOutputId, PlanFragment, PlanNode, TableFunctionNode,
+        ValuesNode,
     };
     use risingwave_pb::expr::table_function::Type;
     use risingwave_pb::expr::TableFunction;
@@ -285,7 +285,7 @@ mod tests {
             Code::Internal
         );
 
-        let output_id = ProstTaskOutputId {
+        let output_id = PbTaskOutputId {
             task_id: Some(risingwave_pb::batch_plan::TaskId {
                 stage_id: 0,
                 task_id: 0,
@@ -317,7 +317,7 @@ mod tests {
             }),
         };
         let context = ComputeNodeContext::for_test();
-        let task_id = ProstTaskId {
+        let task_id = PbTaskId {
             query_id: "".to_string(),
             stage_id: 0,
             task_id: 0,
@@ -373,7 +373,7 @@ mod tests {
             }),
         };
         let context = ComputeNodeContext::for_test();
-        let task_id = ProstTaskId {
+        let task_id = PbTaskId {
             query_id: "".to_string(),
             stage_id: 0,
             task_id: 0,
@@ -388,7 +388,7 @@ mod tests {
             )
             .await
             .unwrap();
-        manager.abort_task(&task_id, "".to_string());
+        manager.cancel_task(&task_id);
         let task_id = TaskId::from(&task_id);
         assert!(!manager.tasks.lock().contains_key(&task_id));
     }
diff --git a/src/bench/Cargo.toml b/src/bench/Cargo.toml
index 9e51911755b1a..66381379cf4d1 100644
--- a/src/bench/Cargo.toml
+++ b/src/bench/Cargo.toml
@@ -44,7 +44,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
     "signal",
 ] }
 tokio-stream = "0.1"
-toml = "0.5"
+toml = "0.7"
 tracing = "0.1"
 tracing-opentelemetry = { version = "0.17", optional = true }
 tracing-subscriber = "0.3.16"
diff --git a/src/cmd/Cargo.toml b/src/cmd/Cargo.toml
index 7a53b0400a5d0..115cb9d397d1e 100644
--- a/src/cmd/Cargo.toml
+++ b/src/cmd/Cargo.toml
@@ -42,7 +42,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
 workspace-config = { path = "../utils/workspace-config", optional = true }
 workspace-hack = { path = "../workspace-hack" }
 
-[target.'cfg(target_os = "linux")'.dependencies]
+[target.'cfg(unix)'.dependencies]
 tikv-jemallocator = { version = "0.5", features = ["profiling", "stats"] }
 
 [[bin]]
diff --git a/src/cmd/src/bin/compactor.rs b/src/cmd/src/bin/compactor.rs
index 708e849a479c1..1588e7635bea8 100644
--- a/src/cmd/src/bin/compactor.rs
+++ b/src/cmd/src/bin/compactor.rs
@@ -14,9 +14,9 @@
 
 #![cfg_attr(coverage, feature(no_coverage))]
 
-use risingwave_common::enable_jemalloc_on_linux;
+use risingwave_common::enable_jemalloc_on_unix;
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 #[cfg_attr(coverage, no_coverage)]
 fn main() {
diff --git a/src/cmd/src/bin/compute_node.rs b/src/cmd/src/bin/compute_node.rs
index cfef0e095f9bc..a15d9b206ba8a 100644
--- a/src/cmd/src/bin/compute_node.rs
+++ b/src/cmd/src/bin/compute_node.rs
@@ -14,9 +14,9 @@
 
 #![cfg_attr(coverage, feature(no_coverage))]
 
-use risingwave_common::enable_task_local_jemalloc_on_linux;
+use risingwave_common::enable_task_local_jemalloc_on_unix;
 
-enable_task_local_jemalloc_on_linux!();
+enable_task_local_jemalloc_on_unix!();
 
 #[cfg_attr(coverage, no_coverage)]
 fn main() {
diff --git a/src/cmd/src/bin/ctl.rs b/src/cmd/src/bin/ctl.rs
index af694b694bd29..ca529a919e734 100644
--- a/src/cmd/src/bin/ctl.rs
+++ b/src/cmd/src/bin/ctl.rs
@@ -15,9 +15,9 @@
 #![cfg_attr(coverage, feature(no_coverage))]
 
 use anyhow::Result;
-use risingwave_common::enable_jemalloc_on_linux;
+use risingwave_common::enable_jemalloc_on_unix;
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 #[cfg_attr(coverage, no_coverage)]
 fn main() -> Result<()> {
diff --git a/src/cmd/src/bin/frontend_node.rs b/src/cmd/src/bin/frontend_node.rs
index 1c212e83964b1..5c5c4f66c473d 100644
--- a/src/cmd/src/bin/frontend_node.rs
+++ b/src/cmd/src/bin/frontend_node.rs
@@ -14,9 +14,9 @@
 
 #![cfg_attr(coverage, feature(no_coverage))]
 
-use risingwave_common::enable_jemalloc_on_linux;
+use risingwave_common::enable_jemalloc_on_unix;
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 #[cfg_attr(coverage, no_coverage)]
 fn main() {
diff --git a/src/cmd/src/bin/meta_node.rs b/src/cmd/src/bin/meta_node.rs
index d8096a6ff9a4b..2b83291038532 100644
--- a/src/cmd/src/bin/meta_node.rs
+++ b/src/cmd/src/bin/meta_node.rs
@@ -14,9 +14,9 @@
 
 #![cfg_attr(coverage, feature(no_coverage))]
 
-use risingwave_common::enable_jemalloc_on_linux;
+use risingwave_common::enable_jemalloc_on_unix;
 
-enable_jemalloc_on_linux!();
+enable_jemalloc_on_unix!();
 
 #[cfg_attr(coverage, no_coverage)]
 fn main() {
diff --git a/src/cmd_all/Cargo.toml b/src/cmd_all/Cargo.toml
index a8b02c9c99c70..8ad41939680c7 100644
--- a/src/cmd_all/Cargo.toml
+++ b/src/cmd_all/Cargo.toml
@@ -43,7 +43,7 @@ tracing = { version = "0.1" }
 workspace-config = { path = "../utils/workspace-config", optional = true }
 workspace-hack = { path = "../workspace-hack" }
 
-[target.'cfg(target_os = "linux")'.dependencies]
+[target.'cfg(unix)'.dependencies]
 tikv-jemallocator = { version = "0.5", features = ["profiling", "stats"] }
 
 [[bin]]
diff --git a/src/cmd_all/src/bin/risingwave.rs b/src/cmd_all/src/bin/risingwave.rs
index 5c014b9001194..1556682843267 100644
--- a/src/cmd_all/src/bin/risingwave.rs
+++ b/src/cmd_all/src/bin/risingwave.rs
@@ -21,10 +21,10 @@ use std::env;
 use anyhow::{bail, Result};
 use clap::Parser;
 use risingwave_cmd_all::playground;
-use risingwave_common::enable_task_local_jemalloc_on_linux;
+use risingwave_common::enable_task_local_jemalloc_on_unix;
 use tracing::Level;
 
-enable_task_local_jemalloc_on_linux!();
+enable_task_local_jemalloc_on_unix!();
 
 type RwFns = HashMap<&'static str, Box<dyn Fn(Vec<String>) -> Result<()>>>;
 
diff --git a/src/cmd_all/src/playground.rs b/src/cmd_all/src/playground.rs
index 503e43fcd57b1..aa5c399963399 100644
--- a/src/cmd_all/src/playground.rs
+++ b/src/cmd_all/src/playground.rs
@@ -242,7 +242,7 @@ pub async fn playground() -> Result<()> {
                     let _stderr_handle = tokio::spawn(async move {
                         let mut reader = BufReader::new(stderr).lines();
                         while let Ok(Some(line)) = reader.next_line().await {
-                            tracing::error!(target: "risingwave_connector_node", "{}", line);
+                            tracing::info!(target: "risingwave_connector_node", "{}", line);
                         }
                     });
                 } else {
diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml
index 1e368fd77e550..d56683ad464e7 100644
--- a/src/common/Cargo.toml
+++ b/src/common/Cargo.toml
@@ -19,11 +19,14 @@ arc-swap = "1"
 arrow-array = "34"
 arrow-schema = "34"
 async-trait = "0.1"
-auto_enums = "0.7"
-bitflags = "1.3.2"
+auto_enums = "0.8"
+bitflags = "2"
 byteorder = "1"
 bytes = "1"
-chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
+chrono = { version = "0.4", default-features = false, features = [
+    "clock",
+    "std",
+] }
 chrono-tz = { version = "0.7", features = ["case-insensitive"] }
 clap = { version = "4", features = ["derive"] }
 comfy-table = "6"
@@ -44,11 +47,16 @@ num-traits = "0.2"
 parking_lot = "0.12"
 parse-display = "0.6"
 paste = "1"
-postgres-types = { version = "0.2.4", features = ["derive","with-chrono-0_4","with-serde_json-1"] }
+postgres-types = { version = "0.2.4", features = [
+    "derive",
+    "with-chrono-0_4",
+    "with-serde_json-1",
+] }
 prometheus = { version = "0.13" }
 prost = "0.11"
 rand = "0.8"
 regex = "1"
+reqwest = { version = "0.11", features = ["json"] }
 risingwave_pb = { path = "../prost" }
 rust_decimal = { version = "1", features = ["db-tokio-postgres"] }
 ryu = "1.0"
@@ -57,13 +65,21 @@ serde_json = "1"
 static_assertions = "1"
 strum = "0.24"
 strum_macros = "0.24"
-sysinfo = "0.26"
+sysinfo = { version = "0.26", default-features = false }
 thiserror = "1"
-tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] }
-toml = "0.5"
+tokio = { version = "0.2", package = "madsim-tokio", features = [
+    "rt",
+    "rt-multi-thread",
+    "sync",
+    "macros",
+    "time",
+    "signal",
+] }
+toml = "0.7"
 tonic = { version = "0.2", package = "madsim-tonic" }
 tracing = "0.1"
 url = "2"
+uuid = "1.2.2"
 
 [target.'cfg(not(madsim))'.dependencies]
 workspace-hack = { path = "../workspace-hack" }
@@ -95,3 +111,11 @@ harness = false
 [[bench]]
 name = "bitmap"
 harness = false
+
+[[bench]]
+name = "bench_hash_key_encoding"
+harness = false
+
+[[bin]]
+name = "example-config"
+path = "src/bin/default_config.rs"
diff --git a/src/common/benches/bench_encoding.rs b/src/common/benches/bench_encoding.rs
index 24eecabd407f4..cbed880ba25e9 100644
--- a/src/common/benches/bench_encoding.rs
+++ b/src/common/benches/bench_encoding.rs
@@ -18,11 +18,9 @@ use std::sync::Arc;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use risingwave_common::array::{ListValue, StructValue};
 use risingwave_common::types::struct_type::StructType;
-use risingwave_common::types::{
-    memcmp_deserialize_datum_from, memcmp_serialize_datum_into, DataType, Datum, IntervalUnit,
-    NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper, ScalarImpl,
-};
-use risingwave_common::util::value_encoding;
+use risingwave_common::types::{DataType, Date, Datum, Interval, ScalarImpl, Time, Timestamp};
+use risingwave_common::util::sort_util::OrderType;
+use risingwave_common::util::{memcmp_encoding, value_encoding};
 
 const ENV_BENCH_SER: &str = "BENCH_SER";
 const ENV_BENCH_DE: &str = "BENCH_DE";
@@ -45,9 +43,12 @@ impl Case {
 }
 
 fn key_serialization(datum: &Datum) -> Vec<u8> {
-    let mut serializer = memcomparable::Serializer::new(vec![]);
-    memcmp_serialize_datum_into(datum, &mut serializer).unwrap();
-    black_box(serializer.into_inner())
+    let result = memcmp_encoding::encode_value(
+        datum.as_ref().map(ScalarImpl::as_scalar_ref_impl),
+        OrderType::default(),
+    )
+    .unwrap();
+    black_box(result)
 }
 
 fn value_serialization(datum: &Datum) -> Vec<u8> {
@@ -55,8 +56,7 @@ fn value_serialization(datum: &Datum) -> Vec<u8> {
 }
 
 fn key_deserialization(ty: &DataType, datum: &[u8]) {
-    let mut deserializer = memcomparable::Deserializer::new(datum);
-    let result = memcmp_deserialize_datum_from(ty, &mut deserializer);
+    let result = memcmp_encoding::decode_value(ty, datum, OrderType::default()).unwrap();
     let _ = black_box(result);
 }
 
@@ -89,23 +89,15 @@ fn bench_encoding(c: &mut Criterion) {
         Case::new(
             "Interval",
             DataType::Interval,
-            ScalarImpl::Interval(IntervalUnit::default()),
+            ScalarImpl::Interval(Interval::default()),
         ),
+        Case::new("Date", DataType::Date, ScalarImpl::Date(Date::default())),
         Case::new(
-            "NaiveDate",
-            DataType::Date,
-            ScalarImpl::NaiveDate(NaiveDateWrapper::default()),
-        ),
-        Case::new(
-            "NaiveDateTime",
+            "Timestamp",
             DataType::Timestamp,
-            ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::default()),
-        ),
-        Case::new(
-            "NaiveTime",
-            DataType::Time,
-            ScalarImpl::NaiveTime(NaiveTimeWrapper::default()),
+            ScalarImpl::Timestamp(Timestamp::default()),
         ),
+        Case::new("Time", DataType::Time, ScalarImpl::Time(Time::default())),
         Case::new(
             "Utf8 (len = 10)",
             DataType::Varchar,
diff --git a/src/common/benches/bench_hash_key_encoding.rs b/src/common/benches/bench_hash_key_encoding.rs
new file mode 100644
index 0000000000000..882e3d29442c5
--- /dev/null
+++ b/src/common/benches/bench_hash_key_encoding.rs
@@ -0,0 +1,222 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 criterion::{criterion_group, criterion_main, Criterion};
+use itertools::Itertools;
+use risingwave_common::array::column::Column;
+use risingwave_common::array::serial_array::SerialArray;
+use risingwave_common::array::{
+    ArrayBuilderImpl, BoolArray, DataChunk, DateArray, DecimalArray, F32Array, F64Array, I16Array,
+    I32Array, I64Array, IntervalArray, TimeArray, TimestampArray, Utf8Array,
+};
+use risingwave_common::hash::{calc_hash_key_kind, HashKey, HashKeyDispatcher};
+use risingwave_common::test_utils::rand_array::seed_rand_array_ref;
+use risingwave_common::types::DataType;
+
+static SEED: u64 = 998244353u64;
+static CHUNK_SIZES: &[usize] = &[128, 1024];
+static NULL_RATIOS: &[f64] = &[0.0, 0.01, 0.1];
+
+trait Case: Send + 'static {
+    fn bench(&self, c: &mut Criterion);
+}
+type BoxedCase = Box<dyn Case>;
+
+struct HashKeyBenchCaseBuilder {
+    pub data_types: Vec<DataType>,
+    pub describe: String,
+}
+impl HashKeyBenchCaseBuilder {
+    pub fn gen_cases(self) -> Vec<BoxedCase> {
+        self.dispatch()
+    }
+}
+impl HashKeyDispatcher for HashKeyBenchCaseBuilder {
+    type Output = Vec<BoxedCase>;
+
+    fn dispatch_impl<K: HashKey>(self) -> Self::Output {
+        let mut ret: Vec<BoxedCase> = vec![];
+        for null_ratio in NULL_RATIOS {
+            for chunk_size in CHUNK_SIZES {
+                let id = format!(
+                    "{} {:?}, {} rows, Pr[null]={}",
+                    self.describe,
+                    calc_hash_key_kind(self.data_types()),
+                    chunk_size,
+                    null_ratio
+                );
+                let input_chunk = gen_chunk(self.data_types(), *chunk_size, SEED, *null_ratio);
+                ret.push(Box::new(HashKeyBenchCase::<K>::new(
+                    id,
+                    input_chunk,
+                    self.data_types.clone(),
+                )));
+            }
+        }
+        ret
+    }
+
+    fn data_types(&self) -> &[DataType] {
+        &self.data_types
+    }
+}
+
+struct HashKeyBenchCase<K: HashKey> {
+    id: String,
+    input_chunk: DataChunk,
+    keys: Vec<K>,
+    data_types: Vec<DataType>,
+    col_idxes: Vec<usize>,
+}
+
+impl<K: HashKey> HashKeyBenchCase<K> {
+    pub fn new(id: String, input_chunk: DataChunk, data_types: Vec<DataType>) -> Self {
+        // please check the `bench_vec_dser` and `bench_deser` method when want to bench not full
+        // `col_idxes`
+        let col_idxes = (0..input_chunk.columns().len()).collect_vec();
+        let keys = HashKey::build(&col_idxes, &input_chunk).unwrap();
+        Self {
+            id,
+            input_chunk,
+            keys,
+            data_types,
+            col_idxes,
+        }
+    }
+
+    pub fn bench_vec_ser(&self, c: &mut Criterion) {
+        let vectorize_serialize_id = "vec ser ".to_string() + &self.id;
+        c.bench_function(&vectorize_serialize_id, |b| {
+            b.iter(|| K::build(&self.col_idxes, &self.input_chunk).unwrap())
+        });
+    }
+
+    pub fn bench_vec_deser(&self, c: &mut Criterion) {
+        let vectorize_deserialize_id = "vec deser ".to_string() + &self.id;
+        c.bench_function(&vectorize_deserialize_id, |b| {
+            let mut array_builders = self
+                .input_chunk
+                .columns()
+                .iter()
+                .map(|c| c.array_ref().create_builder(self.input_chunk.capacity()))
+                .collect::<Vec<ArrayBuilderImpl>>();
+            b.iter(|| {
+                for key in &self.keys {
+                    key.deserialize_to_builders(&mut array_builders[..], &self.data_types)
+                        .unwrap();
+                }
+            })
+        });
+    }
+
+    pub fn bench_deser(&self, c: &mut Criterion) {
+        let vectorize_deserialize_id = "row deser ".to_string() + &self.id;
+        c.bench_function(&vectorize_deserialize_id, |b| {
+            b.iter(|| {
+                for key in &self.keys {
+                    key.deserialize(&self.data_types).unwrap();
+                }
+            })
+        });
+    }
+}
+impl<K: HashKey> Case for HashKeyBenchCase<K> {
+    fn bench(&self, c: &mut Criterion) {
+        self.bench_vec_ser(c);
+        self.bench_vec_deser(c);
+        self.bench_deser(c);
+    }
+}
+
+fn gen_chunk(data_types: &[DataType], size: usize, seed: u64, null_ratio: f64) -> DataChunk {
+    let mut columns = vec![];
+
+    for d in data_types {
+        columns.push(Column::new(match d {
+            DataType::Boolean => seed_rand_array_ref::<BoolArray>(size, seed, null_ratio),
+            DataType::Int16 => seed_rand_array_ref::<I16Array>(size, seed, null_ratio),
+            DataType::Int32 => seed_rand_array_ref::<I32Array>(size, seed, null_ratio),
+            DataType::Int64 => seed_rand_array_ref::<I64Array>(size, seed, null_ratio),
+            DataType::Float32 => seed_rand_array_ref::<F32Array>(size, seed, null_ratio),
+            DataType::Float64 => seed_rand_array_ref::<F64Array>(size, seed, null_ratio),
+            DataType::Decimal => seed_rand_array_ref::<DecimalArray>(size, seed, null_ratio),
+            DataType::Date => seed_rand_array_ref::<DateArray>(size, seed, null_ratio),
+            DataType::Varchar => seed_rand_array_ref::<Utf8Array>(size, seed, null_ratio),
+            DataType::Time => seed_rand_array_ref::<TimeArray>(size, seed, null_ratio),
+            DataType::Serial => seed_rand_array_ref::<SerialArray>(size, seed, null_ratio),
+            DataType::Timestamp => seed_rand_array_ref::<TimestampArray>(size, seed, null_ratio),
+            DataType::Timestamptz => seed_rand_array_ref::<I64Array>(size, seed, null_ratio),
+            DataType::Interval => seed_rand_array_ref::<IntervalArray>(size, seed, null_ratio),
+            DataType::Struct(_) | DataType::Bytea | DataType::Jsonb => {
+                todo!()
+            }
+            DataType::List { datatype: _ } => {
+                todo!()
+            }
+        }));
+    }
+    risingwave_common::util::schema_check::schema_check(data_types, &columns).unwrap();
+    DataChunk::new(columns, size)
+}
+
+fn case_builders() -> Vec<HashKeyBenchCaseBuilder> {
+    vec![
+        HashKeyBenchCaseBuilder {
+            data_types: vec![DataType::Serial],
+            describe: "Serial".to_string(),
+        },
+        HashKeyBenchCaseBuilder {
+            data_types: vec![DataType::Int32],
+            describe: "int32".to_string(),
+        },
+        HashKeyBenchCaseBuilder {
+            data_types: vec![DataType::Int64],
+            describe: "int64".to_string(),
+        },
+        HashKeyBenchCaseBuilder {
+            data_types: vec![DataType::Varchar],
+            describe: "varchar".to_string(),
+        },
+        HashKeyBenchCaseBuilder {
+            data_types: vec![DataType::Int32, DataType::Int32, DataType::Int32],
+            describe: "composite fixed".to_string(),
+        },
+        HashKeyBenchCaseBuilder {
+            data_types: vec![DataType::Int32, DataType::Int64, DataType::Int32],
+            describe: "composite fixed".to_string(),
+        },
+        HashKeyBenchCaseBuilder {
+            data_types: vec![DataType::Int32, DataType::Varchar],
+            describe: "mix fixed and not1".to_string(),
+        },
+        HashKeyBenchCaseBuilder {
+            data_types: vec![DataType::Int64, DataType::Varchar],
+            describe: "mix fixed and not2".to_string(),
+        },
+    ]
+}
+
+fn bench_hash_key_encoding(c: &mut Criterion) {
+    for case_builder in case_builders() {
+        let cases = case_builder.gen_cases();
+        for case in cases {
+            case.bench(c);
+        }
+    }
+}
+
+// `cargo bench -- "vec ser[\s\S]*KeySerialized[\s\S]*null ratio 0$"` bench all the
+// `KeySerialized` hash key vectorized serialize cases with data's null ratio is 0,001
+criterion_group!(benches, bench_hash_key_encoding);
+criterion_main!(benches);
diff --git a/src/common/benches/bitmap.rs b/src/common/benches/bitmap.rs
index 776e546896b3f..943c394f93d48 100644
--- a/src/common/benches/bitmap.rs
+++ b/src/common/benches/bitmap.rs
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use criterion::{criterion_group, criterion_main, Criterion};
-use risingwave_common::buffer::Bitmap;
+use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use itertools::Itertools;
+use risingwave_common::buffer::{Bitmap, BitmapIter};
 
 fn bench_bitmap(c: &mut Criterion) {
     const CHUNK_SIZE: usize = 1024;
@@ -28,5 +29,36 @@ fn bench_bitmap(c: &mut Criterion) {
     c.bench_function("not", |b| b.iter(|| !&x));
 }
 
-criterion_group!(benches, bench_bitmap);
+/// Bench ~10 million records
+fn bench_bitmap_iter(c: &mut Criterion) {
+    const CHUNK_SIZE: usize = 1024;
+    const N_CHUNKS: usize = 10_000;
+    fn make_iterators(bitmaps: &[Bitmap]) -> Vec<BitmapIter<'_>> {
+        bitmaps.iter().map(|bitmap| bitmap.iter()).collect_vec()
+    }
+    fn bench_bitmap_iter(bench_id: &str, bitmap: Bitmap, c: &mut Criterion) {
+        let bitmaps = vec![bitmap; N_CHUNKS];
+        let make_iters = || make_iterators(&bitmaps);
+        let mut result = vec![true; CHUNK_SIZE];
+        c.bench_function(bench_id, |b| {
+            b.iter_batched(
+                make_iters,
+                |iters| {
+                    for iter in iters {
+                        for (i, bit_flag) in iter.enumerate() {
+                            result[i] = bit_flag;
+                        }
+                    }
+                },
+                BatchSize::SmallInput,
+            )
+        });
+    }
+    let zeros = Bitmap::zeros(CHUNK_SIZE);
+    bench_bitmap_iter("zeros_iter", zeros, c);
+    let ones = Bitmap::ones(CHUNK_SIZE);
+    bench_bitmap_iter("ones_iter", ones, c);
+}
+
+criterion_group!(benches, bench_bitmap, bench_bitmap_iter);
 criterion_main!(benches);
diff --git a/src/common/common_service/src/observer_manager.rs b/src/common/common_service/src/observer_manager.rs
index 156cd7882974b..695e3b4d4411a 100644
--- a/src/common/common_service/src/observer_manager.rs
+++ b/src/common/common_service/src/observer_manager.rs
@@ -116,15 +116,7 @@ where
         };
 
         notification_vec.retain_mut(|notification| match notification.info.as_ref().unwrap() {
-            Info::Database(_)
-            | Info::Schema(_)
-            | Info::Table(_)
-            | Info::Source(_)
-            | Info::Sink(_)
-            | Info::Index(_)
-            | Info::View(_)
-            | Info::Function(_)
-            | Info::User(_) => {
+            Info::Database(_) | Info::Schema(_) | Info::RelationGroup(_) | Info::User(_) => {
                 notification.version > info.version.as_ref().unwrap().catalog_version
             }
             Info::ParallelUnitMapping(_) => {
diff --git a/src/common/src/array/arrow.rs b/src/common/src/array/arrow.rs
index 1a4c5099e31a6..3941a7f94375a 100644
--- a/src/common/src/array/arrow.rs
+++ b/src/common/src/array/arrow.rs
@@ -90,10 +90,10 @@ converts_generic! {
     { arrow_array::BooleanArray, Boolean, ArrayImpl::Bool },
     { arrow_array::Decimal128Array, Decimal128(_, _), ArrayImpl::Decimal },
     { arrow_array::IntervalMonthDayNanoArray, Interval(MonthDayNano), ArrayImpl::Interval },
-    { arrow_array::Date32Array, Date32, ArrayImpl::NaiveDate },
-    { arrow_array::TimestampNanosecondArray, Timestamp(Nanosecond, _), ArrayImpl::NaiveDateTime },
-    { arrow_array::Time64NanosecondArray, Time64(Nanosecond), ArrayImpl::NaiveTime },
-    // { arrow_array::StructArray, Struct(_), ArrayImpl::Struct }, // TODO: convert struct
+    { arrow_array::Date32Array, Date32, ArrayImpl::Date },
+    { arrow_array::TimestampNanosecondArray, Timestamp(Nanosecond, _), ArrayImpl::Timestamp },
+    { arrow_array::Time64NanosecondArray, Time64(Nanosecond), ArrayImpl::Time },
+    { arrow_array::StructArray, Struct(_), ArrayImpl::Struct },
     { arrow_array::ListArray, List(_), ArrayImpl::List },
     { arrow_array::BinaryArray, Binary, ArrayImpl::Bytea }
 }
@@ -229,9 +229,9 @@ converts!(F64Array, arrow_array::Float64Array, @map);
 converts!(DecimalArray, arrow_array::Decimal128Array, @map);
 converts!(BytesArray, arrow_array::BinaryArray);
 converts!(Utf8Array, arrow_array::StringArray);
-converts!(NaiveDateArray, arrow_array::Date32Array, @map);
-converts!(NaiveTimeArray, arrow_array::Time64NanosecondArray, @map);
-converts!(NaiveDateTimeArray, arrow_array::TimestampNanosecondArray, @map);
+converts!(DateArray, arrow_array::Date32Array, @map);
+converts!(TimeArray, arrow_array::Time64NanosecondArray, @map);
+converts!(TimestampArray, arrow_array::TimestampNanosecondArray, @map);
 converts!(IntervalArray, arrow_array::IntervalMonthDayNanoArray, @map);
 
 /// Converts RisingWave value from and into Arrow value.
@@ -242,7 +242,7 @@ trait FromIntoArrow {
     fn into_arrow(self) -> Self::ArrowType;
 }
 
-impl FromIntoArrow for OrderedF32 {
+impl FromIntoArrow for F32 {
     type ArrowType = f32;
 
     fn from_arrow(value: Self::ArrowType) -> Self {
@@ -254,7 +254,7 @@ impl FromIntoArrow for OrderedF32 {
     }
 }
 
-impl FromIntoArrow for OrderedF64 {
+impl FromIntoArrow for F64 {
     type ArrowType = f64;
 
     fn from_arrow(value: Self::ArrowType) -> Self {
@@ -289,11 +289,11 @@ impl FromIntoArrow for Decimal {
     }
 }
 
-impl FromIntoArrow for NaiveDateWrapper {
+impl FromIntoArrow for Date {
     type ArrowType = i32;
 
     fn from_arrow(value: Self::ArrowType) -> Self {
-        NaiveDateWrapper(arrow_array::types::Date32Type::to_naive_date(value))
+        Date(arrow_array::types::Date32Type::to_naive_date(value))
     }
 
     fn into_arrow(self) -> Self::ArrowType {
@@ -301,11 +301,11 @@ impl FromIntoArrow for NaiveDateWrapper {
     }
 }
 
-impl FromIntoArrow for NaiveTimeWrapper {
+impl FromIntoArrow for Time {
     type ArrowType = i64;
 
     fn from_arrow(value: Self::ArrowType) -> Self {
-        NaiveTimeWrapper(
+        Time(
             NaiveTime::from_num_seconds_from_midnight_opt(
                 (value / 1_000_000_000) as _,
                 (value % 1_000_000_000) as _,
@@ -322,11 +322,11 @@ impl FromIntoArrow for NaiveTimeWrapper {
     }
 }
 
-impl FromIntoArrow for NaiveDateTimeWrapper {
+impl FromIntoArrow for Timestamp {
     type ArrowType = i64;
 
     fn from_arrow(value: Self::ArrowType) -> Self {
-        NaiveDateTimeWrapper(
+        Timestamp(
             NaiveDateTime::from_timestamp_opt(
                 (value / 1_000_000_000) as _,
                 (value % 1_000_000_000) as _,
@@ -343,12 +343,12 @@ impl FromIntoArrow for NaiveDateTimeWrapper {
     }
 }
 
-impl FromIntoArrow for IntervalUnit {
+impl FromIntoArrow for Interval {
     type ArrowType = i128;
 
     fn from_arrow(value: Self::ArrowType) -> Self {
         let (months, days, ns) = arrow_array::types::IntervalMonthDayNanoType::to_parts(value);
-        IntervalUnit::from_month_day_usec(months, days, ns / 1000)
+        Interval::from_month_day_usec(months, days, ns / 1000)
     }
 
     fn into_arrow(self) -> Self::ArrowType {
@@ -427,18 +427,16 @@ impl From<&ListArray> for arrow_array::ListArray {
                 IntervalMonthDayNanoBuilder::with_capacity(a.len()),
                 |b, v| b.append_option(v.map(|d| d.into_arrow())),
             ),
-            ArrayImpl::NaiveDate(a) => {
-                build(array, a, Date32Builder::with_capacity(a.len()), |b, v| {
-                    b.append_option(v.map(|d| d.into_arrow()))
-                })
-            }
-            ArrayImpl::NaiveDateTime(a) => build(
+            ArrayImpl::Date(a) => build(array, a, Date32Builder::with_capacity(a.len()), |b, v| {
+                b.append_option(v.map(|d| d.into_arrow()))
+            }),
+            ArrayImpl::Timestamp(a) => build(
                 array,
                 a,
                 TimestampNanosecondBuilder::with_capacity(a.len()),
                 |b, v| b.append_option(v.map(|d| d.into_arrow())),
             ),
-            ArrayImpl::NaiveTime(a) => build(
+            ArrayImpl::Time(a) => build(
                 array,
                 a,
                 Time64NanosecondBuilder::with_capacity(a.len()),
@@ -470,19 +468,17 @@ impl From<&StructArray> for arrow_array::StructArray {
         let struct_data_vector: Vec<(arrow_schema::Field, arrow_array::ArrayRef)> =
             if array.children_names().len() != array.children_array_types().len() {
                 array
-                    .field_arrays()
-                    .iter()
+                    .fields()
                     .zip_eq_fast(array.children_array_types())
-                    .map(|(arr, datatype)| (Field::new("", datatype.into(), true), (*arr).into()))
+                    .map(|(arr, datatype)| (Field::new("", datatype.into(), true), arr.into()))
                     .collect()
             } else {
                 array
-                    .field_arrays()
-                    .iter()
+                    .fields()
                     .zip_eq_fast(array.children_array_types())
                     .zip_eq_fast(array.children_names())
                     .map(|((arr, datatype), field_name)| {
-                        (Field::new(field_name, datatype.into(), true), (*arr).into())
+                        (Field::new(field_name, datatype.into(), true), arr.into())
                     })
                     .collect()
             };
@@ -514,7 +510,7 @@ impl From<&arrow_array::StructArray> for StructArray {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::types::interval::test_utils::IntervalUnitTestExt;
+    use crate::types::interval::test_utils::IntervalTestExt;
     use crate::{array, empty_array};
 
     #[test]
@@ -533,54 +529,50 @@ mod tests {
 
     #[test]
     fn f32() {
-        let array = F32Array::from_iter([
-            None,
-            Some(OrderedF32::from(-7.0)),
-            Some(OrderedF32::from(25.0)),
-        ]);
+        let array = F32Array::from_iter([None, Some(F32::from(-7.0)), Some(F32::from(25.0))]);
         let arrow = arrow_array::Float32Array::from(&array);
         assert_eq!(F32Array::from(&arrow), array);
     }
 
     #[test]
     fn date() {
-        let array = NaiveDateArray::from_iter([
+        let array = DateArray::from_iter([
             None,
-            NaiveDateWrapper::with_days(12345).ok(),
-            NaiveDateWrapper::with_days(-12345).ok(),
+            Date::with_days(12345).ok(),
+            Date::with_days(-12345).ok(),
         ]);
         let arrow = arrow_array::Date32Array::from(&array);
-        assert_eq!(NaiveDateArray::from(&arrow), array);
+        assert_eq!(DateArray::from(&arrow), array);
     }
 
     #[test]
     fn time() {
-        let array = NaiveTimeArray::from_iter([
+        let array = TimeArray::from_iter([
             None,
-            NaiveTimeWrapper::with_secs_nano(12345, 123456789).ok(),
-            NaiveTimeWrapper::with_secs_nano(1, 0).ok(),
+            Time::with_secs_nano(12345, 123456789).ok(),
+            Time::with_secs_nano(1, 0).ok(),
         ]);
         let arrow = arrow_array::Time64NanosecondArray::from(&array);
-        assert_eq!(NaiveTimeArray::from(&arrow), array);
+        assert_eq!(TimeArray::from(&arrow), array);
     }
 
     #[test]
     fn timestamp() {
-        let array = NaiveDateTimeArray::from_iter([
+        let array = TimestampArray::from_iter([
             None,
-            NaiveDateTimeWrapper::with_secs_nsecs(12345, 123456789).ok(),
-            NaiveDateTimeWrapper::with_secs_nsecs(1, 0).ok(),
+            Timestamp::with_secs_nsecs(12345, 123456789).ok(),
+            Timestamp::with_secs_nsecs(1, 0).ok(),
         ]);
         let arrow = arrow_array::TimestampNanosecondArray::from(&array);
-        assert_eq!(NaiveDateTimeArray::from(&arrow), array);
+        assert_eq!(TimestampArray::from(&arrow), array);
     }
 
     #[test]
     fn interval() {
         let array = IntervalArray::from_iter([
             None,
-            Some(IntervalUnit::from_millis(123456789)),
-            Some(IntervalUnit::from_millis(-123456789)),
+            Some(Interval::from_millis(123456789)),
+            Some(Interval::from_millis(-123456789)),
         ]);
         let arrow = arrow_array::IntervalMonthDayNanoArray::from(&array);
         assert_eq!(IntervalArray::from(&arrow), array);
diff --git a/src/common/src/array/bool_array.rs b/src/common/src/array/bool_array.rs
index 6e392b34ce041..13c651546b86c 100644
--- a/src/common/src/array/bool_array.rs
+++ b/src/common/src/array/bool_array.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use risingwave_pb::data::{Array as ProstArray, ArrayType};
+use risingwave_pb::data::{ArrayType, PbArray};
 
 use super::{Array, ArrayBuilder, ArrayMeta};
 use crate::array::ArrayBuilderImpl;
@@ -79,11 +79,11 @@ impl Array for BoolArray {
         self.data.len()
     }
 
-    fn to_protobuf(&self) -> ProstArray {
+    fn to_protobuf(&self) -> PbArray {
         let value = self.data.to_protobuf();
         let null_bitmap = self.null_bitmap().to_protobuf();
 
-        ProstArray {
+        PbArray {
             null_bitmap: Some(null_bitmap),
             values: vec![value],
             array_type: ArrayType::Bool as i32,
diff --git a/src/common/src/array/bytes_array.rs b/src/common/src/array/bytes_array.rs
index ea27ee37131de..f31c641b4b97e 100644
--- a/src/common/src/array/bytes_array.rs
+++ b/src/common/src/array/bytes_array.rs
@@ -17,7 +17,7 @@ use std::mem::size_of;
 
 use risingwave_pb::common::buffer::CompressionType;
 use risingwave_pb::common::Buffer;
-use risingwave_pb::data::{Array as ProstArray, ArrayType};
+use risingwave_pb::data::{ArrayType, PbArray};
 
 use super::{Array, ArrayBuilder, ArrayMeta};
 use crate::array::ArrayBuilderImpl;
@@ -47,7 +47,7 @@ impl Array for BytesArray {
         self.offset.len() - 1
     }
 
-    fn to_protobuf(&self) -> ProstArray {
+    fn to_protobuf(&self) -> PbArray {
         let offset_buffer = self
             .offset
             .iter()
@@ -82,7 +82,7 @@ impl Array for BytesArray {
             },
         ];
         let null_bitmap = self.null_bitmap().to_protobuf();
-        ProstArray {
+        PbArray {
             null_bitmap: Some(null_bitmap),
             values,
             array_type: ArrayType::Bytea as i32,
diff --git a/src/common/src/array/chrono_array.rs b/src/common/src/array/chrono_array.rs
index 5d8461508e350..65bebeba96e2c 100644
--- a/src/common/src/array/chrono_array.rs
+++ b/src/common/src/array/chrono_array.rs
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 use super::{PrimitiveArray, PrimitiveArrayBuilder};
-use crate::types::{NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper};
+use crate::types::{Date, Time, Timestamp};
 
-pub type NaiveDateArray = PrimitiveArray<NaiveDateWrapper>;
-pub type NaiveTimeArray = PrimitiveArray<NaiveTimeWrapper>;
-pub type NaiveDateTimeArray = PrimitiveArray<NaiveDateTimeWrapper>;
+pub type DateArray = PrimitiveArray<Date>;
+pub type TimeArray = PrimitiveArray<Time>;
+pub type TimestampArray = PrimitiveArray<Timestamp>;
 
-pub type NaiveDateArrayBuilder = PrimitiveArrayBuilder<NaiveDateWrapper>;
-pub type NaiveTimeArrayBuilder = PrimitiveArrayBuilder<NaiveTimeWrapper>;
-pub type NaiveDateTimeArrayBuilder = PrimitiveArrayBuilder<NaiveDateTimeWrapper>;
+pub type DateArrayBuilder = PrimitiveArrayBuilder<Date>;
+pub type TimeArrayBuilder = PrimitiveArrayBuilder<Time>;
+pub type TimestampArrayBuilder = PrimitiveArrayBuilder<Timestamp>;
 
 #[cfg(test)]
 mod tests {
@@ -32,12 +32,9 @@ mod tests {
     use crate::util::iter_util::ZipEqFast;
 
     #[test]
-    fn test_naivedate_builder() {
-        let v = (0..1000)
-            .map(NaiveDateWrapper::with_days)
-            .map(|x| x.ok())
-            .collect_vec();
-        let mut builder = NaiveDateArrayBuilder::new(0);
+    fn test_date_builder() {
+        let v = (0..1000).map(Date::with_days).map(|x| x.ok()).collect_vec();
+        let mut builder = DateArrayBuilder::new(0);
         for i in &v {
             builder.append(*i);
         }
@@ -47,14 +44,14 @@ mod tests {
     }
 
     #[test]
-    fn test_naivedate_array_to_protobuf() {
+    fn test_date_array_to_protobuf() {
         let input = vec![
-            NaiveDateWrapper::with_days(12345).ok(),
+            Date::with_days(12345).ok(),
             None,
-            NaiveDateWrapper::with_days(67890).ok(),
+            Date::with_days(67890).ok(),
         ];
 
-        let array = NaiveDateArray::from_iter(&input);
+        let array = DateArray::from_iter(&input);
         let buffers = array.to_protobuf().values;
 
         assert_eq!(buffers.len(), 1);
diff --git a/src/common/src/array/column.rs b/src/common/src/array/column.rs
index edc0952a9d9b1..d7640879a957c 100644
--- a/src/common/src/array/column.rs
+++ b/src/common/src/array/column.rs
@@ -15,13 +15,23 @@
 use std::sync::Arc;
 
 use futures_async_stream::try_stream;
-use risingwave_pb::data::Column as ProstColumn;
+use risingwave_pb::data::PbColumn;
 
 use super::{Array, ArrayError, ArrayResult, I64Array};
 use crate::array::{ArrayImpl, ArrayRef};
 
-/// Column is owned by `DataChunk`. It consists of logic data type and physical array
-/// implementation.
+/// A [`Column`] consists of its logical data type
+/// and its corresponding physical array implementation,
+/// The array contains all the datums bound to this [`Column`].
+/// [`Column`] is owned by [`DataChunk`].
+///
+/// For instance, in this [`DataChunk`],
+/// for column `v1`, [`ArrayRef`] will contain: [1,1,1]
+/// | v1 | v2 |
+/// |----|----|
+/// | 1 |  a |
+/// | 1 |  b |
+/// | 1 |  c |
 #[derive(Clone, Debug, PartialEq)]
 pub struct Column {
     array: ArrayRef,
@@ -32,12 +42,12 @@ impl Column {
         Column { array }
     }
 
-    pub fn to_protobuf(&self) -> ProstColumn {
+    pub fn to_protobuf(&self) -> PbColumn {
         let array = self.array.to_protobuf();
-        ProstColumn { array: Some(array) }
+        PbColumn { array: Some(array) }
     }
 
-    pub fn from_protobuf(col: &ProstColumn, cardinality: usize) -> ArrayResult<Self> {
+    pub fn from_protobuf(col: &PbColumn, cardinality: usize) -> ArrayResult<Self> {
         Ok(Column {
             array: Arc::new(ArrayImpl::from_protobuf(col.get_array()?, cardinality)?),
         })
@@ -116,13 +126,12 @@ mod tests {
 
     use super::*;
     use crate::array::{
-        Array, ArrayBuilder, BoolArray, BoolArrayBuilder, DecimalArray, DecimalArrayBuilder,
-        I32Array, I32ArrayBuilder, NaiveDateArray, NaiveDateArrayBuilder, NaiveDateTimeArray,
-        NaiveDateTimeArrayBuilder, NaiveTimeArray, NaiveTimeArrayBuilder, Utf8Array,
-        Utf8ArrayBuilder,
+        Array, ArrayBuilder, BoolArray, BoolArrayBuilder, DateArray, DateArrayBuilder,
+        DecimalArray, DecimalArrayBuilder, I32Array, I32ArrayBuilder, TimeArray, TimeArrayBuilder,
+        TimestampArray, TimestampArrayBuilder, Utf8Array, Utf8ArrayBuilder,
     };
     use crate::error::Result;
-    use crate::types::{Decimal, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper};
+    use crate::types::{Date, Decimal, Time, Timestamp};
 
     // Convert a column to protobuf, then convert it back to column, and ensures the two are
     // identical.
@@ -224,12 +233,12 @@ mod tests {
     }
 
     #[test]
-    fn test_naivedate_protobuf_conversion() -> Result<()> {
+    fn test_date_protobuf_conversion() -> Result<()> {
         let cardinality = 2048;
-        let mut builder = NaiveDateArrayBuilder::new(cardinality);
+        let mut builder = DateArrayBuilder::new(cardinality);
         for i in 0..cardinality {
             if i % 2 == 0 {
-                builder.append(NaiveDateWrapper::with_days(i as i32).ok());
+                builder.append(Date::with_days(i as i32).ok());
             } else {
                 builder.append(None);
             }
@@ -237,13 +246,10 @@ mod tests {
         let col: Column = builder.finish().into();
         let new_col = Column::from_protobuf(&col.to_protobuf(), cardinality).unwrap();
         assert_eq!(new_col.array.len(), cardinality);
-        let arr: &NaiveDateArray = new_col.array_ref().as_naivedate();
+        let arr: &DateArray = new_col.array_ref().as_date();
         arr.iter().enumerate().for_each(|(i, x)| {
             if i % 2 == 0 {
-                assert_eq!(
-                    NaiveDateWrapper::with_days(i as i32).ok().unwrap(),
-                    x.unwrap()
-                );
+                assert_eq!(Date::with_days(i as i32).ok().unwrap(), x.unwrap());
             } else {
                 assert!(x.is_none());
             }
@@ -252,12 +258,12 @@ mod tests {
     }
 
     #[test]
-    fn test_naivetime_protobuf_conversion() -> Result<()> {
+    fn test_time_protobuf_conversion() -> Result<()> {
         let cardinality = 2048;
-        let mut builder = NaiveTimeArrayBuilder::new(cardinality);
+        let mut builder = TimeArrayBuilder::new(cardinality);
         for i in 0..cardinality {
             if i % 2 == 0 {
-                builder.append(NaiveTimeWrapper::with_secs_nano(i as u32, i as u32 * 1000).ok());
+                builder.append(Time::with_secs_nano(i as u32, i as u32 * 1000).ok());
             } else {
                 builder.append(None);
             }
@@ -265,11 +271,11 @@ mod tests {
         let col: Column = builder.finish().into();
         let new_col = Column::from_protobuf(&col.to_protobuf(), cardinality).unwrap();
         assert_eq!(new_col.array.len(), cardinality);
-        let arr: &NaiveTimeArray = new_col.array_ref().as_naivetime();
+        let arr: &TimeArray = new_col.array_ref().as_time();
         arr.iter().enumerate().for_each(|(i, x)| {
             if i % 2 == 0 {
                 assert_eq!(
-                    NaiveTimeWrapper::with_secs_nano(i as u32, i as u32 * 1000)
+                    Time::with_secs_nano(i as u32, i as u32 * 1000)
                         .ok()
                         .unwrap(),
                     x.unwrap()
@@ -282,13 +288,12 @@ mod tests {
     }
 
     #[test]
-    fn test_naivedatetime_protobuf_conversion() -> Result<()> {
+    fn test_timestamp_protobuf_conversion() -> Result<()> {
         let cardinality = 2048;
-        let mut builder = NaiveDateTimeArrayBuilder::new(cardinality);
+        let mut builder = TimestampArrayBuilder::new(cardinality);
         for i in 0..cardinality {
             if i % 2 == 0 {
-                builder
-                    .append(NaiveDateTimeWrapper::with_secs_nsecs(i as i64, i as u32 * 1000).ok());
+                builder.append(Timestamp::with_secs_nsecs(i as i64, i as u32 * 1000).ok());
             } else {
                 builder.append(None);
             }
@@ -296,11 +301,11 @@ mod tests {
         let col: Column = builder.finish().into();
         let new_col = Column::from_protobuf(&col.to_protobuf(), cardinality).unwrap();
         assert_eq!(new_col.array.len(), cardinality);
-        let arr: &NaiveDateTimeArray = new_col.array_ref().as_naivedatetime();
+        let arr: &TimestampArray = new_col.array_ref().as_timestamp();
         arr.iter().enumerate().for_each(|(i, x)| {
             if i % 2 == 0 {
                 assert_eq!(
-                    NaiveDateTimeWrapper::with_secs_nsecs(i as i64, i as u32 * 1000)
+                    Timestamp::with_secs_nsecs(i as i64, i as u32 * 1000)
                         .ok()
                         .unwrap(),
                     x.unwrap()
diff --git a/src/common/src/array/column_proto_readers.rs b/src/common/src/array/column_proto_readers.rs
index 65345dce6efe2..04c034aea6e5a 100644
--- a/src/common/src/array/column_proto_readers.rs
+++ b/src/common/src/array/column_proto_readers.rs
@@ -17,23 +17,23 @@ use std::io::{Cursor, Read};
 use anyhow::anyhow;
 use byteorder::{BigEndian, ReadBytesExt};
 use paste::paste;
-use risingwave_pb::data::Array as ProstArray;
+use risingwave_pb::data::PbArray;
 
 use crate::array::value_reader::{PrimitiveValueReader, VarSizedValueReader};
 use crate::array::{
-    Array, ArrayBuilder, ArrayImpl, ArrayMeta, ArrayResult, BoolArray, IntervalArrayBuilder,
-    NaiveDateArrayBuilder, NaiveDateTimeArrayBuilder, NaiveTimeArrayBuilder, PrimitiveArrayBuilder,
-    PrimitiveArrayItemType,
+    Array, ArrayBuilder, ArrayImpl, ArrayMeta, ArrayResult, BoolArray, DateArrayBuilder,
+    IntervalArrayBuilder, PrimitiveArrayBuilder, PrimitiveArrayItemType, TimeArrayBuilder,
+    TimestampArrayBuilder,
 };
 use crate::buffer::Bitmap;
-use crate::types::interval::IntervalUnit;
-use crate::types::{NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper};
+use crate::types::interval::Interval;
+use crate::types::{Date, Time, Timestamp};
 
 // TODO: Use techniques like apache arrow flight RPC to eliminate deserialization.
 // https://arrow.apache.org/docs/format/Flight.html
 
 pub fn read_numeric_array<T: PrimitiveArrayItemType, R: PrimitiveValueReader<T>>(
-    array: &ProstArray,
+    array: &PbArray,
     cardinality: usize,
 ) -> ArrayResult<ArrayImpl> {
     ensure!(
@@ -60,7 +60,7 @@ pub fn read_numeric_array<T: PrimitiveArrayItemType, R: PrimitiveValueReader<T>>
     Ok(arr.into())
 }
 
-pub fn read_bool_array(array: &ProstArray, cardinality: usize) -> ArrayResult<ArrayImpl> {
+pub fn read_bool_array(array: &PbArray, cardinality: usize) -> ArrayResult<ArrayImpl> {
     ensure!(
         array.get_values().len() == 1,
         "Must have only 1 buffer in a bool array"
@@ -75,40 +75,40 @@ pub fn read_bool_array(array: &ProstArray, cardinality: usize) -> ArrayResult<Ar
     Ok(arr.into())
 }
 
-fn read_naive_date(cursor: &mut Cursor<&[u8]>) -> ArrayResult<NaiveDateWrapper> {
+fn read_date(cursor: &mut Cursor<&[u8]>) -> ArrayResult<Date> {
     match cursor.read_i32::<BigEndian>() {
-        Ok(days) => NaiveDateWrapper::with_days(days).map_err(|e| anyhow!(e).into()),
-        Err(e) => bail!("Failed to read i32 from NaiveDate buffer: {}", e),
+        Ok(days) => Date::with_days(days).map_err(|e| anyhow!(e).into()),
+        Err(e) => bail!("Failed to read i32 from Date buffer: {}", e),
     }
 }
 
-fn read_naive_time(cursor: &mut Cursor<&[u8]>) -> ArrayResult<NaiveTimeWrapper> {
+fn read_time(cursor: &mut Cursor<&[u8]>) -> ArrayResult<Time> {
     match cursor.read_u64::<BigEndian>() {
-        Ok(t) => NaiveTimeWrapper::with_nano(t).map_err(|e| anyhow!(e).into()),
+        Ok(t) => Time::with_nano(t).map_err(|e| anyhow!(e).into()),
         Err(e) => bail!("Failed to read i64 from NaiveTime buffer: {}", e),
     }
 }
 
-fn read_naive_date_time(cursor: &mut Cursor<&[u8]>) -> ArrayResult<NaiveDateTimeWrapper> {
+fn read_timestamp(cursor: &mut Cursor<&[u8]>) -> ArrayResult<Timestamp> {
     cursor
         .read_i64::<BigEndian>()
-        .map_err(|e| anyhow!("Failed to read i64 from NaiveDateTime buffer: {}", e))
-        .and_then(|t| NaiveDateTimeWrapper::with_macros(t).map_err(|e| anyhow!("{}", e)))
+        .map_err(|e| anyhow!("Failed to read i64 from Timestamp buffer: {}", e))
+        .and_then(|t| Timestamp::with_macros(t).map_err(|e| anyhow!("{}", e)))
         .map_err(Into::into)
 }
 
-pub fn read_interval_unit(cursor: &mut Cursor<&[u8]>) -> ArrayResult<IntervalUnit> {
+pub fn read_interval(cursor: &mut Cursor<&[u8]>) -> ArrayResult<Interval> {
     let mut read = || {
         let months = cursor.read_i32::<BigEndian>()?;
         let days = cursor.read_i32::<BigEndian>()?;
         let usecs = cursor.read_i64::<BigEndian>()?;
 
-        Ok::<_, std::io::Error>(IntervalUnit::from_month_day_usec(months, days, usecs))
+        Ok::<_, std::io::Error>(Interval::from_month_day_usec(months, days, usecs))
     };
 
     match read() {
         Ok(iu) => Ok(iu),
-        Err(e) => bail!("Failed to read IntervalUnit from buffer: {}", e),
+        Err(e) => bail!("Failed to read Interval from buffer: {}", e),
     }
 }
 
@@ -116,7 +116,7 @@ macro_rules! read_one_value_array {
     ($({ $type:ident, $builder:ty }),*) => {
         paste! {
             $(
-            pub fn [<read_ $type:snake _array>](array: &ProstArray, cardinality: usize) -> ArrayResult<ArrayImpl> {
+            pub fn [<read_ $type:snake _array>](array: &PbArray, cardinality: usize) -> ArrayResult<ArrayImpl> {
                 ensure!(
                     array.get_values().len() == 1,
                     "Must have only 1 buffer in a {} array", stringify!($type)
@@ -145,10 +145,10 @@ macro_rules! read_one_value_array {
 }
 
 read_one_value_array! {
-    { IntervalUnit, IntervalArrayBuilder },
-    { NaiveDate, NaiveDateArrayBuilder },
-    { NaiveTime, NaiveTimeArrayBuilder },
-    { NaiveDateTime, NaiveDateTimeArrayBuilder }
+    { Interval, IntervalArrayBuilder },
+    { Date, DateArrayBuilder },
+    { Time, TimeArrayBuilder },
+    { Timestamp, TimestampArrayBuilder }
 }
 
 fn read_offset(offset_cursor: &mut Cursor<&[u8]>) -> ArrayResult<i64> {
@@ -159,7 +159,7 @@ fn read_offset(offset_cursor: &mut Cursor<&[u8]>) -> ArrayResult<i64> {
 }
 
 pub fn read_string_array<B: ArrayBuilder, R: VarSizedValueReader<B>>(
-    array: &ProstArray,
+    array: &PbArray,
     cardinality: usize,
 ) -> ArrayResult<ArrayImpl> {
     ensure!(
diff --git a/src/common/src/array/data_chunk.rs b/src/common/src/array/data_chunk.rs
index f597e9a405900..1c4727d49b643 100644
--- a/src/common/src/array/data_chunk.rs
+++ b/src/common/src/array/data_chunk.rs
@@ -18,23 +18,39 @@ use std::sync::Arc;
 
 use bytes::{Bytes, BytesMut};
 use itertools::Itertools;
-use risingwave_pb::data::DataChunk as ProstDataChunk;
+use risingwave_pb::data::PbDataChunk;
 
-use super::{ArrayResult, Vis};
+use super::{Array, ArrayResult, StructArray, Vis};
 use crate::array::column::Column;
 use crate::array::data_chunk_iter::RowRef;
-use crate::array::{ArrayBuilderImpl, StructValue};
+use crate::array::ArrayBuilderImpl;
 use crate::buffer::{Bitmap, BitmapBuilder};
 use crate::hash::HashCode;
 use crate::row::Row;
 use crate::types::struct_type::StructType;
 use crate::types::to_text::ToText;
-use crate::types::{DataType, Datum, NaiveDateTimeWrapper, ToOwnedDatum};
+use crate::types::{DataType, ToOwnedDatum};
 use crate::util::hash_util::finalize_hashers;
 use crate::util::iter_util::{ZipEqDebug, ZipEqFast};
 use crate::util::value_encoding::{serialize_datum_into, ValueRowSerializer};
 
-/// `DataChunk` is a collection of arrays with visibility mask.
+/// [`DataChunk`] is a collection of Columns,
+/// a with visibility mask for each row.
+/// For instance, we could have a [`DataChunk`] of this format.
+/// | v1 | v2 | v3 |
+/// |----|----|----|
+/// | 1  | a  | t  |
+/// | 2  | b  | f  |
+/// | 3  | c  | t  |
+/// | 4  | d  | f  |
+///
+/// Our columns are v1, v2, v3.
+/// Then, if the Visibility Mask hides rows 2 and 4,
+/// We will only have these rows visible:
+/// | v1 | v2 | v3 |
+/// |----|----|----|
+/// | 1  | a  | t  |
+/// | 3  | c  | t  |
 #[derive(Clone, PartialEq)]
 #[must_use]
 pub struct DataChunk {
@@ -122,6 +138,19 @@ impl DataChunk {
         &self.vis2
     }
 
+    pub fn selectivity(&self) -> f64 {
+        match &self.vis2 {
+            Vis::Bitmap(b) => {
+                if b.is_empty() {
+                    0.0
+                } else {
+                    b.count_ones() as f64 / b.len() as f64
+                }
+            }
+            Vis::Compact(_) => 1.0,
+        }
+    }
+
     pub fn with_visibility(&self, visibility: Bitmap) -> Self {
         DataChunk::new(self.columns.clone(), visibility)
     }
@@ -152,12 +181,19 @@ impl DataChunk {
         &self.columns
     }
 
-    pub fn to_protobuf(&self) -> ProstDataChunk {
+    pub fn split_column_at(&self, idx: usize) -> (Self, Self) {
+        let (left, right) = self.columns.split_at(idx);
+        let left = DataChunk::new(left.to_vec(), self.vis2.clone());
+        let right = DataChunk::new(right.to_vec(), self.vis2.clone());
+        (left, right)
+    }
+
+    pub fn to_protobuf(&self) -> PbDataChunk {
         assert!(
             matches!(self.vis2, Vis::Compact(_)),
             "must be compacted before transfer"
         );
-        let mut proto = ProstDataChunk {
+        let mut proto = PbDataChunk {
             cardinality: self.cardinality() as u32,
             columns: Default::default(),
         };
@@ -170,7 +206,18 @@ impl DataChunk {
     }
 
     /// `compact` will convert the chunk to compact format.
-    /// Compact format means that `visibility == None`.
+    /// Compacting removes the hidden rows, and returns a new visibility
+    /// mask which indicates this.
+    ///
+    /// `compact` has trade-offs:
+    ///
+    /// Cost:
+    /// It has to rebuild the each column, meaning it will incur cost
+    /// of copying over bytes from the original column array to the new one.
+    ///
+    /// Benefit:
+    /// The main benefit is that the data chunk is smaller, taking up less memory.
+    /// We can also save the cost of iterating over many hidden rows.
     pub fn compact(self) -> Self {
         match &self.vis2 {
             Vis::Compact(_) => self,
@@ -189,7 +236,7 @@ impl DataChunk {
         }
     }
 
-    pub fn from_protobuf(proto: &ProstDataChunk) -> ArrayResult<Self> {
+    pub fn from_protobuf(proto: &PbDataChunk) -> ArrayResult<Self> {
         let mut columns = vec![];
         for any_col in proto.get_columns() {
             let cardinality = proto.get_cardinality() as usize;
@@ -450,6 +497,16 @@ impl fmt::Debug for DataChunk {
     }
 }
 
+impl From<StructArray> for DataChunk {
+    fn from(array: StructArray) -> Self {
+        let columns = array.fields().map(|array| array.clone().into()).collect();
+        Self {
+            columns,
+            vis2: Vis::Compact(array.len()),
+        }
+    }
+}
+
 /// Test utilities for [`DataChunk`].
 pub trait DataChunkTestExt {
     /// Parse a chunk from string.
@@ -473,12 +530,14 @@ pub trait DataChunkTestExt {
     /// );
     ///
     /// // type chars:
+    /// //     B: bool
     /// //     I: i64
     /// //     i: i32
     /// //     F: f64
     /// //     f: f32
     /// //     T: str
     /// //    TS: Timestamp
+    /// //   SRL: Serial
     /// // {i,f}: struct
     /// ```
     fn from_pretty(s: &str) -> Self;
@@ -497,13 +556,14 @@ impl DataChunkTestExt for DataChunk {
         use crate::types::ScalarImpl;
         fn parse_type(s: &str) -> DataType {
             match s {
+                "B" => DataType::Boolean,
                 "I" => DataType::Int64,
                 "i" => DataType::Int32,
                 "F" => DataType::Float64,
                 "f" => DataType::Float32,
                 "TS" => DataType::Timestamp,
-                "TSZ" => DataType::Timestamptz,
                 "T" => DataType::Varchar,
+                "SRL" => DataType::Serial,
                 array if array.starts_with('{') && array.ends_with('}') => {
                     DataType::Struct(Arc::new(StructType {
                         fields: array[1..array.len() - 1]
@@ -520,10 +580,13 @@ impl DataChunkTestExt for DataChunk {
         let mut lines = s.split('\n').filter(|l| !l.trim().is_empty());
         // initialize array builders from the first line
         let header = lines.next().unwrap().trim();
-        let mut array_builders = header
+        let datatypes = header
             .split_ascii_whitespace()
             .take_while(|c| *c != "//")
             .map(parse_type)
+            .collect::<Vec<_>>();
+        let mut array_builders = datatypes
+            .iter()
             .map(|ty| ty.create_array_builder(1))
             .collect::<Vec<_>>();
         let mut visibility = vec![];
@@ -531,53 +594,16 @@ impl DataChunkTestExt for DataChunk {
             let mut token = line.trim().split_ascii_whitespace();
             // allow `zip` since `token` may longer than `array_builders`
             #[allow(clippy::disallowed_methods)]
-            for (builder, val_str) in array_builders.iter_mut().zip(&mut token) {
-                fn parse_datum(s: &str, builder: &ArrayBuilderImpl) -> Datum {
-                    if s == "." {
-                        return None;
-                    }
-                    Some(match builder {
-                        ArrayBuilderImpl::Int32(_) => ScalarImpl::Int32(
-                            s.parse()
-                                .map_err(|_| panic!("invalid int32: {s:?}"))
-                                .unwrap(),
-                        ),
-                        ArrayBuilderImpl::Int64(_) => ScalarImpl::Int64(
-                            s.parse()
-                                .map_err(|_| panic!("invalid int64: {s:?}"))
-                                .unwrap(),
-                        ),
-                        ArrayBuilderImpl::Float32(_) => ScalarImpl::Float32(
-                            s.parse()
-                                .map_err(|_| panic!("invalid float32: {s:?}"))
-                                .unwrap(),
-                        ),
-                        ArrayBuilderImpl::Float64(_) => ScalarImpl::Float64(
-                            s.parse()
-                                .map_err(|_| panic!("invalid float64: {s:?}"))
-                                .unwrap(),
-                        ),
-                        ArrayBuilderImpl::NaiveDateTime(_) => {
-                            ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper(
-                                s.parse()
-                                    .map_err(|_| panic!("invalid datetime: {s:?}"))
-                                    .unwrap(),
-                            ))
-                        }
-                        ArrayBuilderImpl::Utf8(_) => ScalarImpl::Utf8(s.into()),
-                        ArrayBuilderImpl::Struct(builder) => {
-                            assert!(s.starts_with('{') && s.ends_with('}'));
-                            let fields = s[1..s.len() - 1]
-                                .split(',')
-                                .zip_eq_debug(&builder.children_array)
-                                .map(|(s, builder)| parse_datum(s, builder))
-                                .collect_vec();
-                            ScalarImpl::Struct(StructValue::new(fields))
-                        }
-                        b => panic!("invalid data type: {b:?}"),
-                    })
-                }
-                builder.append_datum(&parse_datum(val_str, builder));
+            for ((builder, ty), val_str) in
+                array_builders.iter_mut().zip(&datatypes).zip(&mut token)
+            {
+                let datum = match val_str {
+                    "." => None,
+                    "t" => Some(true.into()),
+                    "f" => Some(false.into()),
+                    _ => Some(ScalarImpl::from_text(val_str.as_bytes(), ty).unwrap()),
+                };
+                builder.append_datum(datum);
             }
             let visible = match token.next() {
                 None | Some("//") => true,
@@ -641,7 +667,6 @@ impl DataChunkTestExt for DataChunk {
 
 #[cfg(test)]
 mod tests {
-
     use crate::array::*;
     use crate::row::Row;
     use crate::{column, column_nonnull};
diff --git a/src/common/src/array/error.rs b/src/common/src/array/error.rs
index ed6decb050685..a18041defe54d 100644
--- a/src/common/src/array/error.rs
+++ b/src/common/src/array/error.rs
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 pub use anyhow::anyhow;
-use risingwave_pb::ProstFieldNotFound;
+use risingwave_pb::PbFieldNotFound;
 use thiserror::Error;
 
 use crate::error::{ErrorCode, RwError};
 
 #[derive(Error, Debug)]
 pub enum ArrayError {
-    #[error("Prost decode error: {0}")]
-    ProstDecode(#[from] prost::DecodeError),
+    #[error("Pb decode error: {0}")]
+    PbDecode(#[from] prost::DecodeError),
 
     #[error("I/O error: {0}")]
     Io(#[from] std::io::Error),
@@ -36,8 +36,8 @@ impl From<ArrayError> for RwError {
     }
 }
 
-impl From<ProstFieldNotFound> for ArrayError {
-    fn from(err: ProstFieldNotFound) -> Self {
+impl From<PbFieldNotFound> for ArrayError {
+    fn from(err: PbFieldNotFound) -> Self {
         anyhow!("Failed to decode prost: field not found `{}`", err.0).into()
     }
 }
diff --git a/src/common/src/array/interval_array.rs b/src/common/src/array/interval_array.rs
index d7a7336f2c1ea..5e23ebf4eed1d 100644
--- a/src/common/src/array/interval_array.rs
+++ b/src/common/src/array/interval_array.rs
@@ -13,24 +13,24 @@
 // limitations under the License.
 
 use super::{PrimitiveArray, PrimitiveArrayBuilder};
-use crate::types::interval::IntervalUnit;
+use crate::types::interval::Interval;
 
-pub type IntervalArray = PrimitiveArray<IntervalUnit>;
-pub type IntervalArrayBuilder = PrimitiveArrayBuilder<IntervalUnit>;
+pub type IntervalArray = PrimitiveArray<Interval>;
+pub type IntervalArrayBuilder = PrimitiveArrayBuilder<Interval>;
 
 #[cfg(test)]
 mod tests {
     use super::IntervalArray;
-    use crate::array::interval_array::{IntervalArrayBuilder, IntervalUnit};
+    use crate::array::interval_array::{Interval, IntervalArrayBuilder};
     use crate::array::{Array, ArrayBuilder};
-    use crate::types::interval::test_utils::IntervalUnitTestExt;
+    use crate::types::interval::test_utils::IntervalTestExt;
 
     #[test]
     fn test_interval_array() {
         let cardinality = 5;
         let mut array_builder = IntervalArrayBuilder::new(cardinality);
         for _ in 0..cardinality {
-            let v = IntervalUnit::from_ymd(1, 0, 0);
+            let v = Interval::from_ymd(1, 0, 0);
             array_builder.append(Some(v));
         }
         let ret_arr = array_builder.finish();
@@ -38,7 +38,7 @@ mod tests {
             assert_eq!(v.get_months(), 12);
             assert_eq!(v.get_days(), 0);
         }
-        let ret_arr = IntervalArray::from_iter([Some(IntervalUnit::from_ymd(1, 0, 0)), None]);
+        let ret_arr = IntervalArray::from_iter([Some(Interval::from_ymd(1, 0, 0)), None]);
         let v = ret_arr.value_at(0).unwrap();
         assert_eq!(v.get_months(), 12);
         assert_eq!(v.get_days(), 0);
diff --git a/src/common/src/array/iterator.rs b/src/common/src/array/iterator.rs
index 5072903489a4b..c0d4e2361053a 100644
--- a/src/common/src/array/iterator.rs
+++ b/src/common/src/array/iterator.rs
@@ -34,7 +34,8 @@ impl<'a, A: Array> Iterator for ArrayIterator<'a, A> {
         if self.pos >= self.data.len() {
             None
         } else {
-            let item = self.data.value_at(self.pos);
+            // SAFETY: bounds check is done by `self.pos < self.data.len()`.
+            let item = unsafe { self.data.value_at_unchecked(self.pos) };
             self.pos += 1;
             Some(item)
         }
diff --git a/src/common/src/array/jsonb_array.rs b/src/common/src/array/jsonb_array.rs
index ad393bc59d0a4..f58608c9b92d7 100644
--- a/src/common/src/array/jsonb_array.rs
+++ b/src/common/src/array/jsonb_array.rs
@@ -274,6 +274,26 @@ impl JsonbRef<'_> {
     }
 }
 
+impl FromIterator<Option<JsonbVal>> for JsonbArray {
+    fn from_iter<I: IntoIterator<Item = Option<JsonbVal>>>(iter: I) -> Self {
+        let iter = iter.into_iter();
+        let mut builder = <Self as Array>::Builder::new(iter.size_hint().0);
+        for i in iter {
+            match i {
+                Some(x) => builder.append(Some(x.as_scalar_ref())),
+                None => builder.append(None),
+            }
+        }
+        builder.finish()
+    }
+}
+
+impl FromIterator<JsonbVal> for JsonbArray {
+    fn from_iter<I: IntoIterator<Item = JsonbVal>>(iter: I) -> Self {
+        iter.into_iter().map(Some).collect()
+    }
+}
+
 #[derive(Debug)]
 pub struct JsonbArrayBuilder {
     bitmap: BitmapBuilder,
@@ -353,7 +373,7 @@ impl Array for JsonbArray {
         self.data.len()
     }
 
-    fn to_protobuf(&self) -> super::ProstArray {
+    fn to_protobuf(&self) -> super::PbArray {
         // The memory layout contains `serde_json::Value` trees, but in protobuf we transmit this as
         // variable length bytes in value encoding. That is, one buffer of length n+1 containing
         // start and end offsets into the 2nd buffer containing all value bytes concatenated.
@@ -389,10 +409,10 @@ impl Array for JsonbArray {
         ];
 
         let null_bitmap = self.null_bitmap().to_protobuf();
-        super::ProstArray {
+        super::PbArray {
             null_bitmap: Some(null_bitmap),
             values,
-            array_type: super::ProstArrayType::Jsonb as i32,
+            array_type: super::PbArrayType::Jsonb as i32,
             struct_array_data: None,
             list_array_data: None,
         }
diff --git a/src/common/src/array/list_array.rs b/src/common/src/array/list_array.rs
index 1c060b92c8c5e..8b7f524110d4d 100644
--- a/src/common/src/array/list_array.rs
+++ b/src/common/src/array/list_array.rs
@@ -20,17 +20,16 @@ use std::hash::Hash;
 use bytes::{Buf, BufMut};
 use itertools::EitherOrBoth::{Both, Left, Right};
 use itertools::Itertools;
-use risingwave_pb::data::{Array as ProstArray, ArrayType as ProstArrayType, ListArrayData};
+use risingwave_pb::data::{ListArrayData, PbArray, PbArrayType};
 use serde::{Deserializer, Serializer};
 
 use super::{Array, ArrayBuilder, ArrayBuilderImpl, ArrayImpl, ArrayMeta, ArrayResult, RowRef};
 use crate::buffer::{Bitmap, BitmapBuilder};
 use crate::row::Row;
 use crate::types::to_text::ToText;
-use crate::types::{
-    hash_datum, memcmp_deserialize_datum_from, memcmp_serialize_datum_into, DataType, Datum,
-    DatumRef, Scalar, ScalarRefImpl, ToDatumRef,
-};
+use crate::types::{hash_datum, DataType, Datum, DatumRef, Scalar, ScalarRefImpl, ToDatumRef};
+use crate::util::memcmp_encoding;
+use crate::util::value_encoding::estimate_serialize_datum_size;
 
 #[derive(Debug)]
 pub struct ListArrayBuilder {
@@ -158,7 +157,7 @@ pub struct ListArray {
     bitmap: Bitmap,
     pub(super) offsets: Vec<u32>,
     pub(super) value: Box<ArrayImpl>,
-    value_type: DataType,
+    pub(super) value_type: DataType,
 }
 
 impl Array for ListArray {
@@ -174,10 +173,10 @@ impl Array for ListArray {
         self.bitmap.len()
     }
 
-    fn to_protobuf(&self) -> ProstArray {
+    fn to_protobuf(&self) -> PbArray {
         let value = self.value.to_protobuf();
-        ProstArray {
-            array_type: ProstArrayType::List as i32,
+        PbArray {
+            array_type: PbArrayType::List as i32,
             struct_array_data: None,
             list_array_data: Some(Box::new(ListArrayData {
                 offsets: self.offsets.clone(),
@@ -219,7 +218,7 @@ impl Array for ListArray {
 }
 
 impl ListArray {
-    pub fn from_protobuf(array: &ProstArray) -> ArrayResult<ArrayImpl> {
+    pub fn from_protobuf(array: &PbArray) -> ArrayResult<ArrayImpl> {
         ensure!(
             array.values.is_empty(),
             "Must have no buffer in a list array"
@@ -359,7 +358,7 @@ impl ListValue {
         let mut inner_deserializer = memcomparable::Deserializer::new(bytes.as_slice());
         let mut values = Vec::new();
         while inner_deserializer.has_remaining() {
-            values.push(memcmp_deserialize_datum_from(
+            values.push(memcmp_encoding::deserialize_datum_in_composite(
                 datatype,
                 &mut inner_deserializer,
             )?)
@@ -434,7 +433,7 @@ impl<'a> ListRef<'a> {
         let mut inner_serializer = memcomparable::Serializer::new(vec![]);
         iter_elems_ref!(self, it, {
             for datum_ref in it {
-                memcmp_serialize_datum_into(datum_ref, &mut inner_serializer)?
+                memcmp_encoding::serialize_datum_in_composite(datum_ref, &mut inner_serializer)?
             }
         });
         serializer.serialize_bytes(&inner_serializer.into_inner())
@@ -447,6 +446,15 @@ impl<'a> ListRef<'a> {
             }
         })
     }
+
+    /// estimate the serialized size with value encoding
+    pub fn estimate_serialize_size_inner(&self) -> usize {
+        iter_elems_ref!(self, it, {
+            it.fold(0, |acc, datum_ref| {
+                acc + estimate_serialize_datum_size(datum_ref)
+            })
+        })
+    }
 }
 
 impl PartialEq for ListRef<'_> {
diff --git a/src/common/src/array/mod.rs b/src/common/src/array/mod.rs
index 7e955215bccc6..9ce4505397c3c 100644
--- a/src/common/src/array/mod.rs
+++ b/src/common/src/array/mod.rs
@@ -33,6 +33,7 @@ mod primitive_array;
 pub mod serial_array;
 pub mod stream_chunk;
 mod stream_chunk_iter;
+pub mod stream_record;
 pub mod struct_array;
 mod utf8_array;
 mod value_reader;
@@ -45,8 +46,7 @@ use std::sync::Arc;
 pub use bool_array::{BoolArray, BoolArrayBuilder};
 pub use bytes_array::*;
 pub use chrono_array::{
-    NaiveDateArray, NaiveDateArrayBuilder, NaiveDateTimeArray, NaiveDateTimeArrayBuilder,
-    NaiveTimeArray, NaiveTimeArrayBuilder,
+    DateArray, DateArrayBuilder, TimeArray, TimeArrayBuilder, TimestampArray, TimestampArrayBuilder,
 };
 pub use column_proto_readers::*;
 pub use data_chunk::{DataChunk, DataChunkTestExt};
@@ -58,14 +58,14 @@ pub use jsonb_array::{JsonbArray, JsonbArrayBuilder, JsonbRef, JsonbVal};
 pub use list_array::{ListArray, ListArrayBuilder, ListRef, ListValue};
 use paste::paste;
 pub use primitive_array::{PrimitiveArray, PrimitiveArrayBuilder, PrimitiveArrayItemType};
-use risingwave_pb::data::{Array as ProstArray, ArrayType as ProstArrayType};
+use risingwave_pb::data::{PbArray, PbArrayType};
+pub use serial_array::{Serial, SerialArray, SerialArrayBuilder};
 pub use stream_chunk::{Op, StreamChunk, StreamChunkTestExt};
 pub use struct_array::{StructArray, StructArrayBuilder, StructRef, StructValue};
 pub use utf8_array::*;
 pub use vis::{Vis, VisRef};
 
 pub use self::error::ArrayError;
-use crate::array::serial_array::{Serial, SerialArray, SerialArrayBuilder};
 use crate::buffer::Bitmap;
 use crate::types::*;
 use crate::util::iter_util::ZipEqFast;
@@ -74,14 +74,14 @@ pub type ArrayResult<T> = std::result::Result<T, ArrayError>;
 pub type I64Array = PrimitiveArray<i64>;
 pub type I32Array = PrimitiveArray<i32>;
 pub type I16Array = PrimitiveArray<i16>;
-pub type F64Array = PrimitiveArray<OrderedF64>;
-pub type F32Array = PrimitiveArray<OrderedF32>;
+pub type F64Array = PrimitiveArray<F64>;
+pub type F32Array = PrimitiveArray<F32>;
 
 pub type I64ArrayBuilder = PrimitiveArrayBuilder<i64>;
 pub type I32ArrayBuilder = PrimitiveArrayBuilder<i32>;
 pub type I16ArrayBuilder = PrimitiveArrayBuilder<i16>;
-pub type F64ArrayBuilder = PrimitiveArrayBuilder<OrderedF64>;
-pub type F32ArrayBuilder = PrimitiveArrayBuilder<OrderedF32>;
+pub type F64ArrayBuilder = PrimitiveArrayBuilder<F64>;
+pub type F32ArrayBuilder = PrimitiveArrayBuilder<F32>;
 
 /// The hash source for `None` values when hashing an item.
 pub(crate) const NULL_VAL_FOR_HASH: u32 = 0xfffffff0;
@@ -221,7 +221,7 @@ pub trait Array: std::fmt::Debug + Send + Sync + Sized + 'static + Into<ArrayImp
     }
 
     /// Serialize to protobuf
-    fn to_protobuf(&self) -> ProstArray;
+    fn to_protobuf(&self) -> PbArray;
 
     /// Get the null `Bitmap` from `Array`.
     fn null_bitmap(&self) -> &Bitmap;
@@ -344,9 +344,9 @@ macro_rules! for_all_variants {
             { Bool, bool, BoolArray, BoolArrayBuilder },
             { Decimal, decimal, DecimalArray, DecimalArrayBuilder },
             { Interval, interval, IntervalArray, IntervalArrayBuilder },
-            { NaiveDate, naivedate, NaiveDateArray, NaiveDateArrayBuilder },
-            { NaiveDateTime, naivedatetime, NaiveDateTimeArray, NaiveDateTimeArrayBuilder },
-            { NaiveTime, naivetime, NaiveTimeArray, NaiveTimeArrayBuilder },
+            { Date, date, DateArray, DateArrayBuilder },
+            { Timestamp, timestamp, TimestampArray, TimestampArrayBuilder },
+            { Time, time, TimeArray, TimeArrayBuilder },
             { Jsonb, jsonb, JsonbArray, JsonbArrayBuilder },
             { Serial, serial, SerialArray, SerialArrayBuilder },
             { Struct, struct, StructArray, StructArrayBuilder },
@@ -496,7 +496,8 @@ macro_rules! impl_array_builder {
                 }
             }
 
-            /// Append a [`Datum`] or [`DatumRef`] multiple times, return error while type not match.
+            /// Append a [`Datum`] or [`DatumRef`] multiple times,
+            /// panicking if the datum's type does not match the array builder's type.
             pub fn append_datum_n(&mut self, n: usize, datum: impl ToDatumRef) {
                 match datum.to_datum_ref() {
                     None => match self {
@@ -575,7 +576,7 @@ macro_rules! impl_array {
                 }
             }
 
-            pub fn to_protobuf(&self) -> ProstArray {
+            pub fn to_protobuf(&self) -> PbArray {
                 match self {
                     $( Self::$variant_name(inner) => inner.to_protobuf(), )*
                 }
@@ -662,40 +663,36 @@ impl ArrayImpl {
         (0..self.len()).map(|i| self.value_at(i))
     }
 
-    pub fn from_protobuf(array: &ProstArray, cardinality: usize) -> ArrayResult<Self> {
+    pub fn from_protobuf(array: &PbArray, cardinality: usize) -> ArrayResult<Self> {
         use self::column_proto_readers::*;
         use crate::array::value_reader::*;
         let array = match array.array_type() {
-            ProstArrayType::Int16 => read_numeric_array::<i16, I16ValueReader>(array, cardinality)?,
-            ProstArrayType::Int32 => read_numeric_array::<i32, I32ValueReader>(array, cardinality)?,
-            ProstArrayType::Int64 => read_numeric_array::<i64, I64ValueReader>(array, cardinality)?,
-            ProstArrayType::Serial => {
+            PbArrayType::Int16 => read_numeric_array::<i16, I16ValueReader>(array, cardinality)?,
+            PbArrayType::Int32 => read_numeric_array::<i32, I32ValueReader>(array, cardinality)?,
+            PbArrayType::Int64 => read_numeric_array::<i64, I64ValueReader>(array, cardinality)?,
+            PbArrayType::Serial => {
                 read_numeric_array::<Serial, SerialValueReader>(array, cardinality)?
             }
-            ProstArrayType::Float32 => {
-                read_numeric_array::<OrderedF32, F32ValueReader>(array, cardinality)?
-            }
-            ProstArrayType::Float64 => {
-                read_numeric_array::<OrderedF64, F64ValueReader>(array, cardinality)?
-            }
-            ProstArrayType::Bool => read_bool_array(array, cardinality)?,
-            ProstArrayType::Utf8 => {
+            PbArrayType::Float32 => read_numeric_array::<F32, F32ValueReader>(array, cardinality)?,
+            PbArrayType::Float64 => read_numeric_array::<F64, F64ValueReader>(array, cardinality)?,
+            PbArrayType::Bool => read_bool_array(array, cardinality)?,
+            PbArrayType::Utf8 => {
                 read_string_array::<Utf8ArrayBuilder, Utf8ValueReader>(array, cardinality)?
             }
-            ProstArrayType::Decimal => {
+            PbArrayType::Decimal => {
                 read_numeric_array::<Decimal, DecimalValueReader>(array, cardinality)?
             }
-            ProstArrayType::Date => read_naive_date_array(array, cardinality)?,
-            ProstArrayType::Time => read_naive_time_array(array, cardinality)?,
-            ProstArrayType::Timestamp => read_naive_date_time_array(array, cardinality)?,
-            ProstArrayType::Interval => read_interval_unit_array(array, cardinality)?,
-            ProstArrayType::Jsonb => {
+            PbArrayType::Date => read_date_array(array, cardinality)?,
+            PbArrayType::Time => read_time_array(array, cardinality)?,
+            PbArrayType::Timestamp => read_timestamp_array(array, cardinality)?,
+            PbArrayType::Interval => read_interval_array(array, cardinality)?,
+            PbArrayType::Jsonb => {
                 read_string_array::<JsonbArrayBuilder, JsonbValueReader>(array, cardinality)?
             }
-            ProstArrayType::Struct => StructArray::from_protobuf(array)?,
-            ProstArrayType::List => ListArray::from_protobuf(array)?,
-            ProstArrayType::Unspecified => unreachable!(),
-            ProstArrayType::Bytea => {
+            PbArrayType::Struct => StructArray::from_protobuf(array)?,
+            PbArrayType::List => ListArray::from_protobuf(array)?,
+            PbArrayType::Unspecified => unreachable!(),
+            PbArrayType::Bytea => {
                 read_string_array::<BytesArrayBuilder, BytesValueReader>(array, cardinality)?
             }
         };
diff --git a/src/common/src/array/primitive_array.rs b/src/common/src/array/primitive_array.rs
index 00601851dc733..e299a3b999ffb 100644
--- a/src/common/src/array/primitive_array.rs
+++ b/src/common/src/array/primitive_array.rs
@@ -18,7 +18,7 @@ use std::mem::size_of;
 
 use risingwave_pb::common::buffer::CompressionType;
 use risingwave_pb::common::Buffer;
-use risingwave_pb::data::{Array as ProstArray, ArrayType};
+use risingwave_pb::data::{ArrayType, PbArray};
 
 use super::{Array, ArrayBuilder, ArrayResult};
 use crate::array::serial_array::Serial;
@@ -26,10 +26,8 @@ use crate::array::{ArrayBuilderImpl, ArrayImpl, ArrayMeta};
 use crate::buffer::{Bitmap, BitmapBuilder};
 use crate::for_all_native_types;
 use crate::types::decimal::Decimal;
-use crate::types::interval::IntervalUnit;
-use crate::types::{
-    NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper, NativeType, Scalar, ScalarRef,
-};
+use crate::types::interval::Interval;
+use crate::types::{Date, NativeType, Scalar, ScalarRef, Time, Timestamp};
 
 /// Physical type of array items which have fixed size.
 pub trait PrimitiveArrayItemType
@@ -120,10 +118,10 @@ macro_rules! impl_primitive_for_others {
 
 impl_primitive_for_others! {
     { Decimal, Decimal, Decimal },
-    { IntervalUnit, Interval, Interval },
-    { NaiveDateWrapper, Date, NaiveDate },
-    { NaiveTimeWrapper, Time, NaiveTime },
-    { NaiveDateTimeWrapper, Timestamp, NaiveDateTime }
+    { Interval, Interval, Interval },
+    { Date, Date, Date },
+    { Time, Time, Time },
+    { Timestamp, Timestamp, Timestamp }
 }
 
 /// `PrimitiveArray` is a collection of primitive types, such as `i32`, `f32`.
@@ -188,7 +186,7 @@ impl<T: PrimitiveArrayItemType> Array for PrimitiveArray<T> {
         self.data.len()
     }
 
-    fn to_protobuf(&self) -> ProstArray {
+    fn to_protobuf(&self) -> PbArray {
         let mut output_buffer = Vec::<u8>::with_capacity(self.len() * size_of::<T>());
 
         for v in self.iter() {
@@ -200,7 +198,7 @@ impl<T: PrimitiveArrayItemType> Array for PrimitiveArray<T> {
             body: output_buffer,
         };
         let null_bitmap = self.null_bitmap().to_protobuf();
-        ProstArray {
+        PbArray {
             null_bitmap: Some(null_bitmap),
             values: vec![buffer],
             array_type: T::array_type() as i32,
@@ -278,7 +276,7 @@ impl<T: PrimitiveArrayItemType> ArrayBuilder for PrimitiveArrayBuilder<T> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::types::{OrderedF32, OrderedF64};
+    use crate::types::{F32, F64};
 
     fn helper_test_builder<T: PrimitiveArrayItemType>(data: Vec<Option<T>>) -> PrimitiveArray<T> {
         let mut builder = PrimitiveArrayBuilder::<T>::new(data.len());
@@ -326,7 +324,7 @@ mod tests {
 
     #[test]
     fn test_f32_builder() {
-        let arr = helper_test_builder::<OrderedF32>(
+        let arr = helper_test_builder::<F32>(
             (0..1000)
                 .map(|x| {
                     if x % 2 == 0 {
@@ -344,7 +342,7 @@ mod tests {
 
     #[test]
     fn test_f64_builder() {
-        let arr = helper_test_builder::<OrderedF64>(
+        let arr = helper_test_builder::<F64>(
             (0..1000)
                 .map(|x| {
                     if x % 2 == 0 {
diff --git a/src/common/src/array/serial_array.rs b/src/common/src/array/serial_array.rs
index 0854112568440..6bed083972654 100644
--- a/src/common/src/array/serial_array.rs
+++ b/src/common/src/array/serial_array.rs
@@ -18,6 +18,7 @@ use postgres_types::{ToSql as _, Type};
 use serde::{Serialize, Serializer};
 
 use crate::array::{PrimitiveArray, PrimitiveArrayBuilder};
+use crate::util::row_id::RowId;
 
 // Serial is an alias for i64
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Ord, PartialOrd, Default, Hash)]
@@ -37,6 +38,11 @@ impl Serial {
     pub fn into_inner(self) -> i64 {
         self.0
     }
+
+    #[inline]
+    pub fn as_row_id(self) -> RowId {
+        self.0 as RowId
+    }
 }
 
 impl Serialize for Serial {
diff --git a/src/common/src/array/stream_chunk.rs b/src/common/src/array/stream_chunk.rs
index 46fbb511e0603..c9d0cca6c91e0 100644
--- a/src/common/src/array/stream_chunk.rs
+++ b/src/common/src/array/stream_chunk.rs
@@ -15,7 +15,7 @@
 use std::fmt;
 
 use itertools::Itertools;
-use risingwave_pb::data::{Op as ProstOp, StreamChunk as ProstStreamChunk};
+use risingwave_pb::data::{PbOp, PbStreamChunk};
 
 use super::{ArrayResult, DataChunkTestExt};
 use crate::array::column::Column;
@@ -41,22 +41,22 @@ pub enum Op {
 }
 
 impl Op {
-    pub fn to_protobuf(self) -> ProstOp {
+    pub fn to_protobuf(self) -> PbOp {
         match self {
-            Op::Insert => ProstOp::Insert,
-            Op::Delete => ProstOp::Delete,
-            Op::UpdateInsert => ProstOp::UpdateInsert,
-            Op::UpdateDelete => ProstOp::UpdateDelete,
+            Op::Insert => PbOp::Insert,
+            Op::Delete => PbOp::Delete,
+            Op::UpdateInsert => PbOp::UpdateInsert,
+            Op::UpdateDelete => PbOp::UpdateDelete,
         }
     }
 
     pub fn from_protobuf(prost: &i32) -> ArrayResult<Op> {
-        let op = match ProstOp::from_i32(*prost) {
-            Some(ProstOp::Insert) => Op::Insert,
-            Some(ProstOp::Delete) => Op::Delete,
-            Some(ProstOp::UpdateInsert) => Op::UpdateInsert,
-            Some(ProstOp::UpdateDelete) => Op::UpdateDelete,
-            Some(ProstOp::Unspecified) => unreachable!(),
+        let op = match PbOp::from_i32(*prost) {
+            Some(PbOp::Insert) => Op::Insert,
+            Some(PbOp::Delete) => Op::Delete,
+            Some(PbOp::UpdateInsert) => Op::UpdateInsert,
+            Some(PbOp::UpdateDelete) => Op::UpdateDelete,
+            Some(PbOp::Unspecified) => unreachable!(),
             None => bail!("No such op type"),
         };
         Ok(op)
@@ -133,6 +133,10 @@ impl StreamChunk {
         self.data.capacity()
     }
 
+    pub fn selectivity(&self) -> f64 {
+        self.data.selectivity()
+    }
+
     /// Get the reference of the underlying data chunk.
     pub fn data_chunk(&self) -> &DataChunk {
         &self.data
@@ -189,15 +193,15 @@ impl StreamChunk {
         (self.ops, columns, visibility)
     }
 
-    pub fn to_protobuf(&self) -> ProstStreamChunk {
-        ProstStreamChunk {
+    pub fn to_protobuf(&self) -> PbStreamChunk {
+        PbStreamChunk {
             cardinality: self.cardinality() as u32,
             ops: self.ops.iter().map(|op| op.to_protobuf() as i32).collect(),
             columns: self.columns().iter().map(|col| col.to_protobuf()).collect(),
         }
     }
 
-    pub fn from_protobuf(prost: &ProstStreamChunk) -> ArrayResult<Self> {
+    pub fn from_protobuf(prost: &PbStreamChunk) -> ArrayResult<Self> {
         let cardinality = prost.get_cardinality() as usize;
         let mut ops = Vec::with_capacity(cardinality);
         for op in prost.get_ops() {
@@ -337,7 +341,7 @@ impl StreamChunkTestExt for StreamChunk {
     /// //     f: f32
     /// //     T: str
     /// //    TS: Timestamp
-    /// //   TSZ: Timestamptz
+    /// //   SRL: Serial
     /// // {i,f}: struct
     /// ```
     fn from_pretty(s: &str) -> Self {
diff --git a/src/common/src/array/stream_chunk_iter.rs b/src/common/src/array/stream_chunk_iter.rs
index 9b3b6f7584a12..f00ef18840ee0 100644
--- a/src/common/src/array/stream_chunk_iter.rs
+++ b/src/common/src/array/stream_chunk_iter.rs
@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::iter::once;
-
-use auto_enums::auto_enum;
-
 use super::data_chunk_iter::DataChunkRefIter;
+use super::stream_record::Record;
 use super::RowRef;
 use crate::array::{Op, StreamChunk};
 
@@ -50,7 +47,7 @@ pub struct StreamChunkRefIter<'a> {
 }
 
 impl<'a> Iterator for StreamChunkRefIter<'a> {
-    type Item = RecordRef<'a>;
+    type Item = Record<RowRef<'a>>;
 
     fn next(&mut self) -> Option<Self::Item> {
         let row = self.inner.next()?;
@@ -58,17 +55,17 @@ impl<'a> Iterator for StreamChunkRefIter<'a> {
         let op = unsafe { self.chunk.ops().get_unchecked(row.index()) };
 
         match op {
-            Op::Insert => Some(RecordRef::Insert(row)),
-            Op::Delete => Some(RecordRef::Delete(row)),
+            Op::Insert => Some(Record::Insert { new_row: row }),
+            Op::Delete => Some(Record::Delete { old_row: row }),
             Op::UpdateDelete => {
                 let insert_row = self.inner.next().expect("expect a row after U-");
                 // SAFETY: index is checked since `insert_row` is `Some`.
                 let op = unsafe { *self.chunk.ops().get_unchecked(insert_row.index()) };
                 debug_assert_eq!(op, Op::UpdateInsert, "expect a U+ after U-");
 
-                Some(RecordRef::Update {
-                    delete: row,
-                    insert: insert_row,
+                Some(Record::Update {
+                    old_row: row,
+                    new_row: insert_row,
                 })
             }
             Op::UpdateInsert => panic!("expect a U- before U+"),
@@ -81,37 +78,13 @@ impl<'a> Iterator for StreamChunkRefIter<'a> {
     }
 }
 
-#[derive(Debug, Clone)]
-pub enum RecordRef<'a> {
-    Insert(RowRef<'a>),
-    Delete(RowRef<'a>),
-    Update {
-        delete: RowRef<'a>,
-        insert: RowRef<'a>,
-    },
-}
-
-impl<'a> RecordRef<'a> {
-    /// Convert this stream record to one or two rows with corresponding ops.
-    #[auto_enum(Iterator)]
-    pub fn into_row_refs(self) -> impl Iterator<Item = (Op, RowRef<'a>)> {
-        match self {
-            RecordRef::Insert(row_ref) => once((Op::Insert, row_ref)),
-            RecordRef::Delete(row_ref) => once((Op::Delete, row_ref)),
-            RecordRef::Update { delete, insert } => {
-                [(Op::UpdateDelete, delete), (Op::UpdateInsert, insert)].into_iter()
-            }
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     extern crate test;
     use itertools::Itertools;
     use test::Bencher;
 
-    use super::RecordRef;
+    use crate::array::stream_record::Record;
     use crate::row::Row;
     use crate::test_utils::test_stream_chunk::{
         BigStreamChunk, TestStreamChunk, WhatEverStreamChunk,
@@ -134,7 +107,7 @@ mod tests {
         let chunk = test.stream_chunk();
         let mut rows = chunk
             .records()
-            .flat_map(RecordRef::into_row_refs)
+            .flat_map(Record::into_rows)
             .map(|(op, row)| (op, row.into_owned_row()));
         assert_eq!(Some(test.row_with_op_at(0)), rows.next());
         assert_eq!(Some(test.row_with_op_at(1)), rows.next());
@@ -146,7 +119,7 @@ mod tests {
     fn bench_rows_iterator_from_records(b: &mut Bencher) {
         let chunk = BigStreamChunk::new(10000).stream_chunk();
         b.iter(|| {
-            for (_op, row) in chunk.records().flat_map(RecordRef::into_row_refs) {
+            for (_op, row) in chunk.records().flat_map(Record::into_rows) {
                 test::black_box(row.iter().count());
             }
         })
@@ -180,11 +153,11 @@ mod tests {
         b.iter(|| {
             for record in chunk.records() {
                 match record {
-                    RecordRef::Insert(row) => test::black_box(row.iter().count()),
-                    RecordRef::Delete(row) => test::black_box(row.iter().count()),
-                    RecordRef::Update { delete, insert } => {
-                        test::black_box(delete.iter().count());
-                        test::black_box(insert.iter().count())
+                    Record::Insert { new_row } => test::black_box(new_row.iter().count()),
+                    Record::Delete { old_row } => test::black_box(old_row.iter().count()),
+                    Record::Update { old_row, new_row } => {
+                        test::black_box(old_row.iter().count());
+                        test::black_box(new_row.iter().count())
                     }
                 };
             }
diff --git a/src/common/src/array/stream_record.rs b/src/common/src/array/stream_record.rs
new file mode 100644
index 0000000000000..22c027e0ebd31
--- /dev/null
+++ b/src/common/src/array/stream_record.rs
@@ -0,0 +1,155 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 auto_enums::auto_enum;
+
+use super::StreamChunk;
+use crate::array::Op;
+use crate::row::Row;
+use crate::types::DataType;
+
+/// Type of a row change, without row data.
+pub enum RecordType {
+    Insert,
+    Delete,
+    Update,
+}
+
+/// Generic type to represent a row change.
+#[derive(Debug, Clone)]
+pub enum Record<R: Row> {
+    Insert { new_row: R },
+    Delete { old_row: R },
+    Update { old_row: R, new_row: R },
+}
+
+impl<R: Row> Record<R> {
+    /// Convert this stream record to one or two rows with corresponding ops.
+    #[auto_enum(Iterator)]
+    pub fn into_rows(self) -> impl Iterator<Item = (Op, R)> {
+        match self {
+            Record::Insert { new_row } => std::iter::once((Op::Insert, new_row)),
+            Record::Delete { old_row } => std::iter::once((Op::Delete, old_row)),
+            Record::Update { old_row, new_row } => {
+                [(Op::UpdateDelete, old_row), (Op::UpdateInsert, new_row)].into_iter()
+            }
+        }
+    }
+
+    /// Get record type of this record.
+    pub fn to_record_type(&self) -> RecordType {
+        match self {
+            Record::Insert { .. } => RecordType::Insert,
+            Record::Delete { .. } => RecordType::Delete,
+            Record::Update { .. } => RecordType::Update,
+        }
+    }
+
+    /// Convert this stream record to a stream chunk containing only 1 or 2 rows.
+    pub fn to_stream_chunk(&self, data_types: &[DataType]) -> StreamChunk {
+        match self {
+            Record::Insert { new_row } => {
+                StreamChunk::from_rows(&[(Op::Insert, new_row.to_owned_row())], data_types)
+            }
+            Record::Delete { old_row } => {
+                StreamChunk::from_rows(&[(Op::Delete, old_row.to_owned_row())], data_types)
+            }
+            Record::Update { old_row, new_row } => StreamChunk::from_rows(
+                &[
+                    (Op::UpdateDelete, old_row.to_owned_row()),
+                    (Op::UpdateInsert, new_row.to_owned_row()),
+                ],
+                data_types,
+            ),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::row::OwnedRow;
+    use crate::test_prelude::StreamChunkTestExt;
+
+    #[test]
+    fn test_into_rows() {
+        let record = Record::Insert {
+            new_row: OwnedRow::new(vec![Some(1.into())]),
+        };
+        let rows: Vec<_> = record.into_rows().collect();
+        assert_eq!(rows.len(), 1);
+        assert_eq!(rows[0].0, Op::Insert);
+        assert_eq!(rows[0].1, OwnedRow::new(vec![Some(1.into())]));
+
+        let record = Record::Delete {
+            old_row: OwnedRow::new(vec![Some(1.into())]),
+        };
+        let rows: Vec<_> = record.into_rows().collect();
+        assert_eq!(rows.len(), 1);
+        assert_eq!(rows[0].0, Op::Delete);
+        assert_eq!(rows[0].1, OwnedRow::new(vec![Some(1.into())]));
+
+        let record = Record::Update {
+            old_row: OwnedRow::new(vec![Some(1.into())]),
+            new_row: OwnedRow::new(vec![Some(2.into())]),
+        };
+        let rows: Vec<_> = record.into_rows().collect();
+        assert_eq!(rows.len(), 2);
+        assert_eq!(rows[0].0, Op::UpdateDelete);
+        assert_eq!(rows[0].1, OwnedRow::new(vec![Some(1.into())]));
+        assert_eq!(rows[1].0, Op::UpdateInsert);
+        assert_eq!(rows[1].1, OwnedRow::new(vec![Some(2.into())]));
+    }
+
+    #[test]
+    fn test_to_stream_chunk() {
+        let record = Record::Insert {
+            new_row: OwnedRow::new(vec![Some(1i64.into())]),
+        };
+        let chunk = record.to_stream_chunk(&[DataType::Int64]);
+        assert_eq!(
+            chunk,
+            StreamChunk::from_pretty(
+                " I
+                + 1"
+            )
+        );
+
+        let record = Record::Delete {
+            old_row: OwnedRow::new(vec![Some(1i64.into())]),
+        };
+        let chunk = record.to_stream_chunk(&[DataType::Int64]);
+        assert_eq!(
+            chunk,
+            StreamChunk::from_pretty(
+                " I
+                - 1"
+            )
+        );
+
+        let record = Record::Update {
+            old_row: OwnedRow::new(vec![Some(1i64.into())]),
+            new_row: OwnedRow::new(vec![Some(2i64.into())]),
+        };
+        let chunk = record.to_stream_chunk(&[DataType::Int64]);
+        assert_eq!(
+            chunk,
+            StreamChunk::from_pretty(
+                "  I
+                U- 1
+                U+ 2"
+            )
+        );
+    }
+}
diff --git a/src/common/src/array/struct_array.rs b/src/common/src/array/struct_array.rs
index e1d52cb1a7234..7a069be540921 100644
--- a/src/common/src/array/struct_array.rs
+++ b/src/common/src/array/struct_array.rs
@@ -20,17 +20,16 @@ use std::sync::Arc;
 
 use bytes::{Buf, BufMut};
 use itertools::Itertools;
-use risingwave_pb::data::{Array as ProstArray, ArrayType as ProstArrayType, StructArrayData};
+use risingwave_pb::data::{PbArray, PbArrayType, StructArrayData};
 
 use super::{Array, ArrayBuilder, ArrayBuilderImpl, ArrayImpl, ArrayMeta, ArrayResult};
 use crate::array::ArrayRef;
 use crate::buffer::{Bitmap, BitmapBuilder};
 use crate::types::to_text::ToText;
-use crate::types::{
-    hash_datum, memcmp_deserialize_datum_from, memcmp_serialize_datum_into, DataType, Datum,
-    DatumRef, Scalar, ScalarRefImpl, ToDatumRef,
-};
+use crate::types::{hash_datum, DataType, Datum, DatumRef, Scalar, ScalarRefImpl, ToDatumRef};
 use crate::util::iter_util::ZipEqFast;
+use crate::util::memcmp_encoding;
+use crate::util::value_encoding::estimate_serialize_datum_size;
 
 #[derive(Debug)]
 pub struct StructArrayBuilder {
@@ -173,11 +172,11 @@ impl Array for StructArray {
         self.len
     }
 
-    fn to_protobuf(&self) -> ProstArray {
+    fn to_protobuf(&self) -> PbArray {
         let children_array = self.children.iter().map(|a| a.to_protobuf()).collect();
         let children_type = self.children_type.iter().map(|t| t.to_protobuf()).collect();
-        ProstArray {
-            array_type: ProstArrayType::Struct as i32,
+        PbArray {
+            array_type: PbArrayType::Struct as i32,
             struct_array_data: Some(StructArrayData {
                 children_array,
                 children_type,
@@ -220,7 +219,7 @@ impl Array for StructArray {
 }
 
 impl StructArray {
-    pub fn from_protobuf(array: &ProstArray) -> ArrayResult<ArrayImpl> {
+    pub fn from_protobuf(array: &PbArray) -> ArrayResult<ArrayImpl> {
         ensure!(
             array.values.is_empty(),
             "Must have no buffer in a struct array"
@@ -253,9 +252,9 @@ impl StructArray {
         &self.children_type
     }
 
-    // returns a vector containing a reference to the arrayimpl.
-    pub fn field_arrays(&self) -> Vec<&ArrayImpl> {
-        self.children.iter().map(|f| &(**f)).collect()
+    /// Returns an iterator over the field array.
+    pub fn fields(&self) -> impl ExactSizeIterator<Item = &ArrayImpl> {
+        self.children.iter().map(|f| &(**f))
     }
 
     pub fn field_at(&self, index: usize) -> ArrayRef {
@@ -345,7 +344,7 @@ impl StructValue {
     ) -> memcomparable::Result<Self> {
         fields
             .iter()
-            .map(|field| memcmp_deserialize_datum_from(field, deserializer))
+            .map(|field| memcmp_encoding::deserialize_datum_in_composite(field, deserializer))
             .try_collect()
             .map(Self::new)
     }
@@ -384,7 +383,7 @@ impl<'a> StructRef<'a> {
     ) -> memcomparable::Result<()> {
         iter_fields_ref!(self, it, {
             for datum_ref in it {
-                memcmp_serialize_datum_into(datum_ref, serializer)?
+                memcmp_encoding::serialize_datum_in_composite(datum_ref, serializer)?
             }
             Ok(())
         })
@@ -397,6 +396,14 @@ impl<'a> StructRef<'a> {
             }
         })
     }
+
+    pub fn estimate_serialize_size_inner(&self) -> usize {
+        iter_fields_ref!(self, it, {
+            it.fold(0, |acc, datum_ref| {
+                acc + estimate_serialize_datum_size(datum_ref)
+            })
+        })
+    }
 }
 
 impl PartialEq for StructRef<'_> {
@@ -493,7 +500,7 @@ mod tests {
     use more_asserts::assert_gt;
 
     use super::*;
-    use crate::types::{OrderedF32, OrderedF64};
+    use crate::types::{F32, F64};
     use crate::{array, try_match_expand};
 
     // Empty struct is allowed in postgres.
@@ -595,11 +602,11 @@ mod tests {
     #[test]
     fn test_serialize_deserialize() {
         let value = StructValue::new(vec![
-            Some(OrderedF32::from(3.2).to_scalar_value()),
+            Some(F32::from(3.2).to_scalar_value()),
             Some("abcde".into()),
             Some(
                 StructValue::new(vec![
-                    Some(OrderedF64::from(1.3).to_scalar_value()),
+                    Some(F64::from(1.3).to_scalar_value()),
                     Some("a".into()),
                     None,
                     Some(StructValue::new(vec![]).to_scalar_value()),
diff --git a/src/common/src/array/utf8_array.rs b/src/common/src/array/utf8_array.rs
index b2d080e6cacf4..e929d7a145c91 100644
--- a/src/common/src/array/utf8_array.rs
+++ b/src/common/src/array/utf8_array.rs
@@ -14,7 +14,7 @@
 
 use std::fmt::{Display, Write};
 
-use risingwave_pb::data::{Array as ProstArray, ArrayType};
+use risingwave_pb::data::{ArrayType, PbArray};
 
 use super::bytes_array::{BytesWriter, PartialBytesWriter};
 use super::{Array, ArrayBuilder, ArrayMeta, BytesArray, BytesArrayBuilder};
@@ -43,8 +43,8 @@ impl Array for Utf8Array {
     }
 
     #[inline]
-    fn to_protobuf(&self) -> ProstArray {
-        ProstArray {
+    fn to_protobuf(&self) -> PbArray {
+        PbArray {
             array_type: ArrayType::Utf8 as i32,
             ..self.bytes.to_protobuf()
         }
diff --git a/src/common/src/array/value_reader.rs b/src/common/src/array/value_reader.rs
index 294d38a382d73..96ed7c31b88aa 100644
--- a/src/common/src/array/value_reader.rs
+++ b/src/common/src/array/value_reader.rs
@@ -22,7 +22,7 @@ use crate::array::{
     ArrayBuilder, BytesArrayBuilder, JsonbArrayBuilder, PrimitiveArrayItemType, Serial,
     Utf8ArrayBuilder,
 };
-use crate::types::{Decimal, OrderedF32, OrderedF64};
+use crate::types::{Decimal, F32, F64};
 
 /// Reads an encoded buffer into a value.
 pub trait PrimitiveValueReader<T: PrimitiveArrayItemType> {
@@ -53,8 +53,8 @@ impl_numeric_value_reader!(i16, I16ValueReader, read_i16);
 impl_numeric_value_reader!(i32, I32ValueReader, read_i32);
 impl_numeric_value_reader!(i64, I64ValueReader, read_i64);
 impl_numeric_value_reader!(Serial, SerialValueReader, read_i64);
-impl_numeric_value_reader!(OrderedF32, F32ValueReader, read_f32);
-impl_numeric_value_reader!(OrderedF64, F64ValueReader, read_f64);
+impl_numeric_value_reader!(F32, F32ValueReader, read_f32);
+impl_numeric_value_reader!(F64, F64ValueReader, read_f64);
 
 pub struct DecimalValueReader;
 
diff --git a/src/common/src/array/vis.rs b/src/common/src/array/vis.rs
index 02607e6836f99..9d65e92c7da06 100644
--- a/src/common/src/array/vis.rs
+++ b/src/common/src/array/vis.rs
@@ -17,11 +17,15 @@ use itertools::repeat_n;
 
 use crate::buffer::{Bitmap, BitmapBuilder};
 
-/// `Vis` is a visibility bitmap of rows. When all rows are visible, it is considered compact and
-/// is represented by a single cardinality number rather than that many of ones.
+/// `Vis` is a visibility bitmap of rows.
 #[derive(Clone, PartialEq, Debug)]
 pub enum Vis {
+    /// Non-compact variant.
+    /// Certain rows are hidden using this bitmap.
     Bitmap(Bitmap),
+
+    /// Compact variant which just stores cardinality of rows.
+    /// This can be used when all rows are visible.
     Compact(usize), // equivalent to all ones of this size
 }
 
diff --git a/src/common/src/bin/default_config.rs b/src/common/src/bin/default_config.rs
new file mode 100644
index 0000000000000..98f66854d2d04
--- /dev/null
+++ b/src/common/src/bin/default_config.rs
@@ -0,0 +1,21 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 risingwave_common::config::RwConfig;
+
+fn main() {
+    let config = RwConfig::default();
+    let toml = toml::to_string(&config).unwrap();
+    print!("{}", &toml);
+}
diff --git a/src/common/src/buffer/bitmap.rs b/src/common/src/buffer/bitmap.rs
index d149dc6096c27..d75a150e2c31a 100644
--- a/src/common/src/buffer/bitmap.rs
+++ b/src/common/src/buffer/bitmap.rs
@@ -40,7 +40,7 @@ use std::iter::{self, TrustedLen};
 use std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, Not, RangeInclusive};
 
 use risingwave_pb::common::buffer::CompressionType;
-use risingwave_pb::common::Buffer as ProstBuffer;
+use risingwave_pb::common::PbBuffer;
 
 #[derive(Default, Debug)]
 pub struct BitmapBuilder {
@@ -525,21 +525,21 @@ impl FromIterator<Option<bool>> for Bitmap {
 }
 
 impl Bitmap {
-    pub fn to_protobuf(&self) -> ProstBuffer {
+    pub fn to_protobuf(&self) -> PbBuffer {
         let mut body = Vec::with_capacity((self.num_bits + 7) % 8 + 1);
         body.push((self.num_bits % 8) as u8);
         body.extend_from_slice(unsafe {
             std::slice::from_raw_parts(self.bits.as_ptr() as *const u8, (self.num_bits + 7) / 8)
         });
-        ProstBuffer {
+        PbBuffer {
             body,
             compression: CompressionType::None as i32,
         }
     }
 }
 
-impl From<&ProstBuffer> for Bitmap {
-    fn from(buf: &ProstBuffer) -> Self {
+impl From<&PbBuffer> for Bitmap {
+    fn from(buf: &PbBuffer) -> Self {
         let last_byte_num_bits = buf.body[0];
         let num_bits = ((buf.body.len() - 1) * 8) - ((8 - last_byte_num_bits) % 8) as usize;
 
@@ -762,7 +762,7 @@ mod tests {
     #[test]
     fn test_bitmap_from_protobuf() {
         let bitmap_bytes = vec![3u8 /* len % BITS */, 0b0101_0010, 0b110];
-        let buf = ProstBuffer {
+        let buf = PbBuffer {
             body: bitmap_bytes,
             compression: CompressionType::None as _,
         };
diff --git a/src/common/src/cache.rs b/src/common/src/cache.rs
index 8e9cf19d35b4c..bd16434cfbbde 100644
--- a/src/common/src/cache.rs
+++ b/src/common/src/cache.rs
@@ -23,6 +23,7 @@ use std::collections::HashMap;
 use std::error::Error;
 use std::future::Future;
 use std::hash::Hash;
+use std::ptr;
 use std::ptr::null_mut;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
@@ -37,9 +38,11 @@ const IN_CACHE: u8 = 1;
 const REVERSE_IN_CACHE: u8 = !IN_CACHE;
 
 #[cfg(debug_assertions)]
-const IN_LRU: u8 = 2;
+const IN_LRU: u8 = 1 << 1;
 #[cfg(debug_assertions)]
 const REVERSE_IN_LRU: u8 = !IN_LRU;
+const IS_HIGH_PRI: u8 = 1 << 2;
+const IN_HIGH_PRI_POOL: u8 = 1 << 3;
 
 pub trait LruKey: Eq + Send + Hash {}
 impl<T: Eq + Send + Hash> LruKey for T {}
@@ -47,6 +50,12 @@ impl<T: Eq + Send + Hash> LruKey for T {}
 pub trait LruValue: Send + Sync {}
 impl<T: Send + Sync> LruValue for T {}
 
+#[derive(Clone, Copy, Eq, PartialEq)]
+pub enum CachePriority {
+    High,
+    Low,
+}
+
 /// An entry is a variable length heap-allocated structure.
 /// Entries are referenced by cache and/or by any external entity.
 /// The cache keeps all its entries in a hash table. Some elements
@@ -142,6 +151,30 @@ impl<K: LruKey, T: LruValue> LruHandle<K, T> {
         }
     }
 
+    fn is_high_priority(&self) -> bool {
+        (self.flags & IS_HIGH_PRI) > 0
+    }
+
+    fn set_high_priority(&mut self, high_priority: bool) {
+        if high_priority {
+            self.flags |= IS_HIGH_PRI;
+        } else {
+            self.flags &= !IS_HIGH_PRI;
+        }
+    }
+
+    fn set_in_high_pri_pool(&mut self, in_high_pri_pool: bool) {
+        if in_high_pri_pool {
+            self.flags |= IN_HIGH_PRI_POOL;
+        } else {
+            self.flags &= !IN_HIGH_PRI_POOL;
+        }
+    }
+
+    fn is_in_high_pri_pool(&self) -> bool {
+        (self.flags & IN_HIGH_PRI_POOL) > 0
+    }
+
     fn add_ref(&mut self) {
         self.refs += 1;
     }
@@ -329,8 +362,13 @@ impl<K: LruKey, T: LruValue> LruHandleTable<K, T> {
 type RequestQueue<K, T> = Vec<Sender<CacheableEntry<K, T>>>;
 pub struct LruCacheShard<K: LruKey, T: LruValue> {
     /// The dummy header node of a ring linked list. The linked list is a LRU list, holding the
-    /// cache handles that are not used externally.
+    /// cache handles that are not used externally. lru.prev point to the head of linked list while
+    ///  lru.next point to the tail of linked-list. Every time when the usage of cache reaches
+    /// capacity  we will remove lru.next at first.
     lru: Box<LruHandle<K, T>>,
+    low_priority_head: *mut LruHandle<K, T>,
+    high_priority_pool_capacity: usize,
+    high_priority_pool_usage: usize,
     table: LruHandleTable<K, T>,
     // TODO: may want to use an atomic object linked list shared by all shards.
     object_pool: Vec<Box<LruHandle<K, T>>>,
@@ -343,12 +381,13 @@ pub struct LruCacheShard<K: LruKey, T: LruValue> {
 unsafe impl<K: LruKey, T: LruValue> Send for LruCacheShard<K, T> {}
 
 impl<K: LruKey, T: LruValue> LruCacheShard<K, T> {
-    fn new(capacity: usize, object_capacity: usize) -> Self {
+    // high_priority_ratio_percent 100 means 100%
+    fn new_with_priority_pool(capacity: usize, high_priority_ratio_percent: usize) -> Self {
         let mut lru = Box::<LruHandle<K, T>>::default();
         lru.prev = lru.as_mut();
         lru.next = lru.as_mut();
-        let mut object_pool = Vec::with_capacity(object_capacity);
-        for _ in 0..object_capacity {
+        let mut object_pool = Vec::with_capacity(DEFAULT_OBJECT_POOL_SIZE);
+        for _ in 0..DEFAULT_OBJECT_POOL_SIZE {
             object_pool.push(Box::default());
         }
         Self {
@@ -356,9 +395,12 @@ impl<K: LruKey, T: LruValue> LruCacheShard<K, T> {
             lru_usage: Arc::new(AtomicUsize::new(0)),
             usage: Arc::new(AtomicUsize::new(0)),
             object_pool,
+            low_priority_head: lru.as_mut(),
+            high_priority_pool_capacity: high_priority_ratio_percent * capacity / 100,
             lru,
             table: LruHandleTable::new(),
             write_request: HashMap::with_capacity(16),
+            high_priority_pool_usage: 0,
         }
     }
 
@@ -370,29 +412,59 @@ impl<K: LruKey, T: LruValue> LruCacheShard<K, T> {
             (*e).set_in_lru(false);
         }
 
+        if ptr::eq(e, self.low_priority_head) {
+            self.low_priority_head = (*e).prev;
+        }
+
         (*(*e).next).prev = (*e).prev;
         (*(*e).prev).next = (*e).next;
         (*e).prev = null_mut();
         (*e).next = null_mut();
+        if (*e).is_in_high_pri_pool() {
+            debug_assert!(self.high_priority_pool_usage >= (*e).charge);
+            self.high_priority_pool_usage -= (*e).charge;
+        }
         self.lru_usage.fetch_sub((*e).charge, Ordering::Relaxed);
     }
 
     // insert entry in the end of the linked-list
     unsafe fn lru_insert(&mut self, e: *mut LruHandle<K, T>) {
         debug_assert!(!e.is_null());
+        let mut entry = &mut (*e);
         #[cfg(debug_assertions)]
         {
             assert!(!(*e).is_in_lru());
             (*e).set_in_lru(true);
         }
 
-        (*e).next = self.lru.as_mut();
-        (*e).prev = self.lru.prev;
-        (*(*e).prev).next = e;
-        (*(*e).next).prev = e;
+        if self.high_priority_pool_capacity > 0 && entry.is_high_priority() {
+            entry.set_in_high_pri_pool(true);
+            entry.next = self.lru.as_mut();
+            entry.prev = self.lru.prev;
+            (*entry.prev).next = e;
+            (*entry.next).prev = e;
+            self.high_priority_pool_usage += (*e).charge;
+            self.maintain_pool_size();
+        } else {
+            entry.set_in_high_pri_pool(false);
+            entry.next = (*self.low_priority_head).next;
+            entry.prev = self.low_priority_head;
+            (*entry.next).prev = e;
+            (*entry.prev).next = e;
+            self.low_priority_head = e;
+        }
         self.lru_usage.fetch_add((*e).charge, Ordering::Relaxed);
     }
 
+    unsafe fn maintain_pool_size(&mut self) {
+        while self.high_priority_pool_usage > self.high_priority_pool_capacity {
+            // overflow last entry in high-pri pool to low-pri pool.
+            self.low_priority_head = (*self.low_priority_head).next;
+            (*self.low_priority_head).set_in_high_pri_pool(false);
+            self.high_priority_pool_usage -= (*self.low_priority_head).charge;
+        }
+    }
+
     unsafe fn evict_from_lru(&mut self, charge: usize, last_reference_list: &mut Vec<(K, T)>) {
         // TODO: may want to optimize by only loading at the beginning and storing at the end for
         // only once.
@@ -442,17 +514,20 @@ impl<K: LruKey, T: LruValue> LruCacheShard<K, T> {
         hash: u64,
         charge: usize,
         value: T,
+        priority: CachePriority,
         last_reference_list: &mut Vec<(K, T)>,
     ) -> *mut LruHandle<K, T> {
         self.evict_from_lru(charge, last_reference_list);
 
-        let handle = if let Some(mut h) = self.object_pool.pop() {
+        let mut handle = if let Some(mut h) = self.object_pool.pop() {
             h.init(key, value, hash, charge);
             h
         } else {
             Box::new(LruHandle::new(key, value, hash, charge))
         };
-
+        if priority == CachePriority::High {
+            handle.set_high_priority(true);
+        }
         let ptr = Box::into_raw(handle);
         let old = self.table.insert(hash, ptr);
         if !old.is_null() {
@@ -589,21 +664,28 @@ pub struct LruCache<K: LruKey, T: LruValue> {
 const DEFAULT_OBJECT_POOL_SIZE: usize = 1024;
 
 impl<K: LruKey, T: LruValue> LruCache<K, T> {
-    pub fn new(num_shard_bits: usize, capacity: usize) -> Self {
-        Self::new_inner(num_shard_bits, capacity, None)
+    pub fn new(num_shard_bits: usize, capacity: usize, high_priority_ratio: usize) -> Self {
+        Self::new_inner(num_shard_bits, capacity, high_priority_ratio, None)
     }
 
     pub fn with_event_listener(
         num_shard_bits: usize,
         capacity: usize,
+        high_priority_ratio: usize,
         listener: Arc<dyn LruCacheEventListener<K = K, T = T>>,
     ) -> Self {
-        Self::new_inner(num_shard_bits, capacity, Some(listener))
+        Self::new_inner(
+            num_shard_bits,
+            capacity,
+            high_priority_ratio,
+            Some(listener),
+        )
     }
 
     fn new_inner(
         num_shard_bits: usize,
         capacity: usize,
+        high_priority_ratio: usize,
         listener: Option<Arc<dyn LruCacheEventListener<K = K, T = T>>>,
     ) -> Self {
         let num_shards = 1 << num_shard_bits;
@@ -612,7 +694,7 @@ impl<K: LruKey, T: LruValue> LruCache<K, T> {
         let mut shard_usages = Vec::with_capacity(num_shards);
         let mut shard_lru_usages = Vec::with_capacity(num_shards);
         for _ in 0..num_shards {
-            let shard = LruCacheShard::new(per_shard, DEFAULT_OBJECT_POOL_SIZE);
+            let shard = LruCacheShard::new_with_priority_pool(per_shard, high_priority_ratio);
             shard_usages.push(shard.usage.clone());
             shard_lru_usages.push(shard.lru_usage.clone());
             shards.push(Mutex::new(shard));
@@ -683,6 +765,7 @@ impl<K: LruKey, T: LruValue> LruCache<K, T> {
         hash: u64,
         charge: usize,
         value: T,
+        priority: CachePriority,
     ) -> CacheableEntry<K, T> {
         let mut to_delete = vec![];
         // Drop the entries outside lock to avoid deadlock.
@@ -690,7 +773,7 @@ impl<K: LruKey, T: LruValue> LruCache<K, T> {
         let handle = unsafe {
             let mut shard = self.shards[self.shard(hash)].lock();
             let pending_request = shard.write_request.remove(&key);
-            let ptr = shard.insert(key, hash, charge, value, &mut to_delete);
+            let ptr = shard.insert(key, hash, charge, value, priority, &mut to_delete);
             debug_assert!(!ptr.is_null());
             if let Some(mut que) = pending_request {
                 (*ptr).add_multi_refs(que.len() as u32);
@@ -850,6 +933,7 @@ impl<K: LruKey + Clone + 'static, T: LruValue + 'static> LruCache<K, T> {
         self: &Arc<Self>,
         hash: u64,
         key: K,
+        priority: CachePriority,
         fetch_value: F,
     ) -> LookupResponse<K, T, E>
     where
@@ -874,7 +958,7 @@ impl<K: LruKey + Clone + 'static, T: LruValue + 'static> LruCache<K, T> {
                     };
                     let (value, charge) = fetch_value.await?;
                     let key2 = guard.mark_success();
-                    let entry = this.insert(key2, hash, charge, value);
+                    let entry = this.insert(key2, hash, charge, value, priority);
                     Ok(entry)
                 });
                 LookupResponse::Miss(join_handle)
@@ -956,7 +1040,7 @@ mod tests {
 
     #[test]
     fn test_cache_shard() {
-        let cache = Arc::new(LruCache::<(u64, u64), Block>::new(2, 256));
+        let cache = Arc::new(LruCache::<(u64, u64), Block>::new(2, 256, 0));
         assert_eq!(cache.shard(0), 0);
         assert_eq!(cache.shard(1), 1);
         assert_eq!(cache.shard(10), 2);
@@ -964,7 +1048,7 @@ mod tests {
 
     #[test]
     fn test_cache_basic() {
-        let cache = Arc::new(LruCache::<(u64, u64), Block>::new(2, 256));
+        let cache = Arc::new(LruCache::<(u64, u64), Block>::new(2, 256, 0));
         let seed = 10244021u64;
         let mut rng = SmallRng::seed_from_u64(seed);
         for _ in 0..100000 {
@@ -987,6 +1071,7 @@ mod tests {
                     offset: block_offset,
                     sst,
                 },
+                CachePriority::High,
             );
         }
         assert_eq!(256, cache.get_memory_usage());
@@ -1009,7 +1094,7 @@ mod tests {
     }
 
     fn create_cache(capacity: usize) -> LruCacheShard<String, String> {
-        LruCacheShard::new(capacity, capacity)
+        LruCacheShard::new_with_priority_pool(capacity, 0)
     }
 
     fn lookup(cache: &mut LruCacheShard<String, String>, key: &str) -> bool {
@@ -1024,7 +1109,12 @@ mod tests {
         }
     }
 
-    fn insert(cache: &mut LruCacheShard<String, String>, key: &str, value: &str) {
+    fn insert_priority(
+        cache: &mut LruCacheShard<String, String>,
+        key: &str,
+        value: &str,
+        priority: CachePriority,
+    ) {
         let mut free_list = vec![];
         unsafe {
             let handle = cache.insert(
@@ -1032,6 +1122,7 @@ mod tests {
                 0,
                 value.len(),
                 value.to_string(),
+                priority,
                 &mut free_list,
             );
             cache.release(handle);
@@ -1039,9 +1130,13 @@ mod tests {
         free_list.clear();
     }
 
+    fn insert(cache: &mut LruCacheShard<String, String>, key: &str, value: &str) {
+        insert_priority(cache, key, value, CachePriority::Low);
+    }
+
     #[test]
     fn test_basic_lru() {
-        let mut cache = create_cache(5);
+        let mut cache = LruCacheShard::new_with_priority_pool(5, 40);
         let keys = vec!["a", "b", "c", "d", "e"];
         for &k in &keys {
             insert(&mut cache, k, k);
@@ -1067,6 +1162,18 @@ mod tests {
         validate_lru_list(&mut cache, vec!["y", "e", "z", "d", "u"]);
         insert(&mut cache, "v", "v");
         validate_lru_list(&mut cache, vec!["e", "z", "d", "u", "v"]);
+        insert_priority(&mut cache, "x", "x", CachePriority::High);
+        validate_lru_list(&mut cache, vec!["z", "d", "u", "v", "x"]);
+        assert!(lookup(&mut cache, "d"));
+        validate_lru_list(&mut cache, vec!["z", "u", "v", "d", "x"]);
+        insert(&mut cache, "y", "y");
+        validate_lru_list(&mut cache, vec!["u", "v", "d", "y", "x"]);
+        insert_priority(&mut cache, "z", "z", CachePriority::High);
+        validate_lru_list(&mut cache, vec!["v", "d", "y", "x", "z"]);
+        insert(&mut cache, "u", "u");
+        validate_lru_list(&mut cache, vec!["d", "y", "u", "x", "z"]);
+        insert_priority(&mut cache, "v", "v", CachePriority::High);
+        validate_lru_list(&mut cache, vec!["y", "u", "x", "z", "v"]);
     }
 
     #[test]
@@ -1088,7 +1195,14 @@ mod tests {
             let h2 = cache.lookup(0, &"k2".to_string());
             assert!(!h2.is_null());
 
-            let h3 = cache.insert("k3".to_string(), 0, 2, "bb".to_string(), &mut free_list);
+            let h3 = cache.insert(
+                "k3".to_string(),
+                0,
+                2,
+                "bb".to_string(),
+                CachePriority::High,
+                &mut free_list,
+            );
             assert_eq!(cache.usage.load(Ordering::Relaxed), 6);
             assert!(!h3.is_null());
             let h4 = cache.lookup(0, &"k1".to_string());
@@ -1116,6 +1230,7 @@ mod tests {
                 0,
                 1,
                 "old_value".to_string(),
+                CachePriority::High,
                 &mut to_delete,
             );
             let old_entry = cache.lookup(0, &"key".to_string());
@@ -1129,6 +1244,7 @@ mod tests {
                 0,
                 1,
                 "new_value".to_string(),
+                CachePriority::Low,
                 &mut to_delete,
             );
             assert!(!(*old_entry).is_in_cache());
@@ -1175,6 +1291,7 @@ mod tests {
                 0,
                 1,
                 "old_value".to_string(),
+                CachePriority::High,
                 &mut to_delete,
             );
             cache.release(insert_handle);
@@ -1188,6 +1305,7 @@ mod tests {
                 0,
                 1,
                 "new_value".to_string(),
+                CachePriority::High,
                 &mut to_delete,
             );
             assert!(!(*old_entry).is_in_cache());
@@ -1222,7 +1340,7 @@ mod tests {
 
     #[test]
     fn test_write_request_pending() {
-        let cache = Arc::new(LruCache::new(0, 5));
+        let cache = Arc::new(LruCache::new(0, 5, 0));
         {
             let mut shard = cache.shards[0].lock();
             insert(&mut shard, "a", "v1");
@@ -1240,7 +1358,7 @@ mod tests {
         match ret2 {
             LookupResult::WaitPendingRequest(mut recv) => {
                 assert!(matches!(recv.try_recv(), Err(TryRecvError::Empty)));
-                cache.insert("b".to_string(), 0, 1, "v2".to_string());
+                cache.insert("b".to_string(), 0, 1, "v2".to_string(), CachePriority::Low);
                 recv.try_recv().unwrap();
                 assert!(
                     matches!(cache.lookup_for_request(0, "b".to_string()), LookupResult::Cached(v) if v.value().eq("v2"))
@@ -1267,18 +1385,36 @@ mod tests {
     #[test]
     fn test_event_listener() {
         let listener = Arc::new(TestLruCacheEventListener::default());
-        let cache = Arc::new(LruCache::with_event_listener(0, 2, listener.clone()));
+        let cache = Arc::new(LruCache::with_event_listener(0, 2, 0, listener.clone()));
 
         // full-fill cache
-        let h = cache.insert("k1".to_string(), 0, 1, "v1".to_string());
+        let h = cache.insert(
+            "k1".to_string(),
+            0,
+            1,
+            "v1".to_string(),
+            CachePriority::High,
+        );
         drop(h);
-        let h = cache.insert("k2".to_string(), 0, 1, "v2".to_string());
+        let h = cache.insert(
+            "k2".to_string(),
+            0,
+            1,
+            "v2".to_string(),
+            CachePriority::High,
+        );
         drop(h);
         assert_eq!(cache.get_memory_usage(), 2);
         assert!(listener.released.lock().is_empty());
 
         // test evict
-        let h = cache.insert("k3".to_string(), 0, 1, "v3".to_string());
+        let h = cache.insert(
+            "k3".to_string(),
+            0,
+            1,
+            "v3".to_string(),
+            CachePriority::High,
+        );
         drop(h);
         assert_eq!(cache.get_memory_usage(), 2);
         assert!(listener.released.lock().remove("k1").is_some());
@@ -1289,22 +1425,22 @@ mod tests {
         assert!(listener.released.lock().remove("k2").is_some());
 
         // test refill
-        let h = cache.insert("k4".to_string(), 0, 1, "v4".to_string());
+        let h = cache.insert("k4".to_string(), 0, 1, "v4".to_string(), CachePriority::Low);
         drop(h);
         assert_eq!(cache.get_memory_usage(), 2);
         assert!(listener.released.lock().is_empty());
 
         // test release after full
         // 1. full-fill cache but not release
-        let h1 = cache.insert("k5".to_string(), 0, 1, "v5".to_string());
+        let h1 = cache.insert("k5".to_string(), 0, 1, "v5".to_string(), CachePriority::Low);
         assert_eq!(cache.get_memory_usage(), 2);
         assert!(listener.released.lock().remove("k3").is_some());
-        let h2 = cache.insert("k6".to_string(), 0, 1, "v6".to_string());
+        let h2 = cache.insert("k6".to_string(), 0, 1, "v6".to_string(), CachePriority::Low);
         assert_eq!(cache.get_memory_usage(), 2);
         assert!(listener.released.lock().remove("k4").is_some());
 
         // 2. insert one more entry after cache is full, cache will be oversized
-        let h3 = cache.insert("k7".to_string(), 0, 1, "v7".to_string());
+        let h3 = cache.insert("k7".to_string(), 0, 1, "v7".to_string(), CachePriority::Low);
         assert_eq!(cache.get_memory_usage(), 3);
         assert!(listener.released.lock().is_empty());
 
@@ -1344,7 +1480,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_future_cancel() {
-        let cache: Arc<LruCache<u64, u64>> = Arc::new(LruCache::new(0, 5));
+        let cache: Arc<LruCache<u64, u64>> = Arc::new(LruCache::new(0, 5, 0));
         // do not need sender because this receiver will be cancelled.
         let (_, recv) = channel::<()>();
         let polled = Arc::new(AtomicBool::new(false));
@@ -1352,7 +1488,7 @@ mod tests {
         let polled2 = polled.clone();
         let f = Box::pin(async move {
             cache2
-                .lookup_with_request_dedup(1, 2, || async move {
+                .lookup_with_request_dedup(1, 2, CachePriority::High, || async move {
                     polled2.store(true, Ordering::Release);
                     recv.await.map(|_| (1, 1))
                 })
diff --git a/src/common/src/catalog/column.rs b/src/common/src/catalog/column.rs
index e73b6ae5ce7e8..29e0d7db7cb13 100644
--- a/src/common/src/catalog/column.rs
+++ b/src/common/src/catalog/column.rs
@@ -15,7 +15,7 @@
 use std::borrow::Cow;
 
 use itertools::Itertools;
-use risingwave_pb::plan_common::{PbColumnCatalog, PbColumnDesc};
+use risingwave_pb::plan_common::{GeneratedColumnDesc, PbColumnCatalog, PbColumnDesc};
 
 use super::row_id_column_desc;
 use crate::catalog::{Field, ROW_ID_COLUMN_ID};
@@ -93,6 +93,7 @@ pub struct ColumnDesc {
     pub name: String,
     pub field_descs: Vec<ColumnDesc>,
     pub type_name: String,
+    pub generated_column: Option<GeneratedColumnDesc>,
 }
 
 impl ColumnDesc {
@@ -103,6 +104,7 @@ impl ColumnDesc {
             name: String::new(),
             field_descs: vec![],
             type_name: String::new(),
+            generated_column: None,
         }
     }
 
@@ -119,6 +121,7 @@ impl ColumnDesc {
                 .map(|f| f.to_protobuf())
                 .collect_vec(),
             type_name: self.type_name.clone(),
+            generated_column: self.generated_column.clone(),
         }
     }
 
@@ -161,6 +164,7 @@ impl ColumnDesc {
             name: name.to_string(),
             field_descs: vec![],
             type_name: "".to_string(),
+            generated_column: None,
         }
     }
 
@@ -180,6 +184,7 @@ impl ColumnDesc {
             name: name.to_string(),
             field_descs: fields,
             type_name: type_name.to_string(),
+            generated_column: None,
         }
     }
 
@@ -194,12 +199,17 @@ impl ColumnDesc {
                 .map(Self::from_field_without_column_id)
                 .collect_vec(),
             type_name: field.type_name.clone(),
+            generated_column: None,
         }
     }
 
     pub fn from_field_without_column_id(field: &Field) -> Self {
         Self::from_field_with_column_id(field, 0)
     }
+
+    pub fn is_generated_column(&self) -> bool {
+        self.generated_column.is_some()
+    }
 }
 
 impl From<PbColumnDesc> for ColumnDesc {
@@ -215,6 +225,7 @@ impl From<PbColumnDesc> for ColumnDesc {
             name: prost.name,
             type_name: prost.type_name,
             field_descs,
+            generated_column: prost.generated_column,
         }
     }
 }
@@ -233,6 +244,7 @@ impl From<&ColumnDesc> for PbColumnDesc {
             name: c.name.clone(),
             field_descs: c.field_descs.iter().map(ColumnDesc::to_protobuf).collect(),
             type_name: c.type_name.clone(),
+            generated_column: c.generated_column.clone(),
         }
     }
 }
@@ -249,6 +261,11 @@ impl ColumnCatalog {
         self.is_hidden
     }
 
+    /// If the column is a generated column
+    pub fn is_generated(&self) -> bool {
+        self.column_desc.generated_column.is_some()
+    }
+
     /// Get a reference to the column desc's data type.
     pub fn data_type(&self) -> &DataType {
         &self.column_desc.data_type
diff --git a/src/common/src/catalog/mod.rs b/src/common/src/catalog/mod.rs
index 4812f05b35cb2..ac30f2dda0cc3 100644
--- a/src/common/src/catalog/mod.rs
+++ b/src/common/src/catalog/mod.rs
@@ -26,6 +26,7 @@ pub use column::*;
 pub use internal_table::*;
 use parse_display::Display;
 pub use physical_table::*;
+use risingwave_pb::catalog::HandleConflictBehavior as PbHandleConflictBehavior;
 pub use schema::{test_utils as schema_test_utils, Field, FieldDisplay, Schema};
 
 pub use crate::constants::hummock;
@@ -83,11 +84,12 @@ pub const USER_COLUMN_ID_OFFSET: i32 = ROW_ID_COLUMN_ID.next().get_id();
 /// Creates a row ID column (for implicit primary key). It'll always have the ID `0` for now.
 pub fn row_id_column_desc() -> ColumnDesc {
     ColumnDesc {
-        data_type: DataType::Int64,
+        data_type: DataType::Serial,
         column_id: ROW_ID_COLUMN_ID,
         name: row_id_column_name(),
         field_descs: vec![],
         type_name: "".to_string(),
+        generated_column: None,
     }
 }
 
@@ -367,10 +369,39 @@ impl From<UserId> for u32 {
     }
 }
 
-#[derive(Clone, Debug)]
-#[cfg_attr(test, derive(PartialEq))]
+#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ConflictBehavior {
+    #[default]
     NoCheck,
-    OverWrite,
+    Overwrite,
     IgnoreConflict,
 }
+
+impl ConflictBehavior {
+    pub fn from_protobuf(tb_conflict_behavior: &PbHandleConflictBehavior) -> Self {
+        match tb_conflict_behavior {
+            PbHandleConflictBehavior::Overwrite => ConflictBehavior::Overwrite,
+            PbHandleConflictBehavior::Ignore => ConflictBehavior::IgnoreConflict,
+            // This is for backward compatibility, in the previous version
+            // `ConflictBehaviorUnspecified' represented `NoCheck`, so just treat it as `NoCheck`.
+            PbHandleConflictBehavior::NoCheck
+            | PbHandleConflictBehavior::ConflictBehaviorUnspecified => ConflictBehavior::NoCheck,
+        }
+    }
+
+    pub fn to_protobuf(self) -> PbHandleConflictBehavior {
+        match self {
+            ConflictBehavior::NoCheck => PbHandleConflictBehavior::NoCheck,
+            ConflictBehavior::Overwrite => PbHandleConflictBehavior::Overwrite,
+            ConflictBehavior::IgnoreConflict => PbHandleConflictBehavior::Ignore,
+        }
+    }
+
+    pub fn debug_to_string(self) -> String {
+        match self {
+            ConflictBehavior::NoCheck => "NoCheck".to_string(),
+            ConflictBehavior::Overwrite => "Overwrite".to_string(),
+            ConflictBehavior::IgnoreConflict => "IgnoreConflict".to_string(),
+        }
+    }
+}
diff --git a/src/common/src/catalog/physical_table.rs b/src/common/src/catalog/physical_table.rs
index 4e163a9a71996..d6f1cb5df4ef2 100644
--- a/src/common/src/catalog/physical_table.rs
+++ b/src/common/src/catalog/physical_table.rs
@@ -15,6 +15,7 @@
 use std::collections::HashMap;
 
 use fixedbitset::FixedBitSet;
+use itertools::Itertools;
 use risingwave_pb::common::PbColumnOrder;
 use risingwave_pb::plan_common::StorageTableDesc;
 
@@ -77,11 +78,32 @@ impl TableDesc {
     }
 
     pub fn to_protobuf(&self) -> StorageTableDesc {
+        let dist_key_indices: Vec<u32> = self.distribution_key.iter().map(|&k| k as u32).collect();
+        let pk_indices: Vec<u32> = self
+            .pk
+            .iter()
+            .map(|v| v.to_protobuf().column_index)
+            .collect();
+        let dist_key_in_pk_indices = dist_key_indices
+            .iter()
+            .map(|&di| {
+                pk_indices
+                    .iter()
+                    .position(|&pi| di == pi)
+                    .unwrap_or_else(|| {
+                        panic!(
+                            "distribution key {:?} must be a subset of primary key {:?}",
+                            dist_key_indices, pk_indices
+                        )
+                    })
+            })
+            .map(|d| d as u32)
+            .collect_vec();
         StorageTableDesc {
             table_id: self.table_id.into(),
             columns: self.columns.iter().map(Into::into).collect(),
             pk: self.pk.iter().map(|v| v.to_protobuf()).collect(),
-            dist_key_indices: self.distribution_key.iter().map(|&k| k as u32).collect(),
+            dist_key_in_pk_indices,
             retention_seconds: self.retention_seconds,
             value_indices: self.value_indices.iter().map(|&v| v as u32).collect(),
             read_prefix_len_hint: self.read_prefix_len_hint as u32,
diff --git a/src/common/src/catalog/schema.rs b/src/common/src/catalog/schema.rs
index 7df02894514dd..04a9e1f690070 100644
--- a/src/common/src/catalog/schema.rs
+++ b/src/common/src/catalog/schema.rs
@@ -15,11 +15,13 @@
 use std::ops::Index;
 
 use itertools::Itertools;
-use risingwave_pb::plan_common::{ColumnDesc as ProstColumnDesc, Field as ProstField};
+use risingwave_pb::plan_common::{PbColumnDesc, PbField};
 
 use super::ColumnDesc;
 use crate::array::ArrayBuilderImpl;
+use crate::types::struct_type::StructType;
 use crate::types::DataType;
+use crate::util::iter_util::ZipEqFast;
 
 /// The field in the schema of the executor's return data
 #[derive(Clone, PartialEq, Eq, Hash)]
@@ -40,8 +42,8 @@ impl std::fmt::Debug for Field {
 }
 
 impl Field {
-    pub fn to_prost(&self) -> ProstField {
-        ProstField {
+    pub fn to_prost(&self) -> PbField {
+        PbField {
             data_type: Some(self.data_type.to_protobuf()),
             name: self.name.to_string(),
         }
@@ -74,8 +76,8 @@ impl From<ColumnDesc> for Field {
     }
 }
 
-impl From<&ProstColumnDesc> for Field {
-    fn from(pb_column_desc: &ProstColumnDesc) -> Self {
+impl From<&PbColumnDesc> for Field {
+    fn from(pb_column_desc: &PbColumnDesc) -> Self {
         Self {
             data_type: pb_column_desc.column_type.as_ref().unwrap().into(),
             name: pb_column_desc.name.clone(),
@@ -162,7 +164,7 @@ impl Schema {
             .collect()
     }
 
-    pub fn to_prost(&self) -> Vec<ProstField> {
+    pub fn to_prost(&self) -> Vec<PbField> {
         self.fields
             .clone()
             .into_iter()
@@ -224,8 +226,8 @@ impl Field {
     }
 }
 
-impl From<&ProstField> for Field {
-    fn from(prost_field: &ProstField) -> Self {
+impl From<&PbField> for Field {
+    fn from(prost_field: &PbField) -> Self {
         Self {
             data_type: DataType::from(prost_field.get_data_type().expect("data type not found")),
             name: prost_field.get_name().clone(),
@@ -251,6 +253,18 @@ impl FromIterator<Field> for Schema {
     }
 }
 
+impl From<&StructType> for Schema {
+    fn from(t: &StructType) -> Self {
+        Schema::new(
+            t.fields
+                .iter()
+                .zip_eq_fast(t.field_names.iter())
+                .map(|(d, s)| Field::with_name(d.clone(), s))
+                .collect(),
+        )
+    }
+}
+
 pub mod test_utils {
     use super::*;
 
diff --git a/src/common/src/catalog/test_utils.rs b/src/common/src/catalog/test_utils.rs
index 54251062b7908..e0df76709ad4c 100644
--- a/src/common/src/catalog/test_utils.rs
+++ b/src/common/src/catalog/test_utils.rs
@@ -56,6 +56,7 @@ impl ColumnDescTestExt for ColumnDesc {
             name: name.to_string(),
             type_name: type_name.to_string(),
             field_descs: fields,
+            generated_column: None,
         }
     }
 }
diff --git a/src/common/src/config.rs b/src/common/src/config.rs
index 77c4cc2d0fb43..765daba9b59e6 100644
--- a/src/common/src/config.rs
+++ b/src/common/src/config.rs
@@ -21,6 +21,7 @@ use std::collections::HashMap;
 use std::fs;
 
 use clap::ValueEnum;
+use risingwave_pb::meta::SystemParams;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
@@ -112,6 +113,9 @@ pub struct RwConfig {
     #[serde(default)]
     pub storage: StorageConfig,
 
+    #[serde(default)]
+    pub system: SystemConfig,
+
     #[serde(flatten)]
     pub unrecognized: HashMap<String, Value>,
 }
@@ -182,6 +186,12 @@ pub struct MetaConfig {
     #[serde(default = "default::meta::periodic_ttl_reclaim_compaction_interval_sec")]
     pub periodic_ttl_reclaim_compaction_interval_sec: u64,
 
+    /// Compute compactor_task_limit for machines with different hardware.Currently cpu is used as
+    /// the main consideration,and is adjusted by max_compactor_task_multiplier, calculated as
+    /// compactor_task_limit = core_num * max_compactor_task_multiplier;
+    #[serde(default = "default::meta::max_compactor_task_multiplier")]
+    pub max_compactor_task_multiplier: u32,
+
     #[serde(flatten)]
     pub unrecognized: HashMap<String, Value>,
 }
@@ -212,6 +222,9 @@ pub struct ServerConfig {
     /// >0 = open metrics
     pub metrics_level: u32,
 
+    #[serde(default = "default::server::telemetry_enabled")]
+    pub telemetry_enabled: bool,
+
     #[serde(flatten)]
     pub unrecognized: HashMap<String, Value>,
 }
@@ -297,20 +310,23 @@ pub struct StorageConfig {
 
     /// Maximum shared buffer size, writes attempting to exceed the capacity will stall until there
     /// is enough space.
-    #[serde(default = "default::storage::shared_buffer_capacity_mb")]
-    pub shared_buffer_capacity_mb: usize,
+    #[serde(default)]
+    pub shared_buffer_capacity_mb: Option<usize>,
 
     /// Whether to enable write conflict detection
     #[serde(default = "default::storage::write_conflict_detection_enabled")]
     pub write_conflict_detection_enabled: bool,
 
     /// Capacity of sstable block cache.
-    #[serde(default = "default::storage::block_cache_capacity_mb")]
-    pub block_cache_capacity_mb: usize,
+    #[serde(default)]
+    pub block_cache_capacity_mb: Option<usize>,
+
+    #[serde(default)]
+    pub high_priority_ratio_in_percent: Option<usize>,
 
     /// Capacity of sstable meta cache.
-    #[serde(default = "default::storage::meta_cache_capacity_mb")]
-    pub meta_cache_capacity_mb: usize,
+    #[serde(default)]
+    pub meta_cache_capacity_mb: Option<usize>,
 
     #[serde(default = "default::storage::disable_remote_compactor")]
     pub disable_remote_compactor: bool,
@@ -327,8 +343,8 @@ pub struct StorageConfig {
     pub share_buffer_upload_concurrency: usize,
 
     /// Capacity of sstable meta cache.
-    #[serde(default = "default::storage::compactor_memory_limit_mb")]
-    pub compactor_memory_limit_mb: usize,
+    #[serde(default)]
+    pub compactor_memory_limit_mb: Option<usize>,
 
     /// Number of SST ids fetched from meta per RPC
     #[serde(default = "default::storage::sstable_id_remote_fetch_number")]
@@ -369,8 +385,8 @@ pub struct FileCacheConfig {
     #[serde(default = "default::file_cache::capacity_mb")]
     pub capacity_mb: usize,
 
-    #[serde(default = "default::file_cache::total_buffer_capacity_mb")]
-    pub total_buffer_capacity_mb: usize,
+    #[serde(default)]
+    pub total_buffer_capacity_mb: Option<usize>,
 
     #[serde(default = "default::file_cache::cache_file_fallocate_unit_mb")]
     pub cache_file_fallocate_unit_mb: usize,
@@ -451,6 +467,71 @@ impl Default for DeveloperConfig {
     }
 }
 
+/// The section `[system]` in `risingwave.toml`.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SystemConfig {
+    /// The interval of periodic barrier.
+    #[serde(default = "default::system::barrier_interval_ms")]
+    pub barrier_interval_ms: u32,
+
+    /// There will be a checkpoint for every n barriers
+    #[serde(default = "default::system::checkpoint_frequency")]
+    pub checkpoint_frequency: u64,
+
+    /// Target size of the Sstable.
+    #[serde(default = "default::system::sstable_size_mb")]
+    pub sstable_size_mb: u32,
+
+    /// Size of each block in bytes in SST.
+    #[serde(default = "default::system::block_size_kb")]
+    pub block_size_kb: u32,
+
+    /// False positive probability of bloom filter.
+    #[serde(default = "default::system::bloom_false_positive")]
+    pub bloom_false_positive: f64,
+
+    #[serde(default = "default::system::state_store")]
+    pub state_store: String,
+
+    /// Remote directory for storing data and metadata objects.
+    #[serde(default = "default::system::data_directory")]
+    pub data_directory: String,
+
+    /// Remote storage url for storing snapshots.
+    #[serde(default = "default::system::backup_storage_url")]
+    pub backup_storage_url: String,
+
+    /// Remote directory for storing snapshots.
+    #[serde(default = "default::system::backup_storage_directory")]
+    pub backup_storage_directory: String,
+
+    #[serde(default = "default::system::telemetry_enabled")]
+    pub telemetry_enabled: bool,
+}
+
+impl Default for SystemConfig {
+    fn default() -> Self {
+        toml::from_str("").unwrap()
+    }
+}
+
+impl SystemConfig {
+    pub fn into_init_system_params(self) -> SystemParams {
+        SystemParams {
+            barrier_interval_ms: Some(self.barrier_interval_ms),
+            checkpoint_frequency: Some(self.checkpoint_frequency),
+            sstable_size_mb: Some(self.sstable_size_mb),
+            block_size_kb: Some(self.block_size_kb),
+            bloom_false_positive: Some(self.bloom_false_positive),
+            state_store: Some(self.state_store),
+            data_directory: Some(self.data_directory),
+            backup_storage_url: Some(self.backup_storage_url),
+            backup_storage_directory: Some(self.backup_storage_directory),
+            telemetry_enabled: Some(self.telemetry_enabled),
+        }
+    }
+}
+
 mod default {
     pub mod meta {
         use crate::config::MetaBackend;
@@ -494,6 +575,10 @@ mod default {
         pub fn periodic_ttl_reclaim_compaction_interval_sec() -> u64 {
             1800 // 30mi
         }
+
+        pub fn max_compactor_task_multiplier() -> u32 {
+            2
+        }
     }
 
     pub mod server {
@@ -513,6 +598,10 @@ mod default {
         pub fn metrics_level() -> u32 {
             0
         }
+
+        pub fn telemetry_enabled() -> bool {
+            true
+        }
     }
 
     pub mod storage {
@@ -537,6 +626,10 @@ mod default {
             512
         }
 
+        pub fn high_priority_ratio_in_percent() -> usize {
+            70
+        }
+
         pub fn meta_cache_capacity_mb() -> usize {
             128
         }
@@ -662,4 +755,94 @@ mod default {
             1024
         }
     }
+
+    pub mod system {
+        use crate::system_param;
+
+        pub fn barrier_interval_ms() -> u32 {
+            system_param::default::barrier_interval_ms()
+        }
+
+        pub fn checkpoint_frequency() -> u64 {
+            system_param::default::checkpoint_frequency()
+        }
+
+        pub fn sstable_size_mb() -> u32 {
+            system_param::default::sstable_size_mb()
+        }
+
+        pub fn block_size_kb() -> u32 {
+            system_param::default::block_size_kb()
+        }
+
+        pub fn bloom_false_positive() -> f64 {
+            system_param::default::bloom_false_positive()
+        }
+
+        pub fn state_store() -> String {
+            system_param::default::state_store()
+        }
+
+        pub fn data_directory() -> String {
+            system_param::default::data_directory()
+        }
+
+        pub fn backup_storage_url() -> String {
+            system_param::default::backup_storage_url()
+        }
+
+        pub fn backup_storage_directory() -> String {
+            system_param::default::backup_storage_directory()
+        }
+
+        pub fn telemetry_enabled() -> bool {
+            system_param::default::telemetry_enabled()
+        }
+    }
+}
+
+pub struct StorageMemoryConfig {
+    pub block_cache_capacity_mb: usize,
+    pub meta_cache_capacity_mb: usize,
+    pub shared_buffer_capacity_mb: usize,
+    pub file_cache_total_buffer_capacity_mb: usize,
+    pub compactor_memory_limit_mb: usize,
+    pub high_priority_ratio_in_percent: usize,
+}
+
+pub fn extract_storage_memory_config(s: &RwConfig) -> StorageMemoryConfig {
+    let block_cache_capacity_mb = s
+        .storage
+        .block_cache_capacity_mb
+        .unwrap_or(default::storage::block_cache_capacity_mb());
+    let meta_cache_capacity_mb = s
+        .storage
+        .meta_cache_capacity_mb
+        .unwrap_or(default::storage::meta_cache_capacity_mb());
+    let shared_buffer_capacity_mb = s
+        .storage
+        .shared_buffer_capacity_mb
+        .unwrap_or(default::storage::shared_buffer_capacity_mb());
+    let file_cache_total_buffer_capacity_mb = s
+        .storage
+        .file_cache
+        .total_buffer_capacity_mb
+        .unwrap_or(default::file_cache::total_buffer_capacity_mb());
+    let compactor_memory_limit_mb = s
+        .storage
+        .compactor_memory_limit_mb
+        .unwrap_or(default::storage::compactor_memory_limit_mb());
+    let high_priority_ratio_in_percent = s
+        .storage
+        .high_priority_ratio_in_percent
+        .unwrap_or(default::storage::high_priority_ratio_in_percent());
+
+    StorageMemoryConfig {
+        block_cache_capacity_mb,
+        meta_cache_capacity_mb,
+        shared_buffer_capacity_mb,
+        file_cache_total_buffer_capacity_mb,
+        compactor_memory_limit_mb,
+        high_priority_ratio_in_percent,
+    }
 }
diff --git a/src/common/src/constants.rs b/src/common/src/constants.rs
index 6c15e62fb06b3..b8d54506ad3c6 100644
--- a/src/common/src/constants.rs
+++ b/src/common/src/constants.rs
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 pub mod hummock {
+    #![expect(clippy::disallowed_methods, reason = "used by bitflags!")]
+
     use bitflags::bitflags;
     bitflags! {
 
diff --git a/src/common/src/error.rs b/src/common/src/error.rs
index 6d1de86fdd4ed..63f9c2e1d9a3f 100644
--- a/src/common/src/error.rs
+++ b/src/common/src/error.rs
@@ -20,7 +20,7 @@ use std::io::Error as IoError;
 use std::time::{Duration, SystemTime};
 
 use memcomparable::Error as MemComparableError;
-use risingwave_pb::ProstFieldNotFound;
+use risingwave_pb::PbFieldNotFound;
 use thiserror::Error;
 use tokio::task::JoinError;
 use tonic::Code;
@@ -250,8 +250,8 @@ impl PartialEq for ErrorCode {
     }
 }
 
-impl From<ProstFieldNotFound> for RwError {
-    fn from(err: ProstFieldNotFound) -> Self {
+impl From<PbFieldNotFound> for RwError {
+    fn from(err: PbFieldNotFound) -> Self {
         ErrorCode::InternalError(format!(
             "Failed to decode prost: field not found `{}`",
             err.0
diff --git a/src/common/src/field_generator/mod.rs b/src/common/src/field_generator/mod.rs
index d313097cfe5ca..8bdfd70b4a702 100644
--- a/src/common/src/field_generator/mod.rs
+++ b/src/common/src/field_generator/mod.rs
@@ -19,6 +19,7 @@ mod varchar;
 use std::time::Duration;
 
 use anyhow::Result;
+use chrono::{DateTime, FixedOffset};
 pub use numeric::*;
 use serde_json::Value;
 pub use timestamp::*;
@@ -51,7 +52,13 @@ pub trait NumericFieldRandomGenerator {
 
 /// fields that can be continuously generated impl this trait
 pub trait NumericFieldSequenceGenerator {
-    fn new(start: Option<String>, end: Option<String>, offset: u64, step: u64) -> Result<Self>
+    fn new(
+        start: Option<String>,
+        end: Option<String>,
+        offset: u64,
+        step: u64,
+        event_offset: u64,
+    ) -> Result<Self>
     where
         Self: Sized;
 
@@ -92,6 +99,7 @@ impl FieldGeneratorImpl {
         end: Option<String>,
         split_index: u64,
         split_num: u64,
+        offset: u64,
     ) -> Result<Self> {
         match data_type {
             DataType::Int16 => Ok(FieldGeneratorImpl::I16Sequence(I16SequenceField::new(
@@ -99,30 +107,35 @@ impl FieldGeneratorImpl {
                 end,
                 split_index,
                 split_num,
+                offset,
             )?)),
             DataType::Int32 => Ok(FieldGeneratorImpl::I32Sequence(I32SequenceField::new(
                 start,
                 end,
                 split_index,
                 split_num,
+                offset,
             )?)),
             DataType::Int64 => Ok(FieldGeneratorImpl::I64Sequence(I64SequenceField::new(
                 start,
                 end,
                 split_index,
                 split_num,
+                offset,
             )?)),
             DataType::Float32 => Ok(FieldGeneratorImpl::F32Sequence(F32SequenceField::new(
                 start,
                 end,
                 split_index,
                 split_num,
+                offset,
             )?)),
             DataType::Float64 => Ok(FieldGeneratorImpl::F64Sequence(F64SequenceField::new(
                 start,
                 end,
                 split_index,
                 split_num,
+                offset,
             )?)),
             _ => unimplemented!(),
         }
@@ -155,11 +168,13 @@ impl FieldGeneratorImpl {
     }
 
     pub fn with_timestamp(
+        base: Option<DateTime<FixedOffset>>,
         max_past: Option<String>,
         max_past_mode: Option<String>,
         seed: u64,
     ) -> Result<Self> {
         Ok(FieldGeneratorImpl::Timestamp(TimestampField::new(
+            base,
             max_past,
             max_past_mode,
             seed,
@@ -262,6 +277,7 @@ mod tests {
                     Some("20".to_string()),
                     split_index,
                     split_num,
+                    0,
                 )
                 .unwrap(),
             );
@@ -293,7 +309,7 @@ mod tests {
             let mut generator = match data_type {
                 DataType::Varchar => FieldGeneratorImpl::with_varchar(None, seed).unwrap(),
                 DataType::Timestamp => {
-                    FieldGeneratorImpl::with_timestamp(None, None, seed).unwrap()
+                    FieldGeneratorImpl::with_timestamp(None, None, None, seed).unwrap()
                 }
                 _ => FieldGeneratorImpl::with_number_random(data_type, None, None, seed).unwrap(),
             };
@@ -321,4 +337,16 @@ mod tests {
             assert_eq!(datum2_new, datum2);
         }
     }
+
+    #[test]
+    fn test_deterministic_timestamp() {
+        let seed = 1234;
+        let base_time: DateTime<FixedOffset> =
+            DateTime::parse_from_rfc3339("2020-01-01T00:00:00+00:00").unwrap();
+        let mut generator =
+            FieldGeneratorImpl::with_timestamp(Some(base_time), None, None, seed).unwrap();
+        let val1 = generator.generate_json(1);
+        let val2 = generator.generate_json(1);
+        assert_eq!(val1, val2);
+    }
 }
diff --git a/src/common/src/field_generator/numeric.rs b/src/common/src/field_generator/numeric.rs
index 18c0ec4fe6091..7685766a66c8c 100644
--- a/src/common/src/field_generator/numeric.rs
+++ b/src/common/src/field_generator/numeric.rs
@@ -22,7 +22,7 @@ use rand::{Rng, SeedableRng};
 use serde_json::json;
 
 use crate::field_generator::{NumericFieldRandomGenerator, NumericFieldSequenceGenerator};
-use crate::types::{Datum, OrderedF32, OrderedF64, Scalar};
+use crate::types::{Datum, Scalar, F32, F64};
 
 trait NumericType
 where
@@ -107,6 +107,7 @@ where
         end_option: Option<String>,
         offset: u64,
         step: u64,
+        event_offset: u64,
     ) -> Result<Self>
     where
         Self: Sized,
@@ -127,7 +128,9 @@ where
             end,
             offset,
             step,
-            ..Default::default()
+            cur: T::from(event_offset).ok_or_else(|| {
+                anyhow::anyhow!("event offset is too big, offset: {}", event_offset,)
+            })?,
         })
     }
 
@@ -162,8 +165,8 @@ macro_rules! for_all_fields_variants {
             { I16RandomField,I16SequenceField,i16 },
             { I32RandomField,I32SequenceField,i32 },
             { I64RandomField,I64SequenceField,i64 },
-            { F32RandomField,F32SequenceField,OrderedF32 },
-            { F64RandomField,F64SequenceField,OrderedF64 }
+            { F32RandomField,F32SequenceField,F32 },
+            { F64RandomField,F64SequenceField,F64 }
         }
     };
 }
@@ -194,7 +197,7 @@ mod tests {
     #[test]
     fn test_sequence_field_generator() {
         let mut i16_field =
-            I16SequenceField::new(Some("5".to_string()), Some("10".to_string()), 0, 1).unwrap();
+            I16SequenceField::new(Some("5".to_string()), Some("10".to_string()), 0, 1, 0).unwrap();
         for i in 5..=10 {
             assert_eq!(i16_field.generate(), json!(i));
         }
@@ -222,12 +225,13 @@ mod tests {
     #[test]
     fn test_sequence_datum_generator() {
         let mut f32_field =
-            F32SequenceField::new(Some("5.0".to_string()), Some("10.0".to_string()), 0, 1).unwrap();
+            F32SequenceField::new(Some("5.0".to_string()), Some("10.0".to_string()), 0, 1, 0)
+                .unwrap();
 
         for i in 5..=10 {
             assert_eq!(
                 f32_field.generate_datum(),
-                Some(OrderedF32::from(i as f32).to_scalar_value())
+                Some(F32::from(i as f32).to_scalar_value())
             );
         }
     }
@@ -247,13 +251,13 @@ mod tests {
     #[test]
     fn test_sequence_field_generator_float() {
         let mut f64_field =
-            F64SequenceField::new(Some("0".to_string()), Some("10".to_string()), 0, 1).unwrap();
+            F64SequenceField::new(Some("0".to_string()), Some("10".to_string()), 0, 1, 0).unwrap();
         for i in 0..=10 {
             assert_eq!(f64_field.generate(), json!(i as f64));
         }
 
         let mut f32_field =
-            F32SequenceField::new(Some("-5".to_string()), Some("5".to_string()), 0, 1).unwrap();
+            F32SequenceField::new(Some("-5".to_string()), Some("5".to_string()), 0, 1, 0).unwrap();
         for i in -5..=5 {
             assert_eq!(f32_field.generate(), json!(i as f32));
         }
diff --git a/src/common/src/field_generator/timestamp.rs b/src/common/src/field_generator/timestamp.rs
index 2165e541bb5af..000f806c66d50 100644
--- a/src/common/src/field_generator/timestamp.rs
+++ b/src/common/src/field_generator/timestamp.rs
@@ -22,7 +22,7 @@ use serde_json::{json, Value};
 use tracing::debug;
 
 use super::DEFAULT_MAX_PAST;
-use crate::types::{Datum, NaiveDateTimeWrapper, Scalar};
+use crate::types::{Datum, Scalar, Timestamp};
 
 #[derive(Debug)]
 enum LocalNow {
@@ -31,6 +31,7 @@ enum LocalNow {
 }
 
 pub struct TimestampField {
+    base: Option<DateTime<FixedOffset>>,
     max_past: Duration,
     local_now: LocalNow,
     seed: u64,
@@ -38,6 +39,7 @@ pub struct TimestampField {
 
 impl TimestampField {
     pub fn new(
+        base: Option<DateTime<FixedOffset>>,
         max_past_option: Option<String>,
         max_past_mode: Option<String>,
         seed: u64,
@@ -61,6 +63,7 @@ impl TimestampField {
         };
         debug!(?local_now, ?max_past, "parse timestamp field option");
         Ok(Self {
+            base,
             // convert to chrono::Duration
             max_past: chrono::Duration::from_std(max_past)?,
             local_now,
@@ -72,12 +75,15 @@ impl TimestampField {
         let milliseconds = self.max_past.num_milliseconds();
         let mut rng = StdRng::seed_from_u64(offset ^ self.seed);
         let max_milliseconds = rng.gen_range(0..=milliseconds);
-        let now = match self.local_now {
-            LocalNow::Relative => Local::now()
-                .naive_local()
-                .duration_round(Duration::microseconds(1))
-                .unwrap(),
-            LocalNow::Absolute(now) => now,
+        let now = match self.base {
+            Some(base) => base.naive_local(),
+            None => match self.local_now {
+                LocalNow::Relative => Local::now()
+                    .naive_local()
+                    .duration_round(Duration::microseconds(1))
+                    .unwrap(),
+                LocalNow::Absolute(now) => now,
+            },
         };
         now - Duration::milliseconds(max_milliseconds)
     }
@@ -87,6 +93,6 @@ impl TimestampField {
     }
 
     pub fn generate_datum(&mut self, offset: u64) -> Datum {
-        Some(NaiveDateTimeWrapper::new(self.generate_data(offset)).to_scalar_value())
+        Some(Timestamp::new(self.generate_data(offset)).to_scalar_value())
     }
 }
diff --git a/src/common/src/hash/consistent_hash/mapping.rs b/src/common/src/hash/consistent_hash/mapping.rs
index 084b005ec8baa..f929a1979dd7e 100644
--- a/src/common/src/hash/consistent_hash/mapping.rs
+++ b/src/common/src/hash/consistent_hash/mapping.rs
@@ -268,10 +268,10 @@ pub type ExpandedParallelUnitMapping = ExpandedMapping<marker::ParallelUnit>;
 
 impl ActorMapping {
     /// Transform this actor mapping to a parallel unit mapping, essentially `transform`.
-    pub fn to_parallel_unit(
-        &self,
-        to_map: &HashMap<ActorId, ParallelUnitId>,
-    ) -> ParallelUnitMapping {
+    pub fn to_parallel_unit<M>(&self, to_map: &M) -> ParallelUnitMapping
+    where
+        M: for<'a> Index<&'a ActorId, Output = ParallelUnitId>,
+    {
         self.transform(to_map)
     }
 
diff --git a/src/common/src/hash/consistent_hash/vnode.rs b/src/common/src/hash/consistent_hash/vnode.rs
index c2f89566934b2..0e015da1e04b9 100644
--- a/src/common/src/hash/consistent_hash/vnode.rs
+++ b/src/common/src/hash/consistent_hash/vnode.rs
@@ -12,9 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use itertools::Itertools;
 use parse_display::Display;
 
+use crate::array::{Array, ArrayImpl, DataChunk};
 use crate::hash::HashCode;
+use crate::row::{Row, RowExt};
+use crate::types::ScalarRefImpl;
+use crate::util::hash_util::Crc32FastBuilder;
+use crate::util::row_id::extract_vnode_id_from_row_id;
 
 /// Parallel unit is the minimal scheduling unit.
 // TODO: make it a newtype
@@ -100,3 +106,78 @@ impl VirtualNode {
         (0..Self::COUNT).map(Self::from_index)
     }
 }
+
+impl VirtualNode {
+    // `compute_chunk` is used to calculate the `VirtualNode` for the columns in the
+    // chunk. When only one column is provided and its type is `Serial`, we consider the column to
+    // be the one that contains RowId, and use a special method to skip the calculation of Hash
+    // and directly extract the `VirtualNode` from `RowId`.
+    pub fn compute_chunk(data_chunk: &DataChunk, keys: &[usize]) -> Vec<VirtualNode> {
+        if let Ok(idx) = keys.iter().exactly_one() &&
+            let ArrayImpl::Serial(serial_array) = data_chunk.column_at(*idx).array_ref() {
+
+            return serial_array.iter()
+                .map(|serial|extract_vnode_id_from_row_id(serial.unwrap().as_row_id()))
+                .collect();
+        }
+
+        data_chunk
+            .get_hash_values(keys, Crc32FastBuilder)
+            .into_iter()
+            .map(|hash| hash.into())
+            .collect()
+    }
+
+    // `compute_row` is used to calculate the `VirtualNode` for the corresponding column in a `Row`.
+    // Similar to `compute_chunk`, it also contains special handling for serial columns.
+    pub fn compute_row(row: impl Row, indices: &[usize]) -> VirtualNode {
+        let project = row.project(indices);
+        if let Ok(Some(ScalarRefImpl::Serial(s))) = project.iter().exactly_one().as_ref() {
+            return extract_vnode_id_from_row_id(s.as_row_id());
+        }
+
+        project.hash(Crc32FastBuilder).into()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::array::DataChunkTestExt;
+    use crate::row::OwnedRow;
+    use crate::types::ScalarImpl;
+    use crate::util::row_id::RowIdGenerator;
+
+    #[tokio::test]
+    async fn test_serial_key_chunk() {
+        let mut gen = RowIdGenerator::new(100);
+        let chunk = format!(
+            "SRL I
+             {} 1
+             {} 2",
+            gen.next().await,
+            gen.next().await,
+        );
+
+        let chunk = DataChunk::from_pretty(chunk.as_str());
+        let vnodes = VirtualNode::compute_chunk(&chunk, &[0]);
+
+        assert_eq!(
+            vnodes.as_slice(),
+            &[VirtualNode::from_index(100), VirtualNode::from_index(100)]
+        );
+    }
+
+    #[tokio::test]
+    async fn test_serial_key_row() {
+        let mut gen = RowIdGenerator::new(100);
+        let row = OwnedRow::new(vec![
+            Some(ScalarImpl::Serial(gen.next().await.into())),
+            Some(ScalarImpl::Int64(12345)),
+        ]);
+
+        let vnode = VirtualNode::compute_row(&row, &[0]);
+
+        assert_eq!(vnode, VirtualNode::from_index(100));
+    }
+}
diff --git a/src/common/src/hash/dispatcher.rs b/src/common/src/hash/dispatcher.rs
index d104fa1b3ce1e..4afaa55339289 100644
--- a/src/common/src/hash/dispatcher.rs
+++ b/src/common/src/hash/dispatcher.rs
@@ -19,7 +19,7 @@ use crate::types::DataType;
 
 /// An enum to help to dynamically dispatch [`HashKey`] template.
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
-enum HashKeyKind {
+pub enum HashKeyKind {
     Key8,
     Key16,
     Key32,
@@ -80,10 +80,7 @@ pub trait HashKeyDispatcher: Sized {
 fn hash_key_size(data_type: &DataType) -> HashKeySize {
     use std::mem::size_of;
 
-    use crate::types::{
-        Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper,
-        OrderedF32, OrderedF64,
-    };
+    use crate::types::{Date, Decimal, Interval, Time, Timestamp, F32, F64};
 
     match data_type {
         // for `Boolean` in `HashKey` use 1 FixedBytes , but in `Array` use 1 FixedBits
@@ -92,14 +89,14 @@ fn hash_key_size(data_type: &DataType) -> HashKeySize {
         DataType::Int32 => HashKeySize::Fixed(size_of::<i32>()),
         DataType::Int64 => HashKeySize::Fixed(size_of::<i64>()),
         DataType::Serial => HashKeySize::Fixed(size_of::<Serial>()),
-        DataType::Float32 => HashKeySize::Fixed(size_of::<OrderedF32>()),
-        DataType::Float64 => HashKeySize::Fixed(size_of::<OrderedF64>()),
+        DataType::Float32 => HashKeySize::Fixed(size_of::<F32>()),
+        DataType::Float64 => HashKeySize::Fixed(size_of::<F64>()),
         DataType::Decimal => HashKeySize::Fixed(size_of::<Decimal>()),
-        DataType::Date => HashKeySize::Fixed(size_of::<NaiveDateWrapper>()),
-        DataType::Time => HashKeySize::Fixed(size_of::<NaiveTimeWrapper>()),
-        DataType::Timestamp => HashKeySize::Fixed(size_of::<NaiveDateTimeWrapper>()),
+        DataType::Date => HashKeySize::Fixed(size_of::<Date>()),
+        DataType::Time => HashKeySize::Fixed(size_of::<Time>()),
+        DataType::Timestamp => HashKeySize::Fixed(size_of::<Timestamp>()),
         DataType::Timestamptz => HashKeySize::Fixed(size_of::<i64>()),
-        DataType::Interval => HashKeySize::Fixed(size_of::<IntervalUnit>()),
+        DataType::Interval => HashKeySize::Fixed(size_of::<Interval>()),
 
         DataType::Varchar => HashKeySize::Variable,
         DataType::Bytea => HashKeySize::Variable,
@@ -120,7 +117,7 @@ const MAX_FIXED_SIZE_KEY_ELEMENTS: usize = 8;
 /// 4. Any column's serialized format can't be used for equality check.
 ///
 /// Otherwise we choose smallest [`crate::hash::FixedSizeKey`] whose size can hold all data types.
-fn calc_hash_key_kind(data_types: &[DataType]) -> HashKeyKind {
+pub fn calc_hash_key_kind(data_types: &[DataType]) -> HashKeyKind {
     if data_types.len() > MAX_FIXED_SIZE_KEY_ELEMENTS {
         return HashKeyKind::KeySerialized;
     }
diff --git a/src/common/src/hash/key.rs b/src/common/src/hash/key.rs
index 2762fcbbe512c..3c568f5d573e9 100644
--- a/src/common/src/hash/key.rs
+++ b/src/common/src/hash/key.rs
@@ -36,12 +36,8 @@ use crate::array::{
     ListRef, StructRef,
 };
 use crate::collection::estimate_size::EstimateSize;
-use crate::hash::VirtualNode;
 use crate::row::{OwnedRow, RowDeserializer};
-use crate::types::{
-    DataType, Decimal, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper, OrderedF32,
-    OrderedF64, ScalarRef,
-};
+use crate::types::{DataType, Date, Decimal, ScalarRef, Time, Timestamp, F32, F64};
 use crate::util::hash_util::Crc32FastBuilder;
 use crate::util::iter_util::ZipEqFast;
 use crate::util::value_encoding::{deserialize_datum, serialize_datum_into};
@@ -60,10 +56,6 @@ impl HashCode {
     pub fn hash_code(self) -> u64 {
         self.0
     }
-
-    pub fn to_vnode(self) -> VirtualNode {
-        VirtualNode::from(self)
-    }
 }
 
 pub trait HashKeySerializer {
@@ -318,7 +310,7 @@ impl HashKeySerDe<'_> for i64 {
     }
 }
 
-impl HashKeySerDe<'_> for OrderedF32 {
+impl HashKeySerDe<'_> for F32 {
     type S = [u8; 4];
 
     fn serialize(self) -> Self::S {
@@ -331,7 +323,7 @@ impl HashKeySerDe<'_> for OrderedF32 {
     }
 }
 
-impl HashKeySerDe<'_> for OrderedF64 {
+impl HashKeySerDe<'_> for F64 {
     type S = [u8; 8];
 
     fn serialize(self) -> Self::S {
@@ -386,7 +378,7 @@ impl<'a> HashKeySerDe<'a> for &'a [u8] {
     }
 }
 
-impl HashKeySerDe<'_> for NaiveDateWrapper {
+impl HashKeySerDe<'_> for Date {
     type S = [u8; 4];
 
     fn serialize(self) -> Self::S {
@@ -399,11 +391,11 @@ impl HashKeySerDe<'_> for NaiveDateWrapper {
     fn deserialize<R: Read>(source: &mut R) -> Self {
         let value = Self::read_fixed_size_bytes::<R, 4>(source);
         let days = i32::from_ne_bytes(value[0..4].try_into().unwrap());
-        NaiveDateWrapper::with_days(days).unwrap()
+        Date::with_days(days).unwrap()
     }
 }
 
-impl HashKeySerDe<'_> for NaiveDateTimeWrapper {
+impl HashKeySerDe<'_> for Timestamp {
     type S = [u8; 12];
 
     fn serialize(self) -> Self::S {
@@ -418,11 +410,11 @@ impl HashKeySerDe<'_> for NaiveDateTimeWrapper {
         let value = Self::read_fixed_size_bytes::<R, 12>(source);
         let secs = i64::from_ne_bytes(value[0..8].try_into().unwrap());
         let nsecs = u32::from_ne_bytes(value[8..12].try_into().unwrap());
-        NaiveDateTimeWrapper::with_secs_nsecs(secs, nsecs).unwrap()
+        Timestamp::with_secs_nsecs(secs, nsecs).unwrap()
     }
 }
 
-impl HashKeySerDe<'_> for NaiveTimeWrapper {
+impl HashKeySerDe<'_> for Time {
     type S = [u8; 8];
 
     fn serialize(self) -> Self::S {
@@ -437,7 +429,7 @@ impl HashKeySerDe<'_> for NaiveTimeWrapper {
         let value = Self::read_fixed_size_bytes::<R, 8>(source);
         let secs = u32::from_ne_bytes(value[0..4].try_into().unwrap());
         let nano = u32::from_ne_bytes(value[4..8].try_into().unwrap());
-        NaiveTimeWrapper::with_secs_nano(secs, nano).unwrap()
+        Time::with_secs_nano(secs, nano).unwrap()
     }
 }
 
@@ -746,9 +738,8 @@ mod tests {
     use crate::array;
     use crate::array::column::Column;
     use crate::array::{
-        BoolArray, DataChunk, DataChunkTestExt, DecimalArray, F32Array, F64Array, I16Array,
-        I32Array, I32ArrayBuilder, I64Array, NaiveDateArray, NaiveDateTimeArray, NaiveTimeArray,
-        Utf8Array,
+        BoolArray, DataChunk, DataChunkTestExt, DateArray, DecimalArray, F32Array, F64Array,
+        I16Array, I32Array, I32ArrayBuilder, I64Array, TimeArray, TimestampArray, Utf8Array,
     };
     use crate::hash::{
         HashKey, Key128, Key16, Key256, Key32, Key64, KeySerialized, PrecomputedBuildHasher,
@@ -763,19 +754,20 @@ mod tests {
         let capacity = 128;
         let seed = 10244021u64;
         let columns = vec![
-            Column::new(seed_rand_array_ref::<BoolArray>(capacity, seed)),
-            Column::new(seed_rand_array_ref::<I16Array>(capacity, seed + 1)),
-            Column::new(seed_rand_array_ref::<I32Array>(capacity, seed + 2)),
-            Column::new(seed_rand_array_ref::<I64Array>(capacity, seed + 3)),
-            Column::new(seed_rand_array_ref::<F32Array>(capacity, seed + 4)),
-            Column::new(seed_rand_array_ref::<F64Array>(capacity, seed + 5)),
-            Column::new(seed_rand_array_ref::<DecimalArray>(capacity, seed + 6)),
-            Column::new(seed_rand_array_ref::<Utf8Array>(capacity, seed + 7)),
-            Column::new(seed_rand_array_ref::<NaiveDateArray>(capacity, seed + 8)),
-            Column::new(seed_rand_array_ref::<NaiveTimeArray>(capacity, seed + 9)),
-            Column::new(seed_rand_array_ref::<NaiveDateTimeArray>(
+            Column::new(seed_rand_array_ref::<BoolArray>(capacity, seed, 0.5)),
+            Column::new(seed_rand_array_ref::<I16Array>(capacity, seed + 1, 0.5)),
+            Column::new(seed_rand_array_ref::<I32Array>(capacity, seed + 2, 0.5)),
+            Column::new(seed_rand_array_ref::<I64Array>(capacity, seed + 3, 0.5)),
+            Column::new(seed_rand_array_ref::<F32Array>(capacity, seed + 4, 0.5)),
+            Column::new(seed_rand_array_ref::<F64Array>(capacity, seed + 5, 0.5)),
+            Column::new(seed_rand_array_ref::<DecimalArray>(capacity, seed + 6, 0.5)),
+            Column::new(seed_rand_array_ref::<Utf8Array>(capacity, seed + 7, 0.5)),
+            Column::new(seed_rand_array_ref::<DateArray>(capacity, seed + 8, 0.5)),
+            Column::new(seed_rand_array_ref::<TimeArray>(capacity, seed + 9, 0.5)),
+            Column::new(seed_rand_array_ref::<TimestampArray>(
                 capacity,
                 seed + 10,
+                0.5,
             )),
         ];
         let types = vec![
diff --git a/src/common/src/hash/mod.rs b/src/common/src/hash/mod.rs
index 58dbada538a7d..477ef4352f6f4 100644
--- a/src/common/src/hash/mod.rs
+++ b/src/common/src/hash/mod.rs
@@ -19,5 +19,5 @@ mod key;
 pub use consistent_hash::bitmap::*;
 pub use consistent_hash::mapping::*;
 pub use consistent_hash::vnode::*;
-pub use dispatcher::HashKeyDispatcher;
+pub use dispatcher::{calc_hash_key_kind, HashKeyDispatcher};
 pub use key::*;
diff --git a/src/common/src/jemalloc.rs b/src/common/src/jemalloc.rs
index 3c13db1866ca3..5b7e1e4a2baed 100644
--- a/src/common/src/jemalloc.rs
+++ b/src/common/src/jemalloc.rs
@@ -14,18 +14,18 @@
 
 /// If <https://github.com/tikv/jemallocator/issues/22> is resolved, we may inline this
 #[macro_export]
-macro_rules! enable_jemalloc_on_linux {
+macro_rules! enable_jemalloc_on_unix {
     () => {
-        #[cfg(target_os = "linux")]
+        #[cfg(unix)]
         #[global_allocator]
         static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
     };
 }
 
 #[macro_export]
-macro_rules! enable_task_local_jemalloc_on_linux {
+macro_rules! enable_task_local_jemalloc_on_unix {
     () => {
-        #[cfg(target_os = "linux")]
+        #[cfg(unix)]
         #[global_allocator]
         static GLOBAL: task_stats_alloc::TaskLocalAlloc<tikv_jemallocator::Jemalloc> =
             task_stats_alloc::TaskLocalAlloc(tikv_jemallocator::Jemalloc);
diff --git a/src/common/src/lib.rs b/src/common/src/lib.rs
index cce75fade92c8..762cae7564719 100644
--- a/src/common/src/lib.rs
+++ b/src/common/src/lib.rs
@@ -54,7 +54,8 @@ pub mod monitor;
 pub mod row;
 pub mod session_config;
 pub mod system_param;
-#[cfg(test)]
+pub mod telemetry;
+
 pub mod test_utils;
 pub mod types;
 
diff --git a/src/common/src/monitor/mod.rs b/src/common/src/monitor/mod.rs
index 1db7bb5d91247..11ff7aa1d3a10 100644
--- a/src/common/src/monitor/mod.rs
+++ b/src/common/src/monitor/mod.rs
@@ -23,6 +23,14 @@ use prometheus::{Histogram, HistogramVec};
 
 use crate::monitor::my_stats::MyHistogram;
 
+#[cfg(target_os = "linux")]
+static PAGESIZE: std::sync::LazyLock<i64> =
+    std::sync::LazyLock::new(|| unsafe { libc::sysconf(libc::_SC_PAGESIZE) });
+
+#[cfg(target_os = "linux")]
+pub static CLOCK_TICK: std::sync::LazyLock<u64> =
+    std::sync::LazyLock::new(|| unsafe { libc::sysconf(libc::_SC_CLK_TCK) as u64 });
+
 /// Define extension method `print` used in `print_statistics`.
 pub trait Print {
     fn print(&self);
diff --git a/src/common/src/monitor/process_linux.rs b/src/common/src/monitor/process_linux.rs
index b7aa65e375c46..2e9701ee1653f 100644
--- a/src/common/src/monitor/process_linux.rs
+++ b/src/common/src/monitor/process_linux.rs
@@ -17,6 +17,10 @@ use std::io::{Error, ErrorKind, Result};
 use prometheus::core::{Collector, Desc};
 use prometheus::{proto, IntCounter, IntGauge, Opts, Registry};
 
+#[cfg(target_os = "linux")]
+use super::{CLOCK_TICK, PAGESIZE};
+use crate::util::resource_util;
+
 /// Monitors current process.
 pub fn monitor_process(registry: &Registry) -> Result<()> {
     let pc = ProcessCollector::new();
@@ -31,6 +35,7 @@ pub struct ProcessCollector {
     cpu_total: IntCounter,
     vsize: IntGauge,
     rss: IntGauge,
+    cpu_core_num: IntGauge,
 }
 
 impl Default for ProcessCollector {
@@ -65,11 +70,16 @@ impl ProcessCollector {
         .unwrap();
         descs.extend(rss.desc().into_iter().cloned());
 
+        let cpu_core_num =
+            IntGauge::with_opts(Opts::new("process_cpu_core_num", "Cpu core num.")).unwrap();
+        descs.extend(cpu_core_num.desc().into_iter().cloned());
+
         Self {
             descs,
             cpu_total,
             vsize,
             rss,
+            cpu_core_num,
         }
     }
 }
@@ -101,11 +111,15 @@ impl Collector for ProcessCollector {
             self.cpu_total.collect()
         };
 
+        self.cpu_core_num
+            .set(resource_util::cpu::total_cpu_available() as i64);
+
         // collect MetricFamilies.
         let mut mfs = Vec::with_capacity(4);
         mfs.extend(cpu_total_mfs);
         mfs.extend(self.vsize.collect());
         mfs.extend(self.rss.collect());
+        mfs.extend(self.cpu_core_num.collect());
         mfs
     }
 }
@@ -148,11 +162,15 @@ impl Collector for ProcessCollector {
             self.cpu_total.collect()
         };
 
+        self.cpu_core_num
+            .set(resource_util::cpu::total_cpu_available() as i64);
+
         // collect MetricFamilies.
         let mut mfs = Vec::with_capacity(4);
         mfs.extend(cpu_total_mfs);
         mfs.extend(self.vsize.collect());
         mfs.extend(self.rss.collect());
+        mfs.extend(self.cpu_core_num.collect());
         mfs
     }
 }
@@ -174,19 +192,15 @@ impl Collector for ProcessCollector {
             self.cpu_total.collect()
         };
 
+        self.cpu_core_num
+            .set(resource_util::cpu::total_cpu_available() as i64);
+
         // collect MetricFamilies.
         let mut mfs = Vec::with_capacity(4);
         mfs.extend(cpu_total_mfs);
         mfs.extend(self.vsize.collect());
         mfs.extend(self.rss.collect());
+        mfs.extend(self.cpu_core_num.collect());
         mfs
     }
 }
-
-#[cfg(target_os = "linux")]
-static PAGESIZE: std::sync::LazyLock<i64> =
-    std::sync::LazyLock::new(|| unsafe { libc::sysconf(libc::_SC_PAGESIZE) });
-
-#[cfg(target_os = "linux")]
-static CLOCK_TICK: std::sync::LazyLock<u64> =
-    std::sync::LazyLock::new(|| unsafe { libc::sysconf(libc::_SC_CLK_TCK) as u64 });
diff --git a/src/common/src/row/mod.rs b/src/common/src/row/mod.rs
index 58419ff917ea9..6cd43e7d25b89 100644
--- a/src/common/src/row/mod.rs
+++ b/src/common/src/row/mod.rs
@@ -13,12 +13,15 @@
 // limitations under the License.
 
 use std::borrow::Cow;
+use std::fmt::Display;
 use std::hash::{BuildHasher, Hasher};
 
 use bytes::{BufMut, Bytes, BytesMut};
+use itertools::Itertools;
 
 use self::empty::EMPTY;
 use crate::hash::HashCode;
+use crate::types::to_text::ToText;
 use crate::types::{hash_datum, DatumRef, ToDatumRef, ToOwnedDatum};
 use crate::util::ordered::OrderedRowSerde;
 use crate::util::value_encoding;
@@ -145,6 +148,25 @@ pub trait RowExt: Row {
     {
         assert_row(Project::new(self, indices))
     }
+
+    fn display(&self) -> impl Display + '_ {
+        struct D<'a, T: Row>(&'a T);
+        impl<'a, T: Row> Display for D<'a, T> {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                write!(
+                    f,
+                    "{}",
+                    self.0.iter().format_with(" | ", |datum, f| {
+                        match datum {
+                            None => f(&"NULL"),
+                            Some(scalar) => f(&format_args!("{}", scalar.to_text())),
+                        }
+                    })
+                )
+            }
+        }
+        D(self)
+    }
 }
 
 impl<R: Row> RowExt for R {}
diff --git a/src/common/src/row/owned_row.rs b/src/common/src/row/owned_row.rs
index afa18c07ae52f..97373e630d8b1 100644
--- a/src/common/src/row/owned_row.rs
+++ b/src/common/src/row/owned_row.rs
@@ -17,8 +17,7 @@ use std::ops::{self, Deref};
 use super::Row;
 use crate::collection::estimate_size::EstimateSize;
 use crate::types::{
-    DataType, Datum, DatumRef, Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper,
-    NaiveTimeWrapper, ScalarImpl, ToDatumRef,
+    DataType, Date, Datum, DatumRef, Decimal, Interval, ScalarImpl, Time, Timestamp, ToDatumRef,
 };
 use crate::util::iter_util::ZipEqDebug;
 use crate::util::value_encoding;
@@ -78,10 +77,10 @@ impl OwnedRow {
                     DataType::Float64 => x.parse::<f64>().unwrap().into(),
                     DataType::Varchar => x.to_string().into(),
                     DataType::Boolean => x.parse::<bool>().unwrap().into(),
-                    DataType::Date => x.parse::<NaiveDateWrapper>().unwrap().into(),
-                    DataType::Time => x.parse::<NaiveTimeWrapper>().unwrap().into(),
-                    DataType::Timestamp => x.parse::<NaiveDateTimeWrapper>().unwrap().into(),
-                    DataType::Interval => x.parse::<IntervalUnit>().unwrap().into(),
+                    DataType::Date => x.parse::<Date>().unwrap().into(),
+                    DataType::Time => x.parse::<Time>().unwrap().into(),
+                    DataType::Timestamp => x.parse::<Timestamp>().unwrap().into(),
+                    DataType::Interval => x.parse::<Interval>().unwrap().into(),
                     DataType::Decimal => x.parse::<Decimal>().unwrap().into(),
                     _ => todo!(),
                 };
@@ -269,7 +268,7 @@ mod tests {
 
     use super::*;
     use crate::row::RowExt;
-    use crate::types::{DataType as Ty, IntervalUnit, ScalarImpl};
+    use crate::types::{DataType as Ty, Interval, ScalarImpl};
     use crate::util::hash_util::Crc32FastBuilder;
 
     #[test]
@@ -283,9 +282,7 @@ mod tests {
             Some(ScalarImpl::Float32(4.0.into())),
             Some(ScalarImpl::Float64(5.0.into())),
             Some(ScalarImpl::Decimal("-233.3".parse().unwrap())),
-            Some(ScalarImpl::Interval(IntervalUnit::from_month_day_usec(
-                7, 8, 9,
-            ))),
+            Some(ScalarImpl::Interval(Interval::from_month_day_usec(7, 8, 9))),
         ]);
         let value_indices = (0..9).collect_vec();
         let bytes = (&row).project(&value_indices).value_serialize();
@@ -318,14 +315,10 @@ mod tests {
             Some(ScalarImpl::Float32(4.0.into())),
             Some(ScalarImpl::Float64(5.0.into())),
             Some(ScalarImpl::Decimal("-233.3".parse().unwrap())),
-            Some(ScalarImpl::Interval(IntervalUnit::from_month_day_usec(
-                7, 8, 9,
-            ))),
+            Some(ScalarImpl::Interval(Interval::from_month_day_usec(7, 8, 9))),
         ]);
         let row2 = OwnedRow::new(vec![
-            Some(ScalarImpl::Interval(IntervalUnit::from_month_day_usec(
-                7, 8, 9,
-            ))),
+            Some(ScalarImpl::Interval(Interval::from_month_day_usec(7, 8, 9))),
             Some(ScalarImpl::Utf8("string".into())),
             Some(ScalarImpl::Bool(true)),
             Some(ScalarImpl::Int16(1)),
diff --git a/src/common/src/session_config/mod.rs b/src/common/src/session_config/mod.rs
index d715de8985091..b8bdc55a58edb 100644
--- a/src/common/src/session_config/mod.rs
+++ b/src/common/src/session_config/mod.rs
@@ -34,7 +34,7 @@ use crate::util::epoch::Epoch;
 
 // This is a hack, &'static str is not allowed as a const generics argument.
 // TODO: refine this using the adt_const_params feature.
-const CONFIG_KEYS: [&str; 21] = [
+const CONFIG_KEYS: [&str; 22] = [
     "RW_IMPLICIT_FLUSH",
     "CREATE_COMPACTION_GROUP_FOR_MV",
     "QUERY_MODE",
@@ -56,6 +56,7 @@ const CONFIG_KEYS: [&str; 21] = [
     "RW_ENABLE_SHARE_PLAN",
     "INTERVALSTYLE",
     "BATCH_PARALLELISM",
+    "RW_STREAMING_ENABLE_BUSHY_JOIN",
 ];
 
 // MUST HAVE 1v1 relationship to CONFIG_KEYS. e.g. CONFIG_KEYS[IMPLICIT_FLUSH] =
@@ -81,6 +82,7 @@ const FORCE_TWO_PHASE_AGG: usize = 17;
 const RW_ENABLE_SHARE_PLAN: usize = 18;
 const INTERVAL_STYLE: usize = 19;
 const BATCH_PARALLELISM: usize = 20;
+const STREAMING_ENABLE_BUSHY_JOIN: usize = 21;
 
 trait ConfigEntry: Default + for<'a> TryFrom<&'a [&'a str], Error = RwError> {
     fn entry_name() -> &'static str;
@@ -277,6 +279,7 @@ type QueryEpoch = ConfigU64<QUERY_EPOCH, 0>;
 type Timezone = ConfigString<TIMEZONE>;
 type StreamingParallelism = ConfigU64<STREAMING_PARALLELISM, 0>;
 type StreamingEnableDeltaJoin = ConfigBool<STREAMING_ENABLE_DELTA_JOIN, false>;
+type StreamingEnableBushyJoin = ConfigBool<STREAMING_ENABLE_BUSHY_JOIN, false>;
 type EnableTwoPhaseAgg = ConfigBool<ENABLE_TWO_PHASE_AGG, true>;
 type ForceTwoPhaseAgg = ConfigBool<FORCE_TWO_PHASE_AGG, false>;
 type EnableSharePlan = ConfigBool<RW_ENABLE_SHARE_PLAN, true>;
@@ -342,6 +345,9 @@ pub struct ConfigMap {
     /// Enable delta join in streaming query. Defaults to false.
     streaming_enable_delta_join: StreamingEnableDeltaJoin,
 
+    /// Enable bushy join in the streaming query. Defaults to false.
+    streaming_enable_bushy_join: StreamingEnableBushyJoin,
+
     /// Enable two phase agg optimization. Defaults to true.
     /// Setting this to true will always set `FORCE_TWO_PHASE_AGG` to false.
     enable_two_phase_agg: EnableTwoPhaseAgg,
@@ -402,6 +408,8 @@ impl ConfigMap {
             self.streaming_parallelism = val.as_slice().try_into()?;
         } else if key.eq_ignore_ascii_case(StreamingEnableDeltaJoin::entry_name()) {
             self.streaming_enable_delta_join = val.as_slice().try_into()?;
+        } else if key.eq_ignore_ascii_case(StreamingEnableBushyJoin::entry_name()) {
+            self.streaming_enable_bushy_join = val.as_slice().try_into()?;
         } else if key.eq_ignore_ascii_case(EnableTwoPhaseAgg::entry_name()) {
             self.enable_two_phase_agg = val.as_slice().try_into()?;
             if !*self.enable_two_phase_agg {
@@ -458,6 +466,8 @@ impl ConfigMap {
             Ok(self.streaming_parallelism.to_string())
         } else if key.eq_ignore_ascii_case(StreamingEnableDeltaJoin::entry_name()) {
             Ok(self.streaming_enable_delta_join.to_string())
+        } else if key.eq_ignore_ascii_case(StreamingEnableBushyJoin::entry_name()) {
+            Ok(self.streaming_enable_bushy_join.to_string())
         } else if key.eq_ignore_ascii_case(EnableTwoPhaseAgg::entry_name()) {
             Ok(self.enable_two_phase_agg.to_string())
         } else if key.eq_ignore_ascii_case(ForceTwoPhaseAgg::entry_name()) {
@@ -550,6 +560,11 @@ impl ConfigMap {
                 setting : self.streaming_enable_delta_join.to_string(),
                 description: String::from("Enable delta join in streaming query.")
             },
+            VariableInfo{
+                name : StreamingEnableBushyJoin::entry_name().to_lowercase(),
+                setting : self.streaming_enable_bushy_join.to_string(),
+                description: String::from("Enable bushy join in streaming query.")
+            },
             VariableInfo{
                 name : EnableTwoPhaseAgg::entry_name().to_lowercase(),
                 setting : self.enable_two_phase_agg.to_string(),
@@ -648,6 +663,10 @@ impl ConfigMap {
         *self.streaming_enable_delta_join
     }
 
+    pub fn get_streaming_enable_bushy_join(&self) -> bool {
+        *self.streaming_enable_bushy_join
+    }
+
     pub fn get_enable_two_phase_agg(&self) -> bool {
         *self.enable_two_phase_agg
     }
diff --git a/src/common/src/system_param/mod.rs b/src/common/src/system_param/mod.rs
index a0759c9a1d7d6..f4409db479c8d 100644
--- a/src/common/src/system_param/mod.rs
+++ b/src/common/src/system_param/mod.rs
@@ -38,10 +38,11 @@ macro_rules! for_all_undeprecated_params {
             { sstable_size_mb, u32, 256_u32 },
             { block_size_kb, u32, 64_u32 },
             { bloom_false_positive, f64, 0.001_f64 },
-            { state_store, String, "hummock+memory".to_string() },
+            { state_store, String, "".to_string() },
             { data_directory, String, "hummock_001".to_string() },
             { backup_storage_url, String, "memory".to_string() },
             { backup_storage_directory, String, "backup".to_string() },
+            { telemetry_enabled, bool, true},
             $({ $field, $type, $default },)*
         }
     };
@@ -291,6 +292,10 @@ impl ValidateOnSet for OverrideValidateOnSet {
         // TODO
         Ok(())
     }
+
+    fn telemetry_enabled(_: &bool) -> Result<()> {
+        Ok(())
+    }
 }
 
 for_all_undeprecated_params!(impl_default_from_other_params);
@@ -315,6 +320,7 @@ mod tests {
             (DATA_DIRECTORY_KEY, "a"),
             (BACKUP_STORAGE_URL_KEY, "a"),
             (BACKUP_STORAGE_DIRECTORY_KEY, "a"),
+            (TELEMETRY_ENABLED_KEY, "false"),
         ];
 
         // To kv - missing field.
diff --git a/src/common/src/system_param/reader.rs b/src/common/src/system_param/reader.rs
index 723fbd61b28d7..52b0dae8236c2 100644
--- a/src/common/src/system_param/reader.rs
+++ b/src/common/src/system_param/reader.rs
@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use risingwave_pb::meta::SystemParams as ProstSystemParams;
-use tracing::warn;
+use risingwave_pb::meta::PbSystemParams;
 
 use super::system_params_to_kv;
 
@@ -23,11 +22,11 @@ use super::system_params_to_kv;
 ///   compatibility.
 #[derive(Clone, Debug, PartialEq)]
 pub struct SystemParamsReader {
-    prost: ProstSystemParams,
+    prost: PbSystemParams,
 }
 
-impl From<ProstSystemParams> for SystemParamsReader {
-    fn from(prost: ProstSystemParams) -> Self {
+impl From<PbSystemParams> for SystemParamsReader {
+    fn from(prost: PbSystemParams) -> Self {
         Self { prost }
     }
 }
@@ -53,15 +52,8 @@ impl SystemParamsReader {
         self.prost.bloom_false_positive.unwrap()
     }
 
-    // TODO(zhidong): Only read from system params in v0.1.18.
-    pub fn state_store(&self, from_local: String) -> String {
-        let from_prost = self.prost.state_store.as_ref().unwrap();
-        if from_prost.is_empty() {
-            warn!("--state-store is not specified on meta node, reading from CLI instead");
-            from_local
-        } else {
-            from_prost.clone()
-        }
+    pub fn state_store(&self) -> &str {
+        self.prost.state_store.as_ref().unwrap()
     }
 
     pub fn data_directory(&self) -> &str {
@@ -76,6 +68,10 @@ impl SystemParamsReader {
         self.prost.backup_storage_directory.as_ref().unwrap()
     }
 
+    pub fn telemetry_enabled(&self) -> bool {
+        self.prost.telemetry_enabled.unwrap()
+    }
+
     pub fn to_kv(&self) -> Vec<(String, String)> {
         system_params_to_kv(&self.prost).unwrap()
     }
diff --git a/src/common/src/telemetry/manager.rs b/src/common/src/telemetry/manager.rs
new file mode 100644
index 0000000000000..cb341b295b1b3
--- /dev/null
+++ b/src/common/src/telemetry/manager.rs
@@ -0,0 +1,163 @@
+// Copyright 2023 RisingWave Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+
+use parking_lot::RwLock;
+use tokio::select;
+use tokio::sync::oneshot::{self, Sender};
+use tokio::sync::watch::Receiver;
+use tokio::task::JoinHandle;
+
+use super::report::{start_telemetry_reporting, TelemetryInfoFetcher, TelemetryReportCreator};
+use crate::system_param::local_manager::SystemParamsReaderRef;
+use crate::telemetry::telemetry_env_enabled;
+
+pub struct TelemetryManager<F, I>
+where
+    F: TelemetryReportCreator + Send + Sync + 'static,
+    I: TelemetryInfoFetcher + Send + Sync + 'static,
+{
+    core: Arc<RwLock<TelemetryManagerCore<F, I>>>,
+    sys_params_change_rx: Receiver<SystemParamsReaderRef>,
+}
+
+impl<F, I> TelemetryManager<F, I>
+where
+    F: TelemetryReportCreator + Send + Sync + 'static,
+    I: TelemetryInfoFetcher + Send + Sync + 'static,
+{
+    pub fn new(
+        sys_params_change_rx: Receiver<SystemParamsReaderRef>,
+        info_fetcher: Arc<I>,
+        report_creator: Arc<F>,
+    ) -> Self {
+        Self {
+            core: Arc::new(RwLock::new(TelemetryManagerCore::new(
+                info_fetcher,
+                report_creator,
+            ))),
+            sys_params_change_rx,
+        }
+    }
+
+    pub fn start_telemetry_reporting(&self) {
+        self.core.write().start();
+    }
+
+    pub fn watch_params_change(mut self) -> (JoinHandle<()>, Sender<()>) {
+        let (shutdown_tx, mut shutdown_rx) = oneshot::channel();
+        let handle = tokio::spawn(async move {
+            loop {
+                select! {
+                    Ok(_) = self.sys_params_change_rx.changed() => {
+                                let telemetry_enabled = {
+                                    let params = self.sys_params_change_rx.borrow().load();
+                                    // check both environment variable and system params
+                                    // if either is false, then stop telemetry
+                                    params.telemetry_enabled() && telemetry_env_enabled()
+                                };
+
+                                let telemetry_running = {
+                                    let core = self.core.read();
+                                    core.telemetry_running()
+                                };
+
+                                match (telemetry_running, telemetry_enabled) {
+                                    (false, true) => {
+                                        tracing::info!("telemetry config changed to true, start reporting");
+                                        self.core.write().start();
+                                    }
+                                    (true, false) => {
+                                        tracing::info!("telemetry config changed to false, stop reporting");
+                                        self.core.write().stop();
+                                    }
+                                    _ => {}
+                                };
+                        }
+                    ,
+                    _ = &mut shutdown_rx =>{
+                        tracing::info!("Telemetry exit");
+                        return;
+                    }
+                }
+            }
+        });
+        (handle, shutdown_tx)
+    }
+}
+
+struct TelemetryManagerCore<F, I>
+where
+    F: TelemetryReportCreator + Send + Sync + 'static,
+    I: TelemetryInfoFetcher + Send + Sync + 'static,
+{
+    telemetry_handle: Option<JoinHandle<()>>,
+    telemetry_shutdown_tx: Option<Sender<()>>,
+    telemetry_running: Arc<AtomicBool>,
+    info_fetcher: Arc<I>,
+    report_creator: Arc<F>,
+}
+
+impl<F, I> TelemetryManagerCore<F, I>
+where
+    F: TelemetryReportCreator + Send + Sync + 'static,
+    I: TelemetryInfoFetcher + Send + Sync + 'static,
+{
+    fn new(info_fetcher: Arc<I>, report_creator: Arc<F>) -> Self {
+        Self {
+            telemetry_handle: None,
+            telemetry_shutdown_tx: None,
+            telemetry_running: Arc::new(AtomicBool::new(false)),
+            info_fetcher,
+            report_creator,
+        }
+    }
+
+    fn telemetry_running(&self) -> bool {
+        self.telemetry_running.load(Ordering::Relaxed)
+    }
+
+    fn start(&mut self) {
+        if self.telemetry_running() {
+            return;
+        }
+
+        let (handle, tx) =
+            start_telemetry_reporting(self.info_fetcher.clone(), self.report_creator.clone());
+        self.telemetry_handle = Some(handle);
+        self.telemetry_shutdown_tx = Some(tx);
+        self.telemetry_running.store(true, Ordering::Relaxed);
+    }
+
+    fn stop(&mut self) {
+        match (
+            self.telemetry_running.load(Ordering::Relaxed),
+            self.telemetry_shutdown_tx.take(),
+            self.telemetry_handle.take(),
+        ) {
+            (true, Some(shutdown_rx), Some(_)) => {
+                if let Err(()) = shutdown_rx.send(()) {
+                    tracing::error!("telemetry mgr failed to send stop signal");
+                } else {
+                    self.telemetry_running.store(false, Ordering::Relaxed)
+                }
+            }
+            // do nothing if telemetry is not running
+            (false, None, None) => {}
+            _ => unreachable!("impossible telemetry handler"),
+        }
+    }
+}
diff --git a/src/common/src/telemetry/mod.rs b/src/common/src/telemetry/mod.rs
new file mode 100644
index 0000000000000..469f81df9ca7c
--- /dev/null
+++ b/src/common/src/telemetry/mod.rs
@@ -0,0 +1,226 @@
+// Copyright 2023 RisingWave Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod manager;
+pub mod report;
+
+use std::time::SystemTime;
+
+use anyhow::{anyhow, Result};
+use serde::{Deserialize, Serialize};
+use sysinfo::{System, SystemExt};
+
+use crate::util::resource_util::cpu::total_cpu_available;
+use crate::util::resource_util::memory::{total_memory_available_bytes, total_memory_used_bytes};
+
+/// Url of telemetry backend
+pub const TELEMETRY_REPORT_URL: &str = "https://telemetry.risingwave.dev/api/v1/report";
+
+/// Telemetry reporting interval in seconds, 6 hours
+pub const TELEMETRY_REPORT_INTERVAL: u64 = 6 * 60 * 60;
+
+/// Environment Variable that is default to be true
+const TELEMETRY_ENV_ENABLE: &str = "ENABLE_TELEMETRY";
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+pub enum TelemetryNodeType {
+    Meta,
+    Compute,
+    Frontend,
+    Compactor,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct TelemetryReportBase {
+    /// tracking_id is persistent in etcd
+    pub tracking_id: String,
+    /// session_id is reset every time node restarts
+    pub session_id: String,
+    /// system_data is hardware and os info
+    pub system_data: SystemData,
+    /// up_time is how long the node has been running
+    pub up_time: u64,
+    /// time_stamp is when the report is created
+    pub time_stamp: u64,
+    /// node_type is the node that creates the report
+    pub node_type: TelemetryNodeType,
+}
+
+pub trait TelemetryReport {
+    fn to_json(&self) -> Result<String>;
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SystemData {
+    memory: Memory,
+    os: Os,
+    cpu: Cpu,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+struct Memory {
+    used: usize,
+    available: usize,
+    total: usize,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+struct Os {
+    name: String,
+    kernel_version: String,
+    version: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+struct Cpu {
+    // total number of cpu available as a float
+    available: f32,
+}
+
+impl SystemData {
+    pub fn new() -> Self {
+        let mut sys = System::new();
+
+        let memory = {
+            let available = total_memory_available_bytes();
+            let used = total_memory_used_bytes();
+            Memory {
+                available,
+                used,
+                total: available + used,
+            }
+        };
+
+        let os = {
+            sys.refresh_system();
+            Os {
+                name: sys.name().unwrap_or_default(),
+                kernel_version: sys.kernel_version().unwrap_or_default(),
+                version: sys.os_version().unwrap_or_default(),
+            }
+        };
+
+        let cpu = Cpu {
+            available: total_cpu_available(),
+        };
+
+        SystemData { memory, os, cpu }
+    }
+}
+
+impl Default for SystemData {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// post a telemetry reporting request
+pub async fn post_telemetry_report(url: &str, report_body: String) -> Result<(), anyhow::Error> {
+    let client = reqwest::Client::new();
+    let res = client
+        .post(url)
+        .header(reqwest::header::CONTENT_TYPE, "application/json")
+        .body(report_body)
+        .send()
+        .await?;
+    if res.status().is_success() {
+        Ok(())
+    } else {
+        Err(anyhow!(
+            "invalid telemetry resp, url {}, status {}",
+            url,
+            res.status()
+        ))
+    }
+}
+
+/// check whether telemetry is enabled in environment variable
+pub fn telemetry_env_enabled() -> bool {
+    // default to be true
+    get_bool_env(TELEMETRY_ENV_ENABLE).unwrap_or(true)
+}
+
+pub fn get_bool_env(key: &str) -> Result<bool> {
+    let b = std::env::var(key)
+        .unwrap_or("true".to_string())
+        .trim()
+        .to_ascii_lowercase()
+        .parse()?;
+    Ok(b)
+}
+
+pub fn current_timestamp() -> u64 {
+    SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .expect("Clock might go backward")
+        .as_secs()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_system_data_new() {
+        let system_data = SystemData::new();
+
+        assert!(system_data.memory.available > 0);
+        assert!(system_data.memory.used > 0);
+        assert!(system_data.memory.total > 0);
+        assert!(!system_data.os.name.is_empty());
+        assert!(!system_data.os.kernel_version.is_empty());
+        assert!(!system_data.os.version.is_empty());
+        assert!(system_data.cpu.available > 0.0);
+    }
+
+    #[test]
+    fn test_get_bool_env_true() {
+        let key = "MY_ENV_VARIABLE_TRUE";
+        std::env::set_var(key, "true");
+        let result = get_bool_env(key).unwrap();
+        assert!(result);
+    }
+
+    #[test]
+    fn test_get_bool_env_false() {
+        let key = "MY_ENV_VARIABLE_FALSE";
+        std::env::set_var(key, "false");
+        let result = get_bool_env(key).unwrap();
+        assert!(!result);
+    }
+
+    #[test]
+    fn test_get_bool_env_default() {
+        let key = "MY_ENV_VARIABLE_NOT_SET";
+        std::env::remove_var(key);
+        let result = get_bool_env(key).unwrap();
+        assert!(result);
+    }
+
+    #[test]
+    fn test_get_bool_env_case_insensitive() {
+        let key = "MY_ENV_VARIABLE_MIXED_CASE";
+        std::env::set_var(key, "tRue");
+        let result = get_bool_env(key).unwrap();
+        assert!(result);
+    }
+
+    #[test]
+    fn test_get_bool_env_invalid() {
+        let key = "MY_ENV_VARIABLE_INVALID";
+        std::env::set_var(key, "not_a_bool");
+        let result = get_bool_env(key);
+        assert!(result.is_err());
+    }
+}
diff --git a/src/common/src/telemetry/report.rs b/src/common/src/telemetry/report.rs
new file mode 100644
index 0000000000000..886019807cc2a
--- /dev/null
+++ b/src/common/src/telemetry/report.rs
@@ -0,0 +1,112 @@
+// Copyright 2023 RisingWave Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::sync::Arc;
+
+use anyhow::Result;
+use tokio::sync::oneshot::Sender;
+use tokio::task::JoinHandle;
+use tokio::time::{interval, Duration};
+use uuid::Uuid;
+
+use super::{
+    post_telemetry_report, TelemetryReport, TELEMETRY_REPORT_INTERVAL, TELEMETRY_REPORT_URL,
+};
+
+#[async_trait::async_trait]
+pub trait TelemetryInfoFetcher {
+    async fn fetch_telemetry_info(&self) -> Result<String>;
+}
+
+pub trait TelemetryReportCreator {
+    // inject dependencies to impl structs if more metrics needed
+    fn create_report(
+        &self,
+        tracking_id: String,
+        session_id: String,
+        up_time: u64,
+    ) -> Result<impl TelemetryReport>;
+
+    fn report_type(&self) -> &str;
+}
+
+pub fn start_telemetry_reporting<F, I>(
+    info_fetcher: Arc<I>,
+    report_creator: Arc<F>,
+) -> (JoinHandle<()>, Sender<()>)
+where
+    F: TelemetryReportCreator + Send + Sync + 'static,
+    I: TelemetryInfoFetcher + Send + Sync + 'static,
+{
+    let (shutdown_tx, mut shutdown_rx) = tokio::sync::oneshot::channel();
+
+    let join_handle = tokio::spawn(async move {
+        tracing::info!("start telemetry reporting");
+
+        let begin_time = std::time::Instant::now();
+        let session_id = Uuid::new_v4().to_string();
+        let mut interval = interval(Duration::from_secs(TELEMETRY_REPORT_INTERVAL));
+        interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
+
+        // fetch telemetry tracking_id from the meta node only at the beginning
+        // There is only one case tracking_id updated at the runtime ---- etcd data has been
+        // cleaned. There is no way that etcd has been cleaned but nodes are still running
+        let tracking_id = match info_fetcher.fetch_telemetry_info().await {
+            Ok(resp) => resp,
+            Err(err) => {
+                tracing::error!("Telemetry failed to get tracking_id, err {}", err);
+                return;
+            }
+        };
+
+        loop {
+            tokio::select! {
+                _ = interval.tick() => {},
+                _ = &mut shutdown_rx => {
+                    tracing::info!("Telemetry exit");
+                    return;
+                }
+            }
+
+            // create a report and serialize to json
+            let report_json = match report_creator
+                .create_report(
+                    tracking_id.clone(),
+                    session_id.clone(),
+                    begin_time.elapsed().as_secs(),
+                )
+                .map(|r| r.to_json())
+            {
+                Ok(Ok(report_json)) => report_json,
+                Ok(Err(e)) => {
+                    tracing::error!("Telemetry failed to serialize report to json, {}", e);
+                    continue;
+                }
+                Err(e) => {
+                    tracing::error!("Telemetry failed to create report {}", e);
+                    continue;
+                }
+            };
+
+            let url =
+                (TELEMETRY_REPORT_URL.to_owned() + "/" + report_creator.report_type()).to_owned();
+
+            match post_telemetry_report(&url, report_json).await {
+                Ok(_) => tracing::info!("Telemetry post success, id {}", tracking_id),
+                Err(e) => tracing::error!("Telemetry post error, {}", e),
+            }
+        }
+    });
+    (join_handle, shutdown_tx)
+}
diff --git a/src/common/src/test_utils/rand_array.rs b/src/common/src/test_utils/rand_array.rs
index 4341067cce8ad..4ad5d0359522c 100644
--- a/src/common/src/test_utils/rand_array.rs
+++ b/src/common/src/test_utils/rand_array.rs
@@ -27,10 +27,7 @@ use rand::{Rng, SeedableRng};
 
 use crate::array::serial_array::Serial;
 use crate::array::{Array, ArrayBuilder, ArrayRef, JsonbVal, ListValue, StructValue};
-use crate::types::{
-    Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper, NativeType,
-    Scalar,
-};
+use crate::types::{Date, Decimal, Interval, NativeType, Scalar, Time, Timestamp};
 
 pub trait RandValue {
     fn rand_value<R: Rng>(rand: &mut R) -> Self;
@@ -74,41 +71,37 @@ impl RandValue for Decimal {
     }
 }
 
-impl RandValue for IntervalUnit {
+impl RandValue for Interval {
     fn rand_value<R: Rng>(rand: &mut R) -> Self {
         let months = rand.gen_range(0..100);
         let days = rand.gen_range(0..200);
         let usecs = rand.gen_range(0..100_000);
-        IntervalUnit::from_month_day_usec(months, days, usecs)
+        Interval::from_month_day_usec(months, days, usecs)
     }
 }
 
-impl RandValue for NaiveDateWrapper {
+impl RandValue for Date {
     fn rand_value<R: Rng>(rand: &mut R) -> Self {
         let max_day = chrono::NaiveDate::MAX.num_days_from_ce();
         let min_day = chrono::NaiveDate::MIN.num_days_from_ce();
         let days = rand.gen_range(min_day..=max_day);
-        NaiveDateWrapper::with_days(days).unwrap()
+        Date::with_days(days).unwrap()
     }
 }
 
-impl RandValue for NaiveTimeWrapper {
+impl RandValue for Time {
     fn rand_value<R: Rng>(rand: &mut R) -> Self {
         let hour = rand.gen_range(0..24);
         let min = rand.gen_range(0..60);
         let sec = rand.gen_range(0..60);
         let nano = rand.gen_range(0..1_000_000_000);
-        NaiveTimeWrapper::from_hms_nano_uncheck(hour, min, sec, nano)
+        Time::from_hms_nano_uncheck(hour, min, sec, nano)
     }
 }
 
-impl RandValue for NaiveDateTimeWrapper {
+impl RandValue for Timestamp {
     fn rand_value<R: Rng>(rand: &mut R) -> Self {
-        NaiveDateTimeWrapper::new(
-            NaiveDateWrapper::rand_value(rand)
-                .0
-                .and_time(NaiveTimeWrapper::rand_value(rand).0),
-        )
+        Timestamp::new(Date::rand_value(rand).0.and_time(Time::rand_value(rand).0))
     }
 }
 
@@ -143,7 +136,7 @@ impl RandValue for ListValue {
     }
 }
 
-pub fn rand_array<A, R>(rand: &mut R, size: usize) -> A
+pub fn rand_array<A, R>(rand: &mut R, size: usize, null_ratio: f64) -> A
 where
     A: Array,
     R: Rng,
@@ -151,7 +144,7 @@ where
 {
     let mut builder = A::Builder::new(size);
     for _ in 0..size {
-        let is_null = rand.gen::<bool>();
+        let is_null = rand.gen_bool(null_ratio);
         if is_null {
             builder.append_null();
         } else {
@@ -163,21 +156,21 @@ where
     builder.finish()
 }
 
-pub fn seed_rand_array<A>(size: usize, seed: u64) -> A
+pub fn seed_rand_array<A>(size: usize, seed: u64, null_ratio: f64) -> A
 where
     A: Array,
     A::OwnedItem: RandValue,
 {
     let mut rand = SmallRng::seed_from_u64(seed);
-    rand_array(&mut rand, size)
+    rand_array(&mut rand, size, null_ratio)
 }
 
-pub fn seed_rand_array_ref<A>(size: usize, seed: u64) -> ArrayRef
+pub fn seed_rand_array_ref<A>(size: usize, seed: u64, null_ratio: f64) -> ArrayRef
 where
     A: Array,
     A::OwnedItem: RandValue,
 {
-    let array: A = seed_rand_array(size, seed);
+    let array: A = seed_rand_array(size, seed, null_ratio);
     Arc::new(array.into())
 }
 
@@ -195,7 +188,7 @@ mod tests {
             ($( { $variant_name:ident, $suffix_name:ident, $array:ty, $builder:ty } ),*) => {
             $(
                 {
-                    let array = seed_rand_array::<$array>(10, 1024);
+                    let array = seed_rand_array::<$array>(10, 1024, 0.5);
                     assert_eq!(10, array.len());
                 }
             )*
diff --git a/src/common/src/types/chrono_wrapper.rs b/src/common/src/types/chrono_wrapper.rs
index 03cd602744a6a..6859c6e4d9de0 100644
--- a/src/common/src/types/chrono_wrapper.rs
+++ b/src/common/src/types/chrono_wrapper.rs
@@ -22,7 +22,7 @@ use thiserror::Error;
 
 use super::to_binary::ToBinary;
 use super::to_text::ToText;
-use super::{CheckedAdd, DataType, IntervalUnit};
+use super::{CheckedAdd, DataType, Interval};
 use crate::array::ArrayResult;
 
 /// The same as `NaiveDate::from_ymd(1970, 1, 1).num_days_from_ce()`.
@@ -70,9 +70,9 @@ macro_rules! impl_chrono_wrapper {
     };
 }
 
-impl_chrono_wrapper!(NaiveDateWrapper, NaiveDate);
-impl_chrono_wrapper!(NaiveDateTimeWrapper, NaiveDateTime);
-impl_chrono_wrapper!(NaiveTimeWrapper, NaiveTime);
+impl_chrono_wrapper!(Date, NaiveDate);
+impl_chrono_wrapper!(Timestamp, NaiveDateTime);
+impl_chrono_wrapper!(Time, NaiveTime);
 
 #[derive(Copy, Clone, Debug, Error)]
 enum InvalidParamsErrorKind {
@@ -104,7 +104,7 @@ impl InvalidParamsError {
 
 type Result<T> = std::result::Result<T, InvalidParamsError>;
 
-impl ToText for NaiveDateWrapper {
+impl ToText for Date {
     fn write<W: std::fmt::Write>(&self, f: &mut W) -> std::fmt::Result {
         write!(f, "{}", self.0)
     }
@@ -117,7 +117,7 @@ impl ToText for NaiveDateWrapper {
     }
 }
 
-impl ToText for NaiveTimeWrapper {
+impl ToText for Time {
     fn write<W: std::fmt::Write>(&self, f: &mut W) -> std::fmt::Result {
         write!(f, "{}", self.0)
     }
@@ -130,7 +130,7 @@ impl ToText for NaiveTimeWrapper {
     }
 }
 
-impl ToText for NaiveDateTimeWrapper {
+impl ToText for Timestamp {
     fn write<W: std::fmt::Write>(&self, f: &mut W) -> std::fmt::Result {
         write!(f, "{}", self.0)
     }
@@ -143,7 +143,7 @@ impl ToText for NaiveDateTimeWrapper {
     }
 }
 
-impl ToBinary for NaiveDateWrapper {
+impl ToBinary for Date {
     fn to_binary_with_type(&self, ty: &DataType) -> crate::error::Result<Option<Bytes>> {
         match ty {
             super::DataType::Date => {
@@ -156,7 +156,7 @@ impl ToBinary for NaiveDateWrapper {
     }
 }
 
-impl ToBinary for NaiveTimeWrapper {
+impl ToBinary for Time {
     fn to_binary_with_type(&self, ty: &DataType) -> crate::error::Result<Option<Bytes>> {
         match ty {
             super::DataType::Time => {
@@ -169,7 +169,7 @@ impl ToBinary for NaiveTimeWrapper {
     }
 }
 
-impl ToBinary for NaiveDateTimeWrapper {
+impl ToBinary for Timestamp {
     fn to_binary_with_type(&self, ty: &DataType) -> crate::error::Result<Option<Bytes>> {
         match ty {
             super::DataType::Timestamp => {
@@ -182,16 +182,16 @@ impl ToBinary for NaiveDateTimeWrapper {
     }
 }
 
-impl NaiveDateWrapper {
+impl Date {
     pub fn with_days(days: i32) -> Result<Self> {
-        Ok(NaiveDateWrapper::new(
+        Ok(Date::new(
             NaiveDate::from_num_days_from_ce_opt(days)
                 .ok_or_else(|| InvalidParamsError::date(days))?,
         ))
     }
 
     pub fn with_days_since_unix_epoch(days: i32) -> Result<Self> {
-        Ok(NaiveDateWrapper::new(
+        Ok(Date::new(
             NaiveDate::from_num_days_from_ce_opt(days)
                 .ok_or_else(|| InvalidParamsError::date(days))?
                 .checked_add_days(Days::new(UNIX_EPOCH_DAYS as u64))
@@ -213,27 +213,21 @@ impl NaiveDateWrapper {
         Self::with_days(days).unwrap()
     }
 
-    pub fn and_hms_uncheck(self, hour: u32, min: u32, sec: u32) -> NaiveDateTimeWrapper {
+    pub fn and_hms_uncheck(self, hour: u32, min: u32, sec: u32) -> Timestamp {
         self.and_hms_micro_uncheck(hour, min, sec, 0)
     }
 
-    pub fn and_hms_micro_uncheck(
-        self,
-        hour: u32,
-        min: u32,
-        sec: u32,
-        micro: u32,
-    ) -> NaiveDateTimeWrapper {
-        NaiveDateTimeWrapper::new(
+    pub fn and_hms_micro_uncheck(self, hour: u32, min: u32, sec: u32, micro: u32) -> Timestamp {
+        Timestamp::new(
             self.0
-                .and_time(NaiveTimeWrapper::from_hms_micro_uncheck(hour, min, sec, micro).0),
+                .and_time(Time::from_hms_micro_uncheck(hour, min, sec, micro).0),
         )
     }
 }
 
-impl NaiveTimeWrapper {
+impl Time {
     pub fn with_secs_nano(secs: u32, nano: u32) -> Result<Self> {
-        Ok(NaiveTimeWrapper::new(
+        Ok(Time::new(
             NaiveTime::from_num_seconds_from_midnight_opt(secs, nano)
                 .ok_or_else(|| InvalidParamsError::time(secs, nano))?,
         ))
@@ -278,15 +272,15 @@ impl NaiveTimeWrapper {
     }
 }
 
-impl NaiveDateTimeWrapper {
+impl Timestamp {
     pub fn with_secs_nsecs(secs: i64, nsecs: u32) -> Result<Self> {
-        Ok(NaiveDateTimeWrapper::new({
+        Ok(Timestamp::new({
             NaiveDateTime::from_timestamp_opt(secs, nsecs)
                 .ok_or_else(|| InvalidParamsError::datetime(secs, nsecs))?
         }))
     }
 
-    /// Although `NaiveDateTime` takes 12 bytes, we drop 4 bytes in protobuf encoding.
+    /// Although `Timestamp` takes 12 bytes, we drop 4 bytes in protobuf encoding.
     pub fn to_protobuf<T: Write>(self, output: &mut T) -> ArrayResult<usize> {
         output
             .write(&(self.0.timestamp_micros()).to_be_bytes())
@@ -307,15 +301,15 @@ impl NaiveDateTimeWrapper {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_micros().to_string(),
+    ///     Timestamp::new(ts).truncate_micros().to_string(),
     ///     "2001-05-16 20:38:40.123456"
     /// );
     /// ```
     pub fn truncate_micros(self) -> Self {
-        NaiveDateTimeWrapper::new(
+        Self::new(
             self.0
                 .with_nanosecond(self.0.nanosecond() / 1000 * 1000)
                 .unwrap(),
@@ -326,15 +320,15 @@ impl NaiveDateTimeWrapper {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_millis().to_string(),
+    ///     Timestamp::new(ts).truncate_millis().to_string(),
     ///     "2001-05-16 20:38:40.123"
     /// );
     /// ```
     pub fn truncate_millis(self) -> Self {
-        NaiveDateTimeWrapper::new(
+        Self::new(
             self.0
                 .with_nanosecond(self.0.nanosecond() / 1_000_000 * 1_000_000)
                 .unwrap(),
@@ -345,172 +339,170 @@ impl NaiveDateTimeWrapper {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_second().to_string(),
+    ///     Timestamp::new(ts).truncate_second().to_string(),
     ///     "2001-05-16 20:38:40"
     /// );
     /// ```
     pub fn truncate_second(self) -> Self {
-        NaiveDateTimeWrapper::new(self.0.with_nanosecond(0).unwrap())
+        Self::new(self.0.with_nanosecond(0).unwrap())
     }
 
     /// Truncate the timestamp to the precision of minutes.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_minute().to_string(),
+    ///     Timestamp::new(ts).truncate_minute().to_string(),
     ///     "2001-05-16 20:38:00"
     /// );
     /// ```
     pub fn truncate_minute(self) -> Self {
-        NaiveDateWrapper::new(self.0.date()).and_hms_uncheck(self.0.hour(), self.0.minute(), 0)
+        Date::new(self.0.date()).and_hms_uncheck(self.0.hour(), self.0.minute(), 0)
     }
 
     /// Truncate the timestamp to the precision of hours.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_hour().to_string(),
+    ///     Timestamp::new(ts).truncate_hour().to_string(),
     ///     "2001-05-16 20:00:00"
     /// );
     /// ```
     pub fn truncate_hour(self) -> Self {
-        NaiveDateWrapper::new(self.0.date()).and_hms_uncheck(self.0.hour(), 0, 0)
+        Date::new(self.0.date()).and_hms_uncheck(self.0.hour(), 0, 0)
     }
 
     /// Truncate the timestamp to the precision of days.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_day().to_string(),
+    ///     Timestamp::new(ts).truncate_day().to_string(),
     ///     "2001-05-16 00:00:00"
     /// );
     /// ```
     pub fn truncate_day(self) -> Self {
-        NaiveDateWrapper::new(self.0.date()).into()
+        Date::new(self.0.date()).into()
     }
 
     /// Truncate the timestamp to the precision of weeks.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_week().to_string(),
+    ///     Timestamp::new(ts).truncate_week().to_string(),
     ///     "2001-05-14 00:00:00"
     /// );
     /// ```
     pub fn truncate_week(self) -> Self {
-        NaiveDateWrapper::new(self.0.date().week(Weekday::Mon).first_day()).into()
+        Date::new(self.0.date().week(Weekday::Mon).first_day()).into()
     }
 
     /// Truncate the timestamp to the precision of months.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_month().to_string(),
+    ///     Timestamp::new(ts).truncate_month().to_string(),
     ///     "2001-05-01 00:00:00"
     /// );
     /// ```
     pub fn truncate_month(self) -> Self {
-        NaiveDateWrapper::new(self.0.date().with_day(1).unwrap()).into()
+        Date::new(self.0.date().with_day(1).unwrap()).into()
     }
 
     /// Truncate the timestamp to the precision of quarters.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_quarter().to_string(),
+    ///     Timestamp::new(ts).truncate_quarter().to_string(),
     ///     "2001-04-01 00:00:00"
     /// );
     /// ```
     pub fn truncate_quarter(self) -> Self {
-        NaiveDateWrapper::from_ymd_uncheck(self.0.year(), self.0.month0() / 3 * 3 + 1, 1).into()
+        Date::from_ymd_uncheck(self.0.year(), self.0.month0() / 3 * 3 + 1, 1).into()
     }
 
     /// Truncate the timestamp to the precision of years.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_year().to_string(),
+    ///     Timestamp::new(ts).truncate_year().to_string(),
     ///     "2001-01-01 00:00:00"
     /// );
     /// ```
     pub fn truncate_year(self) -> Self {
-        NaiveDateWrapper::from_ymd_uncheck(self.0.year(), 1, 1).into()
+        Date::from_ymd_uncheck(self.0.year(), 1, 1).into()
     }
 
     /// Truncate the timestamp to the precision of decades.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "2001-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_decade().to_string(),
+    ///     Timestamp::new(ts).truncate_decade().to_string(),
     ///     "2000-01-01 00:00:00"
     /// );
     /// ```
     pub fn truncate_decade(self) -> Self {
-        NaiveDateWrapper::from_ymd_uncheck(self.0.year() / 10 * 10, 1, 1).into()
+        Date::from_ymd_uncheck(self.0.year() / 10 * 10, 1, 1).into()
     }
 
     /// Truncate the timestamp to the precision of centuries.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "3202-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts).truncate_century().to_string(),
+    ///     Timestamp::new(ts).truncate_century().to_string(),
     ///     "3201-01-01 00:00:00"
     /// );
     /// ```
     pub fn truncate_century(self) -> Self {
-        NaiveDateWrapper::from_ymd_uncheck((self.0.year() - 1) / 100 * 100 + 1, 1, 1).into()
+        Date::from_ymd_uncheck((self.0.year() - 1) / 100 * 100 + 1, 1, 1).into()
     }
 
     /// Truncate the timestamp to the precision of millenniums.
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::NaiveDateTimeWrapper;
+    /// # use risingwave_common::types::Timestamp;
     /// let ts = "3202-05-16T20:38:40.123456789".parse().unwrap();
     /// assert_eq!(
-    ///     NaiveDateTimeWrapper::new(ts)
-    ///         .truncate_millennium()
-    ///         .to_string(),
+    ///     Timestamp::new(ts).truncate_millennium().to_string(),
     ///     "3001-01-01 00:00:00"
     /// );
     /// ```
     pub fn truncate_millennium(self) -> Self {
-        NaiveDateWrapper::from_ymd_uncheck((self.0.year() - 1) / 1000 * 1000 + 1, 1, 1).into()
+        Date::from_ymd_uncheck((self.0.year() - 1) / 1000 * 1000 + 1, 1, 1).into()
     }
 }
 
-impl From<NaiveDateWrapper> for NaiveDateTimeWrapper {
-    fn from(date: NaiveDateWrapper) -> Self {
+impl From<Date> for Timestamp {
+    fn from(date: Date) -> Self {
         date.and_hms_uncheck(0, 0, 0)
     }
 }
@@ -528,10 +520,10 @@ fn is_leap_year(year: i32) -> bool {
     year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)
 }
 
-impl CheckedAdd<IntervalUnit> for NaiveDateTimeWrapper {
-    type Output = NaiveDateTimeWrapper;
+impl CheckedAdd<Interval> for Timestamp {
+    type Output = Timestamp;
 
-    fn checked_add(self, rhs: IntervalUnit) -> Option<NaiveDateTimeWrapper> {
+    fn checked_add(self, rhs: Interval) -> Option<Timestamp> {
         let mut date = self.0.date();
         if rhs.get_months() != 0 {
             // NaiveDate don't support add months. We need calculate manually
@@ -567,6 +559,6 @@ impl CheckedAdd<IntervalUnit> for NaiveDateTimeWrapper {
         datetime = datetime.checked_add_signed(Duration::days(rhs.get_days().into()))?;
         datetime = datetime.checked_add_signed(Duration::microseconds(rhs.get_usecs()))?;
 
-        Some(NaiveDateTimeWrapper::new(datetime))
+        Some(Timestamp::new(datetime))
     }
 }
diff --git a/src/common/src/types/interval.rs b/src/common/src/types/interval.rs
index 8bbe3001a0abb..eca7ec5814187 100644
--- a/src/common/src/types/interval.rs
+++ b/src/common/src/types/interval.rs
@@ -23,14 +23,14 @@ use byteorder::{BigEndian, NetworkEndian, ReadBytesExt, WriteBytesExt};
 use bytes::BytesMut;
 use num_traits::{CheckedAdd, CheckedNeg, CheckedSub, Zero};
 use postgres_types::{to_sql_checked, FromSql};
-use risingwave_pb::data::IntervalUnit as IntervalUnitProto;
+use risingwave_pb::data::PbInterval;
 
 use super::ops::IsNegative;
 use super::to_binary::ToBinary;
 use super::*;
 use crate::error::{ErrorCode, Result, RwError};
 
-/// Every interval can be represented by a `IntervalUnit`.
+/// Every interval can be represented by a `Interval`.
 /// Note that the difference between Interval and Instant.
 /// For example, `5 yrs 1 month 25 days 23:22:57` is a interval (Can be interpreted by Interval Unit
 /// with months = 61, days = 25, usecs = (57 + 23 * 3600 + 22 * 60) * 1000000),
@@ -39,7 +39,7 @@ use crate::error::{ErrorCode, Result, RwError};
 /// This internals is learned from PG:
 /// <https://www.postgresql.org/docs/9.1/datatype-datetime.html#:~:text=field%20is%20negative.-,Internally,-interval%20values%20are>
 #[derive(Debug, Clone, Copy, Default)]
-pub struct IntervalUnit {
+pub struct Interval {
     months: i32,
     days: i32,
     usecs: i64,
@@ -49,7 +49,7 @@ pub const USECS_PER_SEC: i64 = 1_000_000;
 pub const USECS_PER_DAY: i64 = 86400 * USECS_PER_SEC;
 pub const USECS_PER_MONTH: i64 = 30 * USECS_PER_DAY;
 
-impl IntervalUnit {
+impl Interval {
     /// Smallest interval value.
     pub const MIN: Self = Self {
         months: i32::MIN,
@@ -58,7 +58,7 @@ impl IntervalUnit {
     };
 
     pub fn from_month_day_usec(months: i32, days: i32, usecs: i64) -> Self {
-        IntervalUnit {
+        Interval {
             months,
             days,
             usecs,
@@ -81,20 +81,6 @@ impl IntervalUnit {
         self.usecs.rem_euclid(USECS_PER_DAY) as u64
     }
 
-    #[deprecated]
-    fn from_total_usecs(usecs: i64) -> Self {
-        let mut remaining_usecs = usecs;
-        let months = remaining_usecs / USECS_PER_MONTH;
-        remaining_usecs -= months * USECS_PER_MONTH;
-        let days = remaining_usecs / USECS_PER_DAY;
-        remaining_usecs -= days * USECS_PER_DAY;
-        IntervalUnit {
-            months: (months as i32),
-            days: (days as i32),
-            usecs: remaining_usecs,
-        }
-    }
-
     pub fn to_protobuf<T: Write>(self, output: &mut T) -> ArrayResult<usize> {
         output.write_i32::<BigEndian>(self.months)?;
         output.write_i32::<BigEndian>(self.days)?;
@@ -102,7 +88,7 @@ impl IntervalUnit {
         Ok(16)
     }
 
-    /// Multiple [`IntervalUnit`] by an integer with overflow check.
+    /// Multiple [`Interval`] by an integer with overflow check.
     pub fn checked_mul_int<I>(&self, rhs: I) -> Option<Self>
     where
         I: TryInto<i32>,
@@ -112,17 +98,74 @@ impl IntervalUnit {
         let days = self.days.checked_mul(rhs)?;
         let usecs = self.usecs.checked_mul(rhs as i64)?;
 
-        Some(IntervalUnit {
+        Some(Interval {
+            months,
+            days,
+            usecs,
+        })
+    }
+
+    /// Internal utility used by [`Self::mul_float`] and [`Self::div_float`] to adjust fractional
+    /// units. Not intended as general constructor.
+    fn from_floats(months: f64, days: f64, usecs: f64) -> Option<Self> {
+        // TSROUND in include/datatype/timestamp.h
+        // round eagerly at usecs precision because floats are imprecise
+        // should round to even #5576
+        let months_round_usecs =
+            |months: f64| (months * (USECS_PER_MONTH as f64)).round() / (USECS_PER_MONTH as f64);
+
+        let days_round_usecs =
+            |days: f64| (days * (USECS_PER_DAY as f64)).round() / (USECS_PER_DAY as f64);
+
+        let trunc_fract = |num: f64| (num.trunc(), num.fract());
+
+        // Handle months
+        let (months, months_fract) = trunc_fract(months_round_usecs(months));
+        if months.is_nan() || months < i32::MIN.into() || months > i32::MAX.into() {
+            return None;
+        }
+        let months = months as i32;
+        let (leftover_days, leftover_days_fract) =
+            trunc_fract(days_round_usecs(months_fract * 30.));
+
+        // Handle days
+        let (days, days_fract) = trunc_fract(days_round_usecs(days));
+        if days.is_nan() || days < i32::MIN.into() || days > i32::MAX.into() {
+            return None;
+        }
+        // Note that PostgreSQL split the integer part and fractional part individually before
+        // adding `leftover_days`. This makes a difference for mixed sign interval.
+        // For example in `interval '3 mons -3 days' / 2`
+        // * `leftover_days` is `15`
+        // * `days` from input is `-1.5`
+        // If we add first, we get `13.5` which is `13 days 12:00:00`;
+        // If we split first, we get `14` and `-0.5`, which ends up as `14 days -12:00:00`.
+        let (days_fract_whole, days_fract) =
+            trunc_fract(days_round_usecs(days_fract + leftover_days_fract));
+        let days = (days as i32)
+            .checked_add(leftover_days as i32)?
+            .checked_add(days_fract_whole as i32)?;
+        let leftover_usecs = days_fract * (USECS_PER_DAY as f64);
+
+        // Handle usecs
+        let result_usecs = usecs + leftover_usecs;
+        let usecs = result_usecs.round();
+        if usecs.is_nan() || usecs < (i64::MIN as f64) || usecs > (i64::MAX as f64) {
+            return None;
+        }
+        let usecs = usecs as i64;
+
+        Some(Self {
             months,
             days,
             usecs,
         })
     }
 
-    /// Divides [`IntervalUnit`] by an integer/float with zero check.
+    /// Divides [`Interval`] by an integer/float with zero check.
     pub fn div_float<I>(&self, rhs: I) -> Option<Self>
     where
-        I: TryInto<OrderedF64>,
+        I: TryInto<F64>,
     {
         let rhs = rhs.try_into().ok()?;
         let rhs = rhs.0;
@@ -131,33 +174,26 @@ impl IntervalUnit {
             return None;
         }
 
-        #[expect(deprecated)]
-        let usecs = self.as_usecs_i64();
-        #[expect(deprecated)]
-        Some(IntervalUnit::from_total_usecs(
-            (usecs as f64 / rhs).round() as i64
-        ))
-    }
-
-    #[deprecated]
-    fn as_usecs_i64(&self) -> i64 {
-        self.months as i64 * USECS_PER_MONTH + self.days as i64 * USECS_PER_DAY + self.usecs
+        Self::from_floats(
+            self.months as f64 / rhs,
+            self.days as f64 / rhs,
+            self.usecs as f64 / rhs,
+        )
     }
 
-    /// times [`IntervalUnit`] with an integer/float.
+    /// times [`Interval`] with an integer/float.
     pub fn mul_float<I>(&self, rhs: I) -> Option<Self>
     where
-        I: TryInto<OrderedF64>,
+        I: TryInto<F64>,
     {
         let rhs = rhs.try_into().ok()?;
         let rhs = rhs.0;
 
-        #[expect(deprecated)]
-        let usecs = self.as_usecs_i64();
-        #[expect(deprecated)]
-        Some(IntervalUnit::from_total_usecs(
-            (usecs as f64 * rhs).round() as i64
-        ))
+        Self::from_floats(
+            self.months as f64 * rhs,
+            self.days as f64 * rhs,
+            self.usecs as f64 * rhs,
+        )
     }
 
     /// Performs an exact division, returns [`None`] if for any unit, lhs % rhs != 0.
@@ -192,7 +228,7 @@ impl IntervalUnit {
         res
     }
 
-    /// Checks if [`IntervalUnit`] is positive.
+    /// Checks if [`Interval`] is positive.
     pub fn is_positive(&self) -> bool {
         self > &Self::from_month_day_usec(0, 0, 0)
     }
@@ -201,15 +237,15 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(
     ///     interval.truncate_millis().to_string(),
     ///     "5 years 1 mon 25 days 23:22:57.123"
     /// );
     /// ```
     pub const fn truncate_millis(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months,
             days: self.days,
             usecs: self.usecs / 1000 * 1000,
@@ -220,15 +256,15 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(
     ///     interval.truncate_second().to_string(),
     ///     "5 years 1 mon 25 days 23:22:57"
     /// );
     /// ```
     pub const fn truncate_second(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months,
             days: self.days,
             usecs: self.usecs / USECS_PER_SEC * USECS_PER_SEC,
@@ -239,15 +275,15 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(
     ///     interval.truncate_minute().to_string(),
     ///     "5 years 1 mon 25 days 23:22:00"
     /// );
     /// ```
     pub const fn truncate_minute(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months,
             days: self.days,
             usecs: self.usecs / USECS_PER_SEC / 60 * USECS_PER_SEC * 60,
@@ -258,15 +294,15 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(
     ///     interval.truncate_hour().to_string(),
     ///     "5 years 1 mon 25 days 23:00:00"
     /// );
     /// ```
     pub const fn truncate_hour(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months,
             days: self.days,
             usecs: self.usecs / USECS_PER_SEC / 60 / 60 * USECS_PER_SEC * 60 * 60,
@@ -277,12 +313,12 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(interval.truncate_day().to_string(), "5 years 1 mon 25 days");
     /// ```
     pub const fn truncate_day(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months,
             days: self.days,
             usecs: 0,
@@ -293,12 +329,12 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(interval.truncate_month().to_string(), "5 years 1 mon");
     /// ```
     pub const fn truncate_month(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months,
             days: 0,
             usecs: 0,
@@ -309,12 +345,12 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(interval.truncate_quarter().to_string(), "5 years");
     /// ```
     pub const fn truncate_quarter(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months / 3 * 3,
             days: 0,
             usecs: 0,
@@ -325,12 +361,12 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "5 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(interval.truncate_year().to_string(), "5 years");
     /// ```
     pub const fn truncate_year(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months / 12 * 12,
             days: 0,
             usecs: 0,
@@ -341,12 +377,12 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "15 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "15 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(interval.truncate_decade().to_string(), "10 years");
     /// ```
     pub const fn truncate_decade(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months / 12 / 10 * 12 * 10,
             days: 0,
             usecs: 0,
@@ -357,12 +393,12 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "115 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "115 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(interval.truncate_century().to_string(), "100 years");
     /// ```
     pub const fn truncate_century(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months / 12 / 100 * 12 * 100,
             days: 0,
             usecs: 0,
@@ -373,12 +409,12 @@ impl IntervalUnit {
     ///
     /// # Example
     /// ```
-    /// # use risingwave_common::types::IntervalUnit;
-    /// let interval: IntervalUnit = "1115 years 1 mon 25 days 23:22:57.123".parse().unwrap();
+    /// # use risingwave_common::types::Interval;
+    /// let interval: Interval = "1115 years 1 mon 25 days 23:22:57.123".parse().unwrap();
     /// assert_eq!(interval.truncate_millennium().to_string(), "1000 years");
     /// ```
     pub const fn truncate_millennium(self) -> Self {
-        IntervalUnit {
+        Interval {
             months: self.months / 12 / 1000 * 12 * 1000,
             days: 0,
             usecs: 0,
@@ -386,13 +422,13 @@ impl IntervalUnit {
     }
 }
 
-/// A separate mod so that `use types::*` or `use interval::*` does not `use IntervalUnitTestExt` by
+/// A separate mod so that `use types::*` or `use interval::*` does not `use IntervalTestExt` by
 /// accident.
 pub mod test_utils {
     use super::*;
 
     /// These constructors may panic when value out of bound. Only use in tests with known input.
-    pub trait IntervalUnitTestExt {
+    pub trait IntervalTestExt {
         fn from_ymd(year: i32, month: i32, days: i32) -> Self;
         fn from_month(months: i32) -> Self;
         fn from_days(days: i32) -> Self;
@@ -400,13 +436,13 @@ pub mod test_utils {
         fn from_minutes(minutes: i64) -> Self;
     }
 
-    impl IntervalUnitTestExt for IntervalUnit {
+    impl IntervalTestExt for Interval {
         #[must_use]
         fn from_ymd(year: i32, month: i32, days: i32) -> Self {
             let months = year * 12 + month;
             let days = days;
             let usecs = 0;
-            IntervalUnit {
+            Interval {
                 months,
                 days,
                 usecs,
@@ -415,7 +451,7 @@ pub mod test_utils {
 
         #[must_use]
         fn from_month(months: i32) -> Self {
-            IntervalUnit {
+            Interval {
                 months,
                 ..Default::default()
             }
@@ -447,20 +483,20 @@ pub mod test_utils {
     }
 }
 
-/// Wrapper so that `Debug for IntervalUnitDisplay` would use the concise format of `Display for
-/// IntervalUnit`.
+/// Wrapper so that `Debug for IntervalDisplay` would use the concise format of `Display for
+/// Interval`.
 #[derive(Clone, Copy)]
-pub struct IntervalUnitDisplay<'a> {
-    pub core: &'a IntervalUnit,
+pub struct IntervalDisplay<'a> {
+    pub core: &'a Interval,
 }
 
-impl std::fmt::Display for IntervalUnitDisplay<'_> {
+impl std::fmt::Display for IntervalDisplay<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         (self as &dyn std::fmt::Debug).fmt(f)
     }
 }
 
-impl std::fmt::Debug for IntervalUnitDisplay<'_> {
+impl std::fmt::Debug for IntervalDisplay<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", self.core)
     }
@@ -510,35 +546,35 @@ impl std::fmt::Debug for IntervalUnitDisplay<'_> {
 #[derive(PartialEq, Eq, Hash, PartialOrd, Ord)]
 struct IntervalCmpValue(i128);
 
-impl From<IntervalUnit> for IntervalCmpValue {
-    fn from(value: IntervalUnit) -> Self {
+impl From<Interval> for IntervalCmpValue {
+    fn from(value: Interval) -> Self {
         let days = (value.days as i64) + 30i64 * (value.months as i64);
         let usecs = (value.usecs as i128) + (USECS_PER_DAY as i128) * (days as i128);
         Self(usecs)
     }
 }
 
-impl Ord for IntervalUnit {
+impl Ord for Interval {
     fn cmp(&self, other: &Self) -> Ordering {
         IntervalCmpValue::from(*self).cmp(&(*other).into())
     }
 }
 
-impl PartialOrd for IntervalUnit {
+impl PartialOrd for Interval {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         Some(self.cmp(other))
     }
 }
 
-impl PartialEq for IntervalUnit {
+impl PartialEq for Interval {
     fn eq(&self, other: &Self) -> bool {
         self.cmp(other).is_eq()
     }
 }
 
-impl Eq for IntervalUnit {}
+impl Eq for Interval {}
 
-impl Hash for IntervalUnit {
+impl Hash for Interval {
     fn hash<H: Hasher>(&self, state: &mut H) {
         IntervalCmpValue::from(*self).hash(state);
     }
@@ -546,7 +582,7 @@ impl Hash for IntervalUnit {
 
 /// Loss of information during the process due to `IntervalCmpValue`. Only intended for
 /// memcomparable encoding.
-impl Serialize for IntervalUnit {
+impl Serialize for Interval {
     fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
     where
         S: serde::Serializer,
@@ -563,19 +599,19 @@ impl Serialize for IntervalUnit {
 
 impl IntervalCmpValue {
     /// Recover the justified interval from this equivalence class, if it exists.
-    fn as_justified(&self) -> Option<IntervalUnit> {
+    fn as_justified(&self) -> Option<Interval> {
         let usecs = (self.0 % (USECS_PER_DAY as i128)) as i64;
         let remaining_days = self.0 / (USECS_PER_DAY as i128);
         let days = (remaining_days % 30) as i32;
         let months = (remaining_days / 30).try_into().ok()?;
-        Some(IntervalUnit::from_month_day_usec(months, days, usecs))
+        Some(Interval::from_month_day_usec(months, days, usecs))
     }
 
     /// Recover the alternate representative interval from this equivalence class.
     /// It always exists unless the encoding is invalid. See [`IntervalCmpValue`] for details.
-    fn as_alternate(&self) -> Option<IntervalUnit> {
+    fn as_alternate(&self) -> Option<Interval> {
         match self.0.cmp(&0) {
-            Ordering::Equal => Some(IntervalUnit::from_month_day_usec(0, 0, 0)),
+            Ordering::Equal => Some(Interval::from_month_day_usec(0, 0, 0)),
             Ordering::Greater => {
                 let remaining_usecs = self.0;
                 let mut usecs = (remaining_usecs % (USECS_PER_DAY as i128)) as i64;
@@ -601,7 +637,7 @@ impl IntervalCmpValue {
                 remaining_months -= extra_months as i128;
 
                 let months = remaining_months.try_into().ok()?;
-                Some(IntervalUnit::from_month_day_usec(months, days, usecs))
+                Some(Interval::from_month_day_usec(months, days, usecs))
             }
             Ordering::Less => {
                 let remaining_usecs = self.0;
@@ -622,13 +658,13 @@ impl IntervalCmpValue {
                 remaining_months -= extra_months as i128;
 
                 let months = remaining_months.try_into().ok()?;
-                Some(IntervalUnit::from_month_day_usec(months, days, usecs))
+                Some(Interval::from_month_day_usec(months, days, usecs))
             }
         }
     }
 }
 
-impl<'de> Deserialize<'de> for IntervalUnit {
+impl<'de> Deserialize<'de> for Interval {
     fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
     where
         D: serde::Deserializer<'de>,
@@ -645,7 +681,7 @@ impl<'de> Deserialize<'de> for IntervalUnit {
     }
 }
 
-impl crate::hash::HashKeySerDe<'_> for IntervalUnit {
+impl crate::hash::HashKeySerDe<'_> for Interval {
     type S = [u8; 16];
 
     fn serialize(self) -> Self::S {
@@ -665,9 +701,9 @@ impl crate::hash::HashKeySerDe<'_> for IntervalUnit {
 
 /// Duplicated logic only used by `HopWindow`. See #8452.
 #[expect(clippy::from_over_into)]
-impl Into<IntervalUnitProto> for IntervalUnit {
-    fn into(self) -> IntervalUnitProto {
-        IntervalUnitProto {
+impl Into<PbInterval> for Interval {
+    fn into(self) -> PbInterval {
+        PbInterval {
             months: self.months,
             days: self.days,
             usecs: self.usecs,
@@ -675,8 +711,8 @@ impl Into<IntervalUnitProto> for IntervalUnit {
     }
 }
 
-impl From<&'_ IntervalUnitProto> for IntervalUnit {
-    fn from(p: &'_ IntervalUnitProto) -> Self {
+impl From<&'_ PbInterval> for Interval {
+    fn from(p: &'_ PbInterval) -> Self {
         Self {
             months: p.months,
             days: p.days,
@@ -685,8 +721,8 @@ impl From<&'_ IntervalUnitProto> for IntervalUnit {
     }
 }
 
-impl From<NaiveTimeWrapper> for IntervalUnit {
-    fn from(time: NaiveTimeWrapper) -> Self {
+impl From<Time> for Interval {
+    fn from(time: Time) -> Self {
         let mut usecs: i64 = (time.0.num_seconds_from_midnight() as i64) * USECS_PER_SEC;
         usecs += (time.0.nanosecond() / 1000) as i64;
         Self {
@@ -697,14 +733,14 @@ impl From<NaiveTimeWrapper> for IntervalUnit {
     }
 }
 
-impl Add for IntervalUnit {
+impl Add for Interval {
     type Output = Self;
 
     fn add(self, rhs: Self) -> Self {
         let months = self.months + rhs.months;
         let days = self.days + rhs.days;
         let usecs = self.usecs + rhs.usecs;
-        IntervalUnit {
+        Interval {
             months,
             days,
             usecs,
@@ -712,12 +748,12 @@ impl Add for IntervalUnit {
     }
 }
 
-impl CheckedNeg for IntervalUnit {
+impl CheckedNeg for Interval {
     fn checked_neg(&self) -> Option<Self> {
         let months = self.months.checked_neg()?;
         let days = self.days.checked_neg()?;
         let usecs = self.usecs.checked_neg()?;
-        Some(IntervalUnit {
+        Some(Interval {
             months,
             days,
             usecs,
@@ -725,12 +761,12 @@ impl CheckedNeg for IntervalUnit {
     }
 }
 
-impl CheckedAdd for IntervalUnit {
+impl CheckedAdd for Interval {
     fn checked_add(&self, other: &Self) -> Option<Self> {
         let months = self.months.checked_add(other.months)?;
         let days = self.days.checked_add(other.days)?;
         let usecs = self.usecs.checked_add(other.usecs)?;
-        Some(IntervalUnit {
+        Some(Interval {
             months,
             days,
             usecs,
@@ -738,14 +774,14 @@ impl CheckedAdd for IntervalUnit {
     }
 }
 
-impl Sub for IntervalUnit {
+impl Sub for Interval {
     type Output = Self;
 
     fn sub(self, rhs: Self) -> Self {
         let months = self.months - rhs.months;
         let days = self.days - rhs.days;
         let usecs = self.usecs - rhs.usecs;
-        IntervalUnit {
+        Interval {
             months,
             days,
             usecs,
@@ -753,12 +789,12 @@ impl Sub for IntervalUnit {
     }
 }
 
-impl CheckedSub for IntervalUnit {
+impl CheckedSub for Interval {
     fn checked_sub(&self, other: &Self) -> Option<Self> {
         let months = self.months.checked_sub(other.months)?;
         let days = self.days.checked_sub(other.days)?;
         let usecs = self.usecs.checked_sub(other.usecs)?;
-        Some(IntervalUnit {
+        Some(Interval {
             months,
             days,
             usecs,
@@ -766,7 +802,7 @@ impl CheckedSub for IntervalUnit {
     }
 }
 
-impl Zero for IntervalUnit {
+impl Zero for Interval {
     fn zero() -> Self {
         Self::from_month_day_usec(0, 0, 0)
     }
@@ -776,13 +812,13 @@ impl Zero for IntervalUnit {
     }
 }
 
-impl IsNegative for IntervalUnit {
+impl IsNegative for Interval {
     fn is_negative(&self) -> bool {
         self < &Self::from_month_day_usec(0, 0, 0)
     }
 }
 
-impl Neg for IntervalUnit {
+impl Neg for Interval {
     type Output = Self;
 
     fn neg(self) -> Self {
@@ -794,7 +830,7 @@ impl Neg for IntervalUnit {
     }
 }
 
-impl ToText for crate::types::IntervalUnit {
+impl ToText for crate::types::Interval {
     fn write<W: std::fmt::Write>(&self, f: &mut W) -> std::fmt::Result {
         write!(f, "{self}")
     }
@@ -807,7 +843,7 @@ impl ToText for crate::types::IntervalUnit {
     }
 }
 
-impl Display for IntervalUnit {
+impl Display for Interval {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         let years = self.months / 12;
         let months = self.months % 12;
@@ -866,7 +902,7 @@ impl Display for IntervalUnit {
     }
 }
 
-impl ToSql for IntervalUnit {
+impl ToSql for Interval {
     to_sql_checked!();
 
     fn to_sql(
@@ -886,15 +922,15 @@ impl ToSql for IntervalUnit {
     }
 }
 
-impl<'a> FromSql<'a> for IntervalUnit {
+impl<'a> FromSql<'a> for Interval {
     fn from_sql(
         _: &Type,
         mut raw: &'a [u8],
-    ) -> std::result::Result<IntervalUnit, Box<dyn Error + Sync + Send>> {
+    ) -> std::result::Result<Interval, Box<dyn Error + Sync + Send>> {
         let usecs = raw.read_i64::<NetworkEndian>()?;
         let days = raw.read_i32::<NetworkEndian>()?;
         let months = raw.read_i32::<NetworkEndian>()?;
-        Ok(IntervalUnit::from_month_day_usec(months, days, usecs))
+        Ok(Interval::from_month_day_usec(months, days, usecs))
     }
 
     fn accepts(ty: &Type) -> bool {
@@ -902,7 +938,7 @@ impl<'a> FromSql<'a> for IntervalUnit {
     }
 }
 
-impl ToBinary for IntervalUnit {
+impl ToBinary for Interval {
     fn to_binary_with_type(&self, ty: &DataType) -> Result<Option<Bytes>> {
         match ty {
             DataType::Interval => {
@@ -943,7 +979,7 @@ impl FromStr for DateTimeField {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 enum TimeStrToken {
-    Second(OrderedF64),
+    Second(F64),
     Num(i64),
     TimeUnit(DateTimeField),
 }
@@ -1070,7 +1106,7 @@ fn convert_hms(c: &mut Vec<String>, t: &mut Vec<TimeStrToken>) -> Option<()> {
                 t.push(TimeStrToken::TimeUnit(DateTimeField::Minute))
             }
             SECOND => {
-                let mut v: OrderedF64 = s.parse().ok()?;
+                let mut v: F64 = s.parse().ok()?;
                 // PostgreSQL allows '60.x' for seconds.
                 if !(0f64 <= *v && *v < 61f64) {
                     return None;
@@ -1087,7 +1123,7 @@ fn convert_hms(c: &mut Vec<String>, t: &mut Vec<TimeStrToken>) -> Option<()> {
     Some(())
 }
 
-impl IntervalUnit {
+impl Interval {
     fn parse_sql_standard(s: &str, leading_field: DateTimeField) -> Result<Self> {
         use DateTimeField::*;
         let tokens = parse_interval(s)?;
@@ -1113,29 +1149,21 @@ impl IntervalUnit {
         (|| match leading_field {
             Year => {
                 let months = num.checked_mul(12)?.try_into().ok()?;
-                Some(IntervalUnit::from_month_day_usec(months, 0, 0))
+                Some(Interval::from_month_day_usec(months, 0, 0))
             }
-            Month => Some(IntervalUnit::from_month_day_usec(
-                num.try_into().ok()?,
-                0,
-                0,
-            )),
-            Day => Some(IntervalUnit::from_month_day_usec(
-                0,
-                num.try_into().ok()?,
-                0,
-            )),
+            Month => Some(Interval::from_month_day_usec(num.try_into().ok()?, 0, 0)),
+            Day => Some(Interval::from_month_day_usec(0, num.try_into().ok()?, 0)),
             Hour => {
                 let usecs = num.checked_mul(3600 * USECS_PER_SEC)?;
-                Some(IntervalUnit::from_month_day_usec(0, 0, usecs))
+                Some(Interval::from_month_day_usec(0, 0, usecs))
             }
             Minute => {
                 let usecs = num.checked_mul(60 * USECS_PER_SEC)?;
-                Some(IntervalUnit::from_month_day_usec(0, 0, usecs))
+                Some(Interval::from_month_day_usec(0, 0, usecs))
             }
             Second => {
                 let usecs = num.checked_mul(USECS_PER_SEC)?;
-                Some(IntervalUnit::from_month_day_usec(0, 0, usecs))
+                Some(Interval::from_month_day_usec(0, 0, usecs))
             }
         })()
         .ok_or_else(|| ErrorCode::InvalidInputSyntax(format!("Invalid interval {}.", s)).into())
@@ -1151,28 +1179,28 @@ impl IntervalUnit {
             return Err(ErrorCode::InvalidInputSyntax(format!("Invalid interval {}.", &s)).into());
         }
         let mut token_iter = tokens.into_iter();
-        let mut result = IntervalUnit::from_month_day_usec(0, 0, 0);
+        let mut result = Interval::from_month_day_usec(0, 0, 0);
         while let Some(num) = token_iter.next() && let Some(interval_unit) = token_iter.next() {
             match (num, interval_unit) {
                 (TimeStrToken::Num(num), TimeStrToken::TimeUnit(interval_unit)) => {
                     result = (|| match interval_unit {
                         Year => {
                             let months = num.checked_mul(12)?.try_into().ok()?;
-                            Some(IntervalUnit::from_month_day_usec(months, 0, 0))
+                            Some(Interval::from_month_day_usec(months, 0, 0))
                         }
-                        Month => Some(IntervalUnit::from_month_day_usec(num.try_into().ok()?, 0, 0)),
-                        Day => Some(IntervalUnit::from_month_day_usec(0, num.try_into().ok()?, 0)),
+                        Month => Some(Interval::from_month_day_usec(num.try_into().ok()?, 0, 0)),
+                        Day => Some(Interval::from_month_day_usec(0, num.try_into().ok()?, 0)),
                         Hour => {
                             let usecs = num.checked_mul(3600 * USECS_PER_SEC)?;
-                            Some(IntervalUnit::from_month_day_usec(0, 0, usecs))
+                            Some(Interval::from_month_day_usec(0, 0, usecs))
                         }
                         Minute => {
                             let usecs = num.checked_mul(60 * USECS_PER_SEC)?;
-                            Some(IntervalUnit::from_month_day_usec(0, 0, usecs))
+                            Some(Interval::from_month_day_usec(0, 0, usecs))
                         }
                         Second => {
                             let usecs = num.checked_mul(USECS_PER_SEC)?;
-                            Some(IntervalUnit::from_month_day_usec(0, 0, usecs))
+                            Some(Interval::from_month_day_usec(0, 0, usecs))
                         }
                     })()
                     .and_then(|rhs| result.checked_add(&rhs))
@@ -1183,7 +1211,7 @@ impl IntervalUnit {
                         Second => {
                             // If unsatisfied precision is passed as input, we should not return None (Error).
                             let usecs = (second.into_inner() * (USECS_PER_SEC as f64)).round() as i64;
-                            Some(IntervalUnit::from_month_day_usec(0, 0, usecs))
+                            Some(Interval::from_month_day_usec(0, 0, usecs))
                         }
                         _ => None,
                     }
@@ -1207,7 +1235,7 @@ impl IntervalUnit {
     }
 }
 
-impl FromStr for IntervalUnit {
+impl FromStr for Interval {
     type Err = RwError;
 
     fn from_str(s: &str) -> Result<Self> {
@@ -1217,103 +1245,83 @@ impl FromStr for IntervalUnit {
 
 #[cfg(test)]
 mod tests {
-    use interval::test_utils::IntervalUnitTestExt;
+    use interval::test_utils::IntervalTestExt;
 
     use super::*;
     use crate::types::ordered_float::OrderedFloat;
 
     #[test]
     fn test_parse() {
-        let interval = "04:00:00".parse::<IntervalUnit>().unwrap();
-        assert_eq!(interval, IntervalUnit::from_millis(4 * 3600 * 1000));
+        let interval = "04:00:00".parse::<Interval>().unwrap();
+        assert_eq!(interval, Interval::from_millis(4 * 3600 * 1000));
 
         let interval = "1 year 2 months 3 days 00:00:01"
-            .parse::<IntervalUnit>()
+            .parse::<Interval>()
             .unwrap();
         assert_eq!(
             interval,
-            IntervalUnit::from_month(14)
-                + IntervalUnit::from_days(3)
-                + IntervalUnit::from_millis(1000)
+            Interval::from_month(14) + Interval::from_days(3) + Interval::from_millis(1000)
         );
 
         let interval = "1 year 2 months 3 days 00:00:00.001"
-            .parse::<IntervalUnit>()
+            .parse::<Interval>()
             .unwrap();
         assert_eq!(
             interval,
-            IntervalUnit::from_month(14)
-                + IntervalUnit::from_days(3)
-                + IntervalUnit::from_millis(1)
+            Interval::from_month(14) + Interval::from_days(3) + Interval::from_millis(1)
         );
 
         let interval = "1 year 2 months 3 days 00:59:59.005"
-            .parse::<IntervalUnit>()
+            .parse::<Interval>()
             .unwrap();
         assert_eq!(
             interval,
-            IntervalUnit::from_month(14)
-                + IntervalUnit::from_days(3)
-                + IntervalUnit::from_minutes(59)
-                + IntervalUnit::from_millis(59000)
-                + IntervalUnit::from_millis(5)
+            Interval::from_month(14)
+                + Interval::from_days(3)
+                + Interval::from_minutes(59)
+                + Interval::from_millis(59000)
+                + Interval::from_millis(5)
         );
 
-        let interval = "1 year 2 months 3 days 01".parse::<IntervalUnit>().unwrap();
+        let interval = "1 year 2 months 3 days 01".parse::<Interval>().unwrap();
         assert_eq!(
             interval,
-            IntervalUnit::from_month(14)
-                + IntervalUnit::from_days(3)
-                + IntervalUnit::from_millis(1000)
+            Interval::from_month(14) + Interval::from_days(3) + Interval::from_millis(1000)
         );
 
-        let interval = "1 year 2 months 3 days 1:".parse::<IntervalUnit>().unwrap();
+        let interval = "1 year 2 months 3 days 1:".parse::<Interval>().unwrap();
         assert_eq!(
             interval,
-            IntervalUnit::from_month(14)
-                + IntervalUnit::from_days(3)
-                + IntervalUnit::from_minutes(60)
+            Interval::from_month(14) + Interval::from_days(3) + Interval::from_minutes(60)
         );
 
-        let interval = "1 year 2 months 3 days 1:2"
-            .parse::<IntervalUnit>()
-            .unwrap();
+        let interval = "1 year 2 months 3 days 1:2".parse::<Interval>().unwrap();
         assert_eq!(
             interval,
-            IntervalUnit::from_month(14)
-                + IntervalUnit::from_days(3)
-                + IntervalUnit::from_minutes(62)
+            Interval::from_month(14) + Interval::from_days(3) + Interval::from_minutes(62)
         );
 
-        let interval = "1 year 2 months 3 days 1:2:"
-            .parse::<IntervalUnit>()
-            .unwrap();
+        let interval = "1 year 2 months 3 days 1:2:".parse::<Interval>().unwrap();
         assert_eq!(
             interval,
-            IntervalUnit::from_month(14)
-                + IntervalUnit::from_days(3)
-                + IntervalUnit::from_minutes(62)
+            Interval::from_month(14) + Interval::from_days(3) + Interval::from_minutes(62)
         );
     }
 
     #[test]
     fn test_to_string() {
         assert_eq!(
-            IntervalUnit::from_month_day_usec(
-                -14,
-                3,
-                (11 * 3600 + 45 * 60 + 14) * USECS_PER_SEC + 233
-            )
-            .to_string(),
+            Interval::from_month_day_usec(-14, 3, (11 * 3600 + 45 * 60 + 14) * USECS_PER_SEC + 233)
+                .to_string(),
             "-1 years -2 mons +3 days 11:45:14.000233"
         );
         assert_eq!(
-            IntervalUnit::from_month_day_usec(-14, 3, 0).to_string(),
+            Interval::from_month_day_usec(-14, 3, 0).to_string(),
             "-1 years -2 mons +3 days"
         );
-        assert_eq!(IntervalUnit::default().to_string(), "00:00:00");
+        assert_eq!(Interval::default().to_string(), "00:00:00");
         assert_eq!(
-            IntervalUnit::from_month_day_usec(
+            Interval::from_month_day_usec(
                 -14,
                 3,
                 -((11 * 3600 + 45 * 60 + 14) * USECS_PER_SEC + 233)
@@ -1339,8 +1347,8 @@ mod tests {
         ];
 
         for (lhs, rhs, expected) in cases {
-            let lhs = IntervalUnit::from_month_day_usec(lhs.0, lhs.1, lhs.2 as i64);
-            let rhs = IntervalUnit::from_month_day_usec(rhs.0, rhs.1, rhs.2 as i64);
+            let lhs = Interval::from_month_day_usec(lhs.0, lhs.1, lhs.2 as i64);
+            let rhs = Interval::from_month_day_usec(rhs.0, rhs.1, rhs.2 as i64);
             let result = std::panic::catch_unwind(|| {
                 let actual = lhs.exact_div(&rhs);
                 assert_eq!(actual, expected);
@@ -1369,8 +1377,8 @@ mod tests {
         ];
 
         for (lhs, rhs, expected) in cases_int {
-            let lhs = IntervalUnit::from_month_day_usec(lhs.0, lhs.1, lhs.2 as i64);
-            let expected = expected.map(|x| IntervalUnit::from_month_day_usec(x.0, x.1, x.2));
+            let lhs = Interval::from_month_day_usec(lhs.0, lhs.1, lhs.2 as i64);
+            let expected = expected.map(|x| Interval::from_month_day_usec(x.0, x.1, x.2));
 
             let actual = lhs.div_float(rhs as i16);
             assert_eq!(actual, expected);
@@ -1383,8 +1391,8 @@ mod tests {
         }
 
         for (lhs, rhs, expected) in cases_float {
-            let lhs = IntervalUnit::from_month_day_usec(lhs.0, lhs.1, lhs.2 as i64);
-            let expected = expected.map(|x| IntervalUnit::from_month_day_usec(x.0, x.1, x.2));
+            let lhs = Interval::from_month_day_usec(lhs.0, lhs.1, lhs.2 as i64);
+            let expected = expected.map(|x| Interval::from_month_day_usec(x.0, x.1, x.2));
 
             let actual = lhs.div_float(OrderedFloat::<f32>(rhs));
             assert_eq!(actual, expected);
@@ -1397,11 +1405,11 @@ mod tests {
     #[test]
     fn test_serialize_deserialize() {
         let mut serializer = memcomparable::Serializer::new(vec![]);
-        let a = IntervalUnit::from_month_day_usec(123, 456, 789);
+        let a = Interval::from_month_day_usec(123, 456, 789);
         a.serialize(&mut serializer).unwrap();
         let buf = serializer.into_inner();
         let mut deserializer = memcomparable::Deserializer::new(&buf[..]);
-        assert_eq!(IntervalUnit::deserialize(&mut deserializer).unwrap(), a);
+        assert_eq!(Interval::deserialize(&mut deserializer).unwrap(), a);
     }
 
     #[test]
@@ -1421,14 +1429,14 @@ mod tests {
         for ((lhs_months, lhs_days, lhs_usecs), (rhs_months, rhs_days, rhs_usecs), order) in cases {
             let lhs = {
                 let mut serializer = memcomparable::Serializer::new(vec![]);
-                IntervalUnit::from_month_day_usec(lhs_months, lhs_days, lhs_usecs)
+                Interval::from_month_day_usec(lhs_months, lhs_days, lhs_usecs)
                     .serialize(&mut serializer)
                     .unwrap();
                 serializer.into_inner()
             };
             let rhs = {
                 let mut serializer = memcomparable::Serializer::new(vec![]);
-                IntervalUnit::from_month_day_usec(rhs_months, rhs_days, rhs_usecs)
+                Interval::from_month_day_usec(rhs_months, rhs_days, rhs_usecs)
                     .serialize(&mut serializer)
                     .unwrap();
                 serializer.into_inner()
@@ -1466,7 +1474,7 @@ mod tests {
             ),
         ];
         for ((lhs_months, lhs_days, lhs_usecs), rhs) in cases {
-            let input = IntervalUnit::from_month_day_usec(lhs_months, lhs_days, lhs_usecs);
+            let input = Interval::from_month_day_usec(lhs_months, lhs_days, lhs_usecs);
             let actual_deserialize = IntervalCmpValue::from(input).as_justified();
 
             match rhs {
@@ -1484,7 +1492,7 @@ mod tests {
         }
 
         // A false positive overflow that is buggy in PostgreSQL 15.2.
-        let input = IntervalUnit::from_month_day_usec(i32::MIN, -30, 1);
+        let input = Interval::from_month_day_usec(i32::MIN, -30, 1);
         let actual_deserialize = IntervalCmpValue::from(input).as_justified();
         // It has a justified interval within range, and can be obtained by our deserialization.
         assert_eq!(actual_deserialize.unwrap().get_months(), i32::MIN);
@@ -1502,15 +1510,15 @@ mod tests {
             (i32::MIN, -60, i64::MAX),
         ];
         for (months, days, usecs) in cases {
-            let input = IntervalUnit::from_month_day_usec(months, days, usecs);
+            let input = Interval::from_month_day_usec(months, days, usecs);
 
             let mut serializer = memcomparable::Serializer::new(vec![]);
             input.serialize(&mut serializer).unwrap();
             let buf = serializer.into_inner();
             let mut deserializer = memcomparable::Deserializer::new(&buf[..]);
-            let actual = IntervalUnit::deserialize(&mut deserializer).unwrap();
+            let actual = Interval::deserialize(&mut deserializer).unwrap();
 
-            // The IntervalUnit we get back can be a different one, but they should be equal.
+            // The Interval we get back can be a different one, but they should be equal.
             assert_eq!(actual, input);
         }
 
@@ -1519,11 +1527,11 @@ mod tests {
         (i64::MAX, u64::MAX).serialize(&mut serializer).unwrap();
         let buf = serializer.into_inner();
         let mut deserializer = memcomparable::Deserializer::new(&buf[..]);
-        assert!(IntervalUnit::deserialize(&mut deserializer).is_err());
+        assert!(Interval::deserialize(&mut deserializer).is_err());
 
         let buf = i128::MIN.to_ne_bytes();
         std::panic::catch_unwind(|| {
-            <IntervalUnit as crate::hash::HashKeySerDe>::deserialize(&mut &buf[..])
+            <Interval as crate::hash::HashKeySerDe>::deserialize(&mut &buf[..])
         })
         .unwrap_err();
     }
diff --git a/src/common/src/types/mod.rs b/src/common/src/types/mod.rs
index 55f324ba5ee6c..ce215124c7437 100644
--- a/src/common/src/types/mod.rs
+++ b/src/common/src/types/mod.rs
@@ -20,11 +20,13 @@ use bytes::{Buf, BufMut, Bytes};
 use num_traits::Float;
 use parse_display::{Display, FromStr};
 use postgres_types::FromSql;
-use risingwave_pb::data::DataType as ProstDataType;
+use risingwave_pb::data::data_type::PbTypeName;
+use risingwave_pb::data::PbDataType;
 use serde::{Deserialize, Serialize};
 
 use crate::array::{ArrayError, ArrayResult, NULL_VAL_FOR_HASH};
 use crate::error::{BoxedError, ErrorCode};
+use crate::util::iter_util::ZipEqDebug;
 
 mod native_type;
 mod ops;
@@ -35,7 +37,6 @@ use std::fmt::Debug;
 use std::str::{FromStr, Utf8Error};
 
 pub use native_type::*;
-use risingwave_pb::data::data_type::TypeName;
 pub use scalar_impl::*;
 pub use successor::*;
 pub mod chrono_wrapper;
@@ -49,9 +50,7 @@ pub mod to_text;
 mod ordered_float;
 
 use chrono::{Datelike, NaiveDate, NaiveDateTime, Timelike};
-pub use chrono_wrapper::{
-    NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper, UNIX_EPOCH_DAYS,
-};
+pub use chrono_wrapper::{Date, Time, Timestamp, UNIX_EPOCH_DAYS};
 pub use decimal::Decimal;
 pub use interval::*;
 use itertools::Itertools;
@@ -71,8 +70,8 @@ use crate::array::{
 };
 use crate::error::Result as RwResult;
 
-pub type OrderedF32 = ordered_float::OrderedFloat<f32>;
-pub type OrderedF64 = ordered_float::OrderedFloat<f64>;
+pub type F32 = ordered_float::OrderedFloat<f32>;
+pub type F64 = ordered_float::OrderedFloat<f64>;
 
 /// `EnumDiscriminants` will generate a `DataTypeName` enum with the same variants,
 /// but without data fields.
@@ -124,6 +123,7 @@ pub enum DataType {
     #[from_str(ignore)]
     Struct(Arc<StructType>),
     #[display("{datatype}[]")]
+    #[from_str(regex = r"(?i)^(?P<datatype>.+)\[\]$")]
     List { datatype: Box<DataType> },
     #[display("bytea")]
     #[from_str(regex = "(?i)^bytea$")]
@@ -207,35 +207,60 @@ pub fn unnested_list_type(datatype: DataType) -> DataType {
     }
 }
 
-impl From<&ProstDataType> for DataType {
-    fn from(proto: &ProstDataType) -> DataType {
+impl From<&PbDataType> for DataType {
+    fn from(proto: &PbDataType) -> DataType {
         match proto.get_type_name().expect("missing type field") {
-            TypeName::Int16 => DataType::Int16,
-            TypeName::Int32 => DataType::Int32,
-            TypeName::Int64 => DataType::Int64,
-            TypeName::Serial => DataType::Serial,
-            TypeName::Float => DataType::Float32,
-            TypeName::Double => DataType::Float64,
-            TypeName::Boolean => DataType::Boolean,
-            TypeName::Varchar => DataType::Varchar,
-            TypeName::Date => DataType::Date,
-            TypeName::Time => DataType::Time,
-            TypeName::Timestamp => DataType::Timestamp,
-            TypeName::Timestamptz => DataType::Timestamptz,
-            TypeName::Decimal => DataType::Decimal,
-            TypeName::Interval => DataType::Interval,
-            TypeName::Bytea => DataType::Bytea,
-            TypeName::Jsonb => DataType::Jsonb,
-            TypeName::Struct => {
+            PbTypeName::Int16 => DataType::Int16,
+            PbTypeName::Int32 => DataType::Int32,
+            PbTypeName::Int64 => DataType::Int64,
+            PbTypeName::Serial => DataType::Serial,
+            PbTypeName::Float => DataType::Float32,
+            PbTypeName::Double => DataType::Float64,
+            PbTypeName::Boolean => DataType::Boolean,
+            PbTypeName::Varchar => DataType::Varchar,
+            PbTypeName::Date => DataType::Date,
+            PbTypeName::Time => DataType::Time,
+            PbTypeName::Timestamp => DataType::Timestamp,
+            PbTypeName::Timestamptz => DataType::Timestamptz,
+            PbTypeName::Decimal => DataType::Decimal,
+            PbTypeName::Interval => DataType::Interval,
+            PbTypeName::Bytea => DataType::Bytea,
+            PbTypeName::Jsonb => DataType::Jsonb,
+            PbTypeName::Struct => {
                 let fields: Vec<DataType> = proto.field_type.iter().map(|f| f.into()).collect_vec();
                 let field_names: Vec<String> = proto.field_names.iter().cloned().collect_vec();
                 DataType::new_struct(fields, field_names)
             }
-            TypeName::List => DataType::List {
+            PbTypeName::List => DataType::List {
                 // The first (and only) item is the list element type.
                 datatype: Box::new((&proto.field_type[0]).into()),
             },
-            TypeName::TypeUnspecified => unreachable!(),
+            PbTypeName::TypeUnspecified => unreachable!(),
+        }
+    }
+}
+
+impl From<DataTypeName> for PbTypeName {
+    fn from(type_name: DataTypeName) -> Self {
+        match type_name {
+            DataTypeName::Boolean => PbTypeName::Boolean,
+            DataTypeName::Int16 => PbTypeName::Int16,
+            DataTypeName::Int32 => PbTypeName::Int32,
+            DataTypeName::Int64 => PbTypeName::Int64,
+            DataTypeName::Serial => PbTypeName::Serial,
+            DataTypeName::Float32 => PbTypeName::Float,
+            DataTypeName::Float64 => PbTypeName::Double,
+            DataTypeName::Varchar => PbTypeName::Varchar,
+            DataTypeName::Date => PbTypeName::Date,
+            DataTypeName::Timestamp => PbTypeName::Timestamp,
+            DataTypeName::Timestamptz => PbTypeName::Timestamptz,
+            DataTypeName::Time => PbTypeName::Time,
+            DataTypeName::Interval => PbTypeName::Interval,
+            DataTypeName::Decimal => PbTypeName::Decimal,
+            DataTypeName::Bytea => PbTypeName::Bytea,
+            DataTypeName::Jsonb => PbTypeName::Jsonb,
+            DataTypeName::Struct => PbTypeName::Struct,
+            DataTypeName::List => PbTypeName::List,
         }
     }
 }
@@ -249,13 +274,13 @@ impl DataType {
             DataType::Int32 => PrimitiveArrayBuilder::<i32>::new(capacity).into(),
             DataType::Int64 => PrimitiveArrayBuilder::<i64>::new(capacity).into(),
             DataType::Serial => PrimitiveArrayBuilder::<Serial>::new(capacity).into(),
-            DataType::Float32 => PrimitiveArrayBuilder::<OrderedF32>::new(capacity).into(),
-            DataType::Float64 => PrimitiveArrayBuilder::<OrderedF64>::new(capacity).into(),
+            DataType::Float32 => PrimitiveArrayBuilder::<F32>::new(capacity).into(),
+            DataType::Float64 => PrimitiveArrayBuilder::<F64>::new(capacity).into(),
             DataType::Decimal => DecimalArrayBuilder::new(capacity).into(),
-            DataType::Date => NaiveDateArrayBuilder::new(capacity).into(),
+            DataType::Date => DateArrayBuilder::new(capacity).into(),
             DataType::Varchar => Utf8ArrayBuilder::new(capacity).into(),
-            DataType::Time => NaiveTimeArrayBuilder::new(capacity).into(),
-            DataType::Timestamp => NaiveDateTimeArrayBuilder::new(capacity).into(),
+            DataType::Time => TimeArrayBuilder::new(capacity).into(),
+            DataType::Timestamp => TimestampArrayBuilder::new(capacity).into(),
             DataType::Timestamptz => PrimitiveArrayBuilder::<i64>::new(capacity).into(),
             DataType::Interval => IntervalArrayBuilder::new(capacity).into(),
             DataType::Jsonb => JsonbArrayBuilder::new(capacity).into(),
@@ -273,31 +298,31 @@ impl DataType {
         }
     }
 
-    pub fn prost_type_name(&self) -> TypeName {
+    pub fn prost_type_name(&self) -> PbTypeName {
         match self {
-            DataType::Int16 => TypeName::Int16,
-            DataType::Int32 => TypeName::Int32,
-            DataType::Int64 => TypeName::Int64,
-            DataType::Serial => TypeName::Serial,
-            DataType::Float32 => TypeName::Float,
-            DataType::Float64 => TypeName::Double,
-            DataType::Boolean => TypeName::Boolean,
-            DataType::Varchar => TypeName::Varchar,
-            DataType::Date => TypeName::Date,
-            DataType::Time => TypeName::Time,
-            DataType::Timestamp => TypeName::Timestamp,
-            DataType::Timestamptz => TypeName::Timestamptz,
-            DataType::Decimal => TypeName::Decimal,
-            DataType::Interval => TypeName::Interval,
-            DataType::Jsonb => TypeName::Jsonb,
-            DataType::Struct { .. } => TypeName::Struct,
-            DataType::List { .. } => TypeName::List,
-            DataType::Bytea => TypeName::Bytea,
+            DataType::Int16 => PbTypeName::Int16,
+            DataType::Int32 => PbTypeName::Int32,
+            DataType::Int64 => PbTypeName::Int64,
+            DataType::Serial => PbTypeName::Serial,
+            DataType::Float32 => PbTypeName::Float,
+            DataType::Float64 => PbTypeName::Double,
+            DataType::Boolean => PbTypeName::Boolean,
+            DataType::Varchar => PbTypeName::Varchar,
+            DataType::Date => PbTypeName::Date,
+            DataType::Time => PbTypeName::Time,
+            DataType::Timestamp => PbTypeName::Timestamp,
+            DataType::Timestamptz => PbTypeName::Timestamptz,
+            DataType::Decimal => PbTypeName::Decimal,
+            DataType::Interval => PbTypeName::Interval,
+            DataType::Jsonb => PbTypeName::Jsonb,
+            DataType::Struct { .. } => PbTypeName::Struct,
+            DataType::List { .. } => PbTypeName::List,
+            DataType::Bytea => PbTypeName::Bytea,
         }
     }
 
-    pub fn to_protobuf(&self) -> ProstDataType {
-        let mut pb = ProstDataType {
+    pub fn to_protobuf(&self) -> PbDataType {
+        let mut pb = PbDataType {
             type_name: self.prost_type_name() as i32,
             is_nullable: true,
             ..Default::default()
@@ -370,20 +395,18 @@ impl DataType {
             DataType::Int32 => ScalarImpl::Int32(i32::MIN),
             DataType::Int64 => ScalarImpl::Int64(i64::MIN),
             DataType::Serial => ScalarImpl::Serial(Serial::from(i64::MIN)),
-            DataType::Float32 => ScalarImpl::Float32(OrderedF32::neg_infinity()),
-            DataType::Float64 => ScalarImpl::Float64(OrderedF64::neg_infinity()),
+            DataType::Float32 => ScalarImpl::Float32(F32::neg_infinity()),
+            DataType::Float64 => ScalarImpl::Float64(F64::neg_infinity()),
             DataType::Boolean => ScalarImpl::Bool(false),
             DataType::Varchar => ScalarImpl::Utf8("".into()),
             DataType::Bytea => ScalarImpl::Bytea("".to_string().into_bytes().into()),
-            DataType::Date => ScalarImpl::NaiveDate(NaiveDateWrapper(NaiveDate::MIN)),
-            DataType::Time => ScalarImpl::NaiveTime(NaiveTimeWrapper::from_hms_uncheck(0, 0, 0)),
-            DataType::Timestamp => {
-                ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper(NaiveDateTime::MIN))
-            }
+            DataType::Date => ScalarImpl::Date(Date(NaiveDate::MIN)),
+            DataType::Time => ScalarImpl::Time(Time::from_hms_uncheck(0, 0, 0)),
+            DataType::Timestamp => ScalarImpl::Timestamp(Timestamp(NaiveDateTime::MIN)),
             // FIXME(yuhao): Add a timestamptz scalar.
             DataType::Timestamptz => ScalarImpl::Int64(i64::MIN),
             DataType::Decimal => ScalarImpl::Decimal(Decimal::NegativeInf),
-            DataType::Interval => ScalarImpl::Interval(IntervalUnit::MIN),
+            DataType::Interval => ScalarImpl::Interval(Interval::MIN),
             DataType::Jsonb => ScalarImpl::Jsonb(JsonbVal::dummy()), // NOT `min` #7981
             DataType::Struct(data_types) => ScalarImpl::Struct(StructValue::new(
                 data_types
@@ -397,7 +420,7 @@ impl DataType {
     }
 }
 
-impl From<DataType> for ProstDataType {
+impl From<DataType> for PbDataType {
     fn from(data_type: DataType) -> Self {
         data_type.to_protobuf()
     }
@@ -477,15 +500,15 @@ macro_rules! for_all_scalar_variants {
             { Int32, int32, i32, i32 },
             { Int64, int64, i64, i64 },
             { Serial, serial, Serial, Serial },
-            { Float32, float32, OrderedF32, OrderedF32 },
-            { Float64, float64, OrderedF64, OrderedF64 },
+            { Float32, float32, F32, F32 },
+            { Float64, float64, F64, F64 },
             { Utf8, utf8, Box<str>, &'scalar str },
             { Bool, bool, bool, bool },
             { Decimal, decimal, Decimal, Decimal  },
-            { Interval, interval, IntervalUnit, IntervalUnit },
-            { NaiveDate, naivedate, NaiveDateWrapper, NaiveDateWrapper },
-            { NaiveDateTime, naivedatetime, NaiveDateTimeWrapper, NaiveDateTimeWrapper },
-            { NaiveTime, naivetime, NaiveTimeWrapper, NaiveTimeWrapper },
+            { Interval, interval, Interval, Interval },
+            { Date, date, Date, Date },
+            { Timestamp, timestamp, Timestamp, Timestamp },
+            { Time, time, Time, Time },
             { Jsonb, jsonb, JsonbVal, JsonbRef<'scalar> },
             { Struct, struct, StructValue, StructRef<'scalar> },
             { List, list, ListValue, ListRef<'scalar> },
@@ -555,57 +578,6 @@ for_all_scalar_variants! { scalar_impl_partial_ord }
 pub type Datum = Option<ScalarImpl>;
 pub type DatumRef<'a> = Option<ScalarRefImpl<'a>>;
 
-// TODO(MrCroxx): turn Datum into a struct, and impl ser/de as its member functions. (#477)
-// TODO: specify `NULL FIRST` or `NULL LAST`.
-pub fn memcmp_serialize_datum_into(
-    datum: impl ToDatumRef,
-    serializer: &mut memcomparable::Serializer<impl BufMut>,
-) -> memcomparable::Result<()> {
-    // By default, `null` is treated as largest in PostgreSQL.
-    if let Some(datum) = datum.to_datum_ref() {
-        0u8.serialize(&mut *serializer)?;
-        datum.serialize(serializer)?;
-    } else {
-        1u8.serialize(serializer)?;
-    }
-    Ok(())
-}
-
-// TODO(MrCroxx): turn Datum into a struct, and impl ser/de as its member functions. (#477)
-#[cfg_attr(not(test), expect(dead_code))]
-fn memcmp_serialize_datum_not_null_into(
-    datum: impl ToDatumRef,
-    serializer: &mut memcomparable::Serializer<impl BufMut>,
-) -> memcomparable::Result<()> {
-    datum
-        .to_datum_ref()
-        .as_ref()
-        .expect("datum cannot be null")
-        .serialize(serializer)
-}
-
-// TODO(MrCroxx): turn Datum into a struct, and impl ser/de as its member functions. (#477)
-pub fn memcmp_deserialize_datum_from(
-    ty: &DataType,
-    deserializer: &mut memcomparable::Deserializer<impl Buf>,
-) -> memcomparable::Result<Datum> {
-    let null_tag = u8::deserialize(&mut *deserializer)?;
-    match null_tag {
-        1 => Ok(None),
-        0 => Ok(Some(ScalarImpl::deserialize(ty, deserializer)?)),
-        _ => Err(memcomparable::Error::InvalidTagEncoding(null_tag as _)),
-    }
-}
-
-// TODO(MrCroxx): turn Datum into a struct, and impl ser/de as its member functions. (#477)
-#[cfg_attr(not(test), expect(dead_code))]
-fn memcmp_deserialize_datum_not_null_from(
-    ty: &DataType,
-    deserializer: &mut memcomparable::Deserializer<impl Buf>,
-) -> memcomparable::Result<Datum> {
-    Ok(Some(ScalarImpl::deserialize(ty, deserializer)?))
-}
-
 /// This trait is to implement `to_owned_datum` for `Option<ScalarImpl>`
 pub trait ToOwnedDatum {
     /// Convert the datum to an owned [`Datum`].
@@ -660,8 +632,8 @@ macro_rules! for_all_native_types {
             { i32, Int32 },
             { i64, Int64 },
             { Serial, Serial },
-            { $crate::types::OrderedF32, Float32 },
-            { $crate::types::OrderedF64, Float64 }
+            { $crate::types::F32, Float32 },
+            { $crate::types::F64, Float64 }
         }
     };
 }
@@ -818,17 +790,17 @@ impl ScalarImpl {
                     .map_err(|err| ErrorCode::InvalidInputSyntax(err.to_string()))?
                     .into(),
             ),
-            DataType::Date => Self::NaiveDate(
+            DataType::Date => Self::Date(
                 chrono::NaiveDate::from_sql(&Type::DATE, bytes)
                     .map_err(|err| ErrorCode::InvalidInputSyntax(err.to_string()))?
                     .into(),
             ),
-            DataType::Time => Self::NaiveTime(
+            DataType::Time => Self::Time(
                 chrono::NaiveTime::from_sql(&Type::TIME, bytes)
                     .map_err(|err| ErrorCode::InvalidInputSyntax(err.to_string()))?
                     .into(),
             ),
-            DataType::Timestamp => Self::NaiveDateTime(
+            DataType::Timestamp => Self::Timestamp(
                 chrono::NaiveDateTime::from_sql(&Type::TIMESTAMP, bytes)
                     .map_err(|err| ErrorCode::InvalidInputSyntax(err.to_string()))?
                     .into(),
@@ -839,7 +811,7 @@ impl ScalarImpl {
                     .timestamp_micros(),
             ),
             DataType::Interval => Self::Interval(
-                IntervalUnit::from_sql(&Type::INTERVAL, bytes)
+                Interval::from_sql(&Type::INTERVAL, bytes)
                     .map_err(|err| ErrorCode::InvalidInputSyntax(err.to_string()))?,
             ),
             DataType::Jsonb => {
@@ -858,16 +830,16 @@ impl ScalarImpl {
         Ok(res)
     }
 
-    pub fn cstr_to_str(b: &Bytes) -> Result<&str, Utf8Error> {
+    pub fn cstr_to_str(b: &[u8]) -> Result<&str, Utf8Error> {
         let without_null = if b.last() == Some(&0) {
             &b[..b.len() - 1]
         } else {
-            &b[..]
+            b
         };
         std::str::from_utf8(without_null)
     }
 
-    pub fn from_text(bytes: &Bytes, data_type: &DataType) -> RwResult<Self> {
+    pub fn from_text(bytes: &[u8], data_type: &DataType) -> RwResult<Self> {
         let str = Self::cstr_to_str(bytes).map_err(|_| {
             ErrorCode::InvalidInputSyntax(format!("Invalid param string: {:?}", bytes))
         })?;
@@ -909,17 +881,15 @@ impl ScalarImpl {
                     })?
                     .into(),
             ),
-            DataType::Date => Self::NaiveDate(NaiveDateWrapper::from_str(str).map_err(|_| {
+            DataType::Date => Self::Date(Date::from_str(str).map_err(|_| {
                 ErrorCode::InvalidInputSyntax(format!("Invalid param string: {}", str))
             })?),
-            DataType::Time => Self::NaiveTime(NaiveTimeWrapper::from_str(str).map_err(|_| {
+            DataType::Time => Self::Time(Time::from_str(str).map_err(|_| {
+                ErrorCode::InvalidInputSyntax(format!("Invalid param string: {}", str))
+            })?),
+            DataType::Timestamp => Self::Timestamp(Timestamp::from_str(str).map_err(|_| {
                 ErrorCode::InvalidInputSyntax(format!("Invalid param string: {}", str))
             })?),
-            DataType::Timestamp => {
-                Self::NaiveDateTime(NaiveDateTimeWrapper::from_str(str).map_err(|_| {
-                    ErrorCode::InvalidInputSyntax(format!("Invalid param string: {}", str))
-                })?)
-            }
             DataType::Timestamptz => Self::Int64(
                 chrono::DateTime::<chrono::Utc>::from_str(str)
                     .map_err(|_| {
@@ -927,13 +897,40 @@ impl ScalarImpl {
                     })?
                     .timestamp_micros(),
             ),
-            DataType::Interval => Self::Interval(IntervalUnit::from_str(str).map_err(|_| {
+            DataType::Interval => Self::Interval(Interval::from_str(str).map_err(|_| {
                 ErrorCode::InvalidInputSyntax(format!("Invalid param string: {}", str))
             })?),
             DataType::Jsonb => Self::Jsonb(JsonbVal::from_str(str).map_err(|_| {
                 ErrorCode::InvalidInputSyntax(format!("Invalid param string: {}", str))
             })?),
-            DataType::Bytea | DataType::Struct(_) | DataType::List { .. } => {
+            DataType::List { datatype } => {
+                // TODO: support nested list
+                if !(str.starts_with('{') && str.ends_with('}')) {
+                    return Err(ErrorCode::InvalidInputSyntax(format!(
+                        "Invalid param string: {str}",
+                    ))
+                    .into());
+                }
+                let mut values = vec![];
+                for s in str[1..str.len() - 1].split(',') {
+                    values.push(Some(Self::from_text(s.trim().as_bytes(), datatype)?));
+                }
+                Self::List(ListValue::new(values))
+            }
+            DataType::Struct(s) => {
+                if !(str.starts_with('{') && str.ends_with('}')) {
+                    return Err(ErrorCode::InvalidInputSyntax(format!(
+                        "Invalid param string: {str}",
+                    ))
+                    .into());
+                }
+                let mut fields = Vec::with_capacity(s.fields.len());
+                for (s, ty) in str[1..str.len() - 1].split(',').zip_eq_debug(&s.fields) {
+                    fields.push(Some(Self::from_text(s.trim().as_bytes(), ty)?));
+                }
+                ScalarImpl::Struct(StructValue::new(fields))
+            }
+            DataType::Bytea => {
                 return Err(ErrorCode::NotSupported(
                     format!("param type: {}", data_type),
                     "".to_string(),
@@ -1040,12 +1037,12 @@ impl ScalarRefImpl<'_> {
             Self::Bool(v) => v.serialize(ser)?,
             Self::Decimal(v) => ser.serialize_decimal((*v).into())?,
             Self::Interval(v) => v.serialize(ser)?,
-            Self::NaiveDate(v) => v.0.num_days_from_ce().serialize(ser)?,
-            Self::NaiveDateTime(v) => {
+            Self::Date(v) => v.0.num_days_from_ce().serialize(ser)?,
+            Self::Timestamp(v) => {
                 v.0.timestamp().serialize(&mut *ser)?;
                 v.0.timestamp_subsec_nanos().serialize(ser)?;
             }
-            Self::NaiveTime(v) => {
+            Self::Time(v) => {
                 v.0.num_seconds_from_midnight().serialize(&mut *ser)?;
                 v.0.nanosecond().serialize(ser)?;
             }
@@ -1083,24 +1080,23 @@ impl ScalarImpl {
             Ty::Bytea => Self::Bytea(Box::<[u8]>::deserialize(de)?),
             Ty::Boolean => Self::Bool(bool::deserialize(de)?),
             Ty::Decimal => Self::Decimal(de.deserialize_decimal()?.into()),
-            Ty::Interval => Self::Interval(IntervalUnit::deserialize(de)?),
-            Ty::Time => Self::NaiveTime({
+            Ty::Interval => Self::Interval(Interval::deserialize(de)?),
+            Ty::Time => Self::Time({
                 let secs = u32::deserialize(&mut *de)?;
                 let nano = u32::deserialize(de)?;
-                NaiveTimeWrapper::with_secs_nano(secs, nano)
+                Time::with_secs_nano(secs, nano)
                     .map_err(|e| memcomparable::Error::Message(format!("{e}")))?
             }),
-            Ty::Timestamp => Self::NaiveDateTime({
+            Ty::Timestamp => Self::Timestamp({
                 let secs = i64::deserialize(&mut *de)?;
                 let nsecs = u32::deserialize(de)?;
-                NaiveDateTimeWrapper::with_secs_nsecs(secs, nsecs)
+                Timestamp::with_secs_nsecs(secs, nsecs)
                     .map_err(|e| memcomparable::Error::Message(format!("{e}")))?
             }),
             Ty::Timestamptz => Self::Int64(i64::deserialize(de)?),
-            Ty::Date => Self::NaiveDate({
+            Ty::Date => Self::Date({
                 let days = i32::deserialize(de)?;
-                NaiveDateWrapper::with_days(days)
-                    .map_err(|e| memcomparable::Error::Message(format!("{e}")))?
+                Date::with_days(days).map_err(|e| memcomparable::Error::Message(format!("{e}")))?
             }),
             Ty::Jsonb => Self::Jsonb(JsonbVal::memcmp_deserialize(de)?),
             Ty::Struct(t) => StructValue::memcmp_deserialize(&t.fields, de)?.to_scalar_value(),
@@ -1108,64 +1104,6 @@ impl ScalarImpl {
         })
     }
 
-    /// Deserialize the `data_size` of `input_data_type` in `storage_encoding`. This function will
-    /// consume the offset of deserializer then return the length (without memcopy, only length
-    /// calculation). The difference between `encoding_data_size` and `ScalarImpl::data_size` is
-    /// that `ScalarImpl::data_size` calculates the `memory_length` of type instead of
-    /// `storage_encoding`
-    pub fn encoding_data_size(
-        data_type: &DataType,
-        deserializer: &mut memcomparable::Deserializer<impl Buf>,
-    ) -> memcomparable::Result<usize> {
-        let base_position = deserializer.position();
-        let null_tag = u8::deserialize(&mut *deserializer)?;
-        match null_tag {
-            1 => {}
-            0 => {
-                use std::mem::size_of;
-                let len = match data_type {
-                    DataType::Int16 => size_of::<i16>(),
-                    DataType::Int32 => size_of::<i32>(),
-                    DataType::Int64 => size_of::<i64>(),
-                    DataType::Serial => size_of::<Serial>(),
-                    DataType::Float32 => size_of::<OrderedF32>(),
-                    DataType::Float64 => size_of::<OrderedF64>(),
-                    DataType::Date => size_of::<NaiveDateWrapper>(),
-                    DataType::Time => size_of::<NaiveTimeWrapper>(),
-                    DataType::Timestamp => size_of::<NaiveDateTimeWrapper>(),
-                    DataType::Timestamptz => size_of::<i64>(),
-                    DataType::Boolean => size_of::<u8>(),
-                    // IntervalUnit is serialized as (i32, i32, i64)
-                    DataType::Interval => size_of::<(i32, i32, i64)>(),
-                    DataType::Decimal => {
-                        deserializer.deserialize_decimal()?;
-                        0 // the len is not used since decimal is not a fixed length type
-                    }
-                    // these two types is var-length and should only be determine at runtime.
-                    // TODO: need some test for this case (e.g. e2e test)
-                    DataType::List { .. } => deserializer.skip_bytes()?,
-                    DataType::Struct(t) => t
-                        .fields
-                        .iter()
-                        .map(|field| Self::encoding_data_size(field, deserializer))
-                        .try_fold(0, |a, b| b.map(|b| a + b))?,
-                    DataType::Jsonb => deserializer.skip_bytes()?,
-                    DataType::Varchar => deserializer.skip_bytes()?,
-                    DataType::Bytea => deserializer.skip_bytes()?,
-                };
-
-                // consume offset of fixed_type
-                if deserializer.position() == base_position + 1 {
-                    // fixed type
-                    deserializer.advance(len);
-                }
-            }
-            _ => return Err(memcomparable::Error::InvalidTagEncoding(null_tag as _)),
-        }
-
-        Ok(deserializer.position() - base_position)
-    }
-
     pub fn as_integral(&self) -> i64 {
         match self {
             Self::Int16(v) => *v as i64,
@@ -1195,9 +1133,9 @@ macro_rules! for_all_type_pairs {
             { Float64,     Float64 },
             { Varchar,     Utf8 },
             { Bytea,       Bytea },
-            { Date,        NaiveDate },
-            { Time,        NaiveTime },
-            { Timestamp,   NaiveDateTime },
+            { Date,        Date },
+            { Time,        Time },
+            { Timestamp,   Timestamp },
             { Timestamptz, Int64 },
             { Interval,    Interval },
             { Decimal,     Decimal },
@@ -1232,89 +1170,12 @@ pub fn literal_type_match(data_type: &DataType, literal: Option<&ScalarImpl>) ->
 #[cfg(test)]
 mod tests {
     use std::hash::{BuildHasher, Hasher};
-    use std::ops::Neg;
 
-    use itertools::Itertools;
-    use rand::thread_rng;
     use strum::IntoEnumIterator;
 
     use super::*;
     use crate::util::hash_util::Crc32FastBuilder;
 
-    fn serialize_datum_not_null_into_vec(data: i64) -> Vec<u8> {
-        let mut serializer = memcomparable::Serializer::new(vec![]);
-        memcmp_serialize_datum_not_null_into(&Some(ScalarImpl::Int64(data)), &mut serializer)
-            .unwrap();
-        serializer.into_inner()
-    }
-
-    #[test]
-    fn test_memcomparable() {
-        let memcmp_minus_1 = serialize_datum_not_null_into_vec(-1);
-        let memcmp_3874 = serialize_datum_not_null_into_vec(3874);
-        let memcmp_45745 = serialize_datum_not_null_into_vec(45745);
-        let memcmp_21234 = serialize_datum_not_null_into_vec(21234);
-        assert!(memcmp_3874 < memcmp_45745);
-        assert!(memcmp_3874 < memcmp_21234);
-        assert!(memcmp_21234 < memcmp_45745);
-
-        assert!(memcmp_minus_1 < memcmp_3874);
-        assert!(memcmp_minus_1 < memcmp_21234);
-        assert!(memcmp_minus_1 < memcmp_45745);
-    }
-
-    #[test]
-    fn test_issue_legacy_2057_ordered_float_memcomparable() {
-        use num_traits::*;
-        use rand::seq::SliceRandom;
-
-        fn serialize(f: OrderedF32) -> Vec<u8> {
-            let mut serializer = memcomparable::Serializer::new(vec![]);
-            memcmp_serialize_datum_not_null_into(&Some(f.into()), &mut serializer).unwrap();
-            serializer.into_inner()
-        }
-
-        fn deserialize(data: Vec<u8>) -> OrderedF32 {
-            let mut deserializer = memcomparable::Deserializer::new(data.as_slice());
-            let datum =
-                memcmp_deserialize_datum_not_null_from(&DataType::Float32, &mut deserializer)
-                    .unwrap();
-            datum.unwrap().try_into().unwrap()
-        }
-
-        let floats = vec![
-            // -inf
-            OrderedF32::neg_infinity(),
-            // -1
-            OrderedF32::one().neg(),
-            // 0, -0 should be treated the same
-            OrderedF32::zero(),
-            OrderedF32::neg_zero(),
-            OrderedF32::zero(),
-            // 1
-            OrderedF32::one(),
-            // inf
-            OrderedF32::infinity(),
-            // nan, -nan should be treated the same
-            OrderedF32::nan(),
-            OrderedF32::nan().neg(),
-            OrderedF32::nan(),
-        ];
-        assert!(floats.is_sorted());
-
-        let mut floats_clone = floats.clone();
-        floats_clone.shuffle(&mut thread_rng());
-        floats_clone.sort();
-        assert_eq!(floats, floats_clone);
-
-        let memcomparables = floats.clone().into_iter().map(serialize).collect_vec();
-        assert!(memcomparables.is_sorted());
-
-        let decoded_floats = memcomparables.into_iter().map(deserialize).collect_vec();
-        assert!(decoded_floats.is_sorted());
-        assert_eq!(floats, decoded_floats);
-    }
-
     #[test]
     fn test_size() {
         use static_assertions::const_assert_eq;
@@ -1331,7 +1192,7 @@ mod tests {
         assert_item_size_eq!(ListArray, 16); // Box<[Datum]>
         assert_item_size_eq!(Utf8Array, 16); // Box<str>
         assert_item_size_eq!(IntervalArray, 16);
-        assert_item_size_eq!(NaiveDateTimeArray, 12);
+        assert_item_size_eq!(TimestampArray, 12);
 
         // TODO: try to reduce the memory usage of `Decimal`, `ScalarImpl` and `Datum`.
         assert_item_size_eq!(DecimalArray, 20);
@@ -1400,7 +1261,7 @@ mod tests {
                     DataType::Decimal,
                 ),
                 DataTypeName::Date => (
-                    ScalarImpl::NaiveDate(NaiveDateWrapper::from_ymd_uncheck(2333, 3, 3)),
+                    ScalarImpl::Date(Date::from_ymd_uncheck(2333, 3, 3)),
                     DataType::Date,
                 ),
                 DataTypeName::Varchar => (ScalarImpl::Utf8("233".into()), DataType::Varchar),
@@ -1409,18 +1270,16 @@ mod tests {
                     DataType::Bytea,
                 ),
                 DataTypeName::Time => (
-                    ScalarImpl::NaiveTime(NaiveTimeWrapper::from_hms_uncheck(2, 3, 3)),
+                    ScalarImpl::Time(Time::from_hms_uncheck(2, 3, 3)),
                     DataType::Time,
                 ),
                 DataTypeName::Timestamp => (
-                    ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::from_timestamp_uncheck(
-                        23333333, 2333,
-                    )),
+                    ScalarImpl::Timestamp(Timestamp::from_timestamp_uncheck(23333333, 2333)),
                     DataType::Timestamp,
                 ),
                 DataTypeName::Timestamptz => (ScalarImpl::Int64(233333333), DataType::Timestamptz),
                 DataTypeName::Interval => (
-                    ScalarImpl::Interval(IntervalUnit::from_month_day_usec(2, 3, 3333)),
+                    ScalarImpl::Interval(Interval::from_month_day_usec(2, 3, 3333)),
                     DataType::Interval,
                 ),
                 DataTypeName::Jsonb => (ScalarImpl::Jsonb(JsonbVal::dummy()), DataType::Jsonb),
diff --git a/src/common/src/types/native_type.rs b/src/common/src/types/native_type.rs
index c655b448ed86c..2e39c1e4bbfaa 100644
--- a/src/common/src/types/native_type.rs
+++ b/src/common/src/types/native_type.rs
@@ -15,7 +15,7 @@
 use std::fmt::Debug;
 use std::io::Write;
 
-use super::{OrderedF32, OrderedF64};
+use super::{F32, F64};
 use crate::array::serial_array::Serial;
 use crate::array::ArrayResult;
 
@@ -51,13 +51,13 @@ impl NativeType for Serial {
     }
 }
 
-impl NativeType for OrderedF32 {
+impl NativeType for F32 {
     fn to_protobuf<T: Write>(self, output: &mut T) -> ArrayResult<usize> {
         output.write(&self.to_be_bytes()).map_err(Into::into)
     }
 }
 
-impl NativeType for OrderedF64 {
+impl NativeType for F64 {
     fn to_protobuf<T: Write>(self, output: &mut T) -> ArrayResult<usize> {
         output.write(&self.to_be_bytes()).map_err(Into::into)
     }
diff --git a/src/common/src/types/scalar_impl.rs b/src/common/src/types/scalar_impl.rs
index b8edb8c3cdd3c..6e73768bed7d9 100644
--- a/src/common/src/types/scalar_impl.rs
+++ b/src/common/src/types/scalar_impl.rs
@@ -181,20 +181,20 @@ impl<'a> ScalarRef<'a> for Decimal {
     }
 }
 
-/// Implement `Scalar` for `IntervalUnit`.
-impl Scalar for IntervalUnit {
-    type ScalarRefType<'a> = IntervalUnit;
+/// Implement `Scalar` for `Interval`.
+impl Scalar for Interval {
+    type ScalarRefType<'a> = Interval;
 
-    fn as_scalar_ref(&self) -> IntervalUnit {
+    fn as_scalar_ref(&self) -> Interval {
         *self
     }
 }
 
-/// Implement `ScalarRef` for `IntervalUnit`.
-impl<'a> ScalarRef<'a> for IntervalUnit {
-    type ScalarType = IntervalUnit;
+/// Implement `ScalarRef` for `Interval`.
+impl<'a> ScalarRef<'a> for Interval {
+    type ScalarType = Interval;
 
-    fn to_owned_scalar(&self) -> IntervalUnit {
+    fn to_owned_scalar(&self) -> Interval {
         *self
     }
 
@@ -203,20 +203,20 @@ impl<'a> ScalarRef<'a> for IntervalUnit {
     }
 }
 
-/// Implement `Scalar` for `NaiveDateWrapper`.
-impl Scalar for NaiveDateWrapper {
-    type ScalarRefType<'a> = NaiveDateWrapper;
+/// Implement `Scalar` for `Date`.
+impl Scalar for Date {
+    type ScalarRefType<'a> = Date;
 
-    fn as_scalar_ref(&self) -> NaiveDateWrapper {
+    fn as_scalar_ref(&self) -> Date {
         *self
     }
 }
 
-/// Implement `ScalarRef` for `NaiveDateWrapper`.
-impl<'a> ScalarRef<'a> for NaiveDateWrapper {
-    type ScalarType = NaiveDateWrapper;
+/// Implement `ScalarRef` for `Date`.
+impl<'a> ScalarRef<'a> for Date {
+    type ScalarType = Date;
 
-    fn to_owned_scalar(&self) -> NaiveDateWrapper {
+    fn to_owned_scalar(&self) -> Date {
         *self
     }
 
@@ -225,20 +225,20 @@ impl<'a> ScalarRef<'a> for NaiveDateWrapper {
     }
 }
 
-/// Implement `Scalar` for `NaiveDateTimeWrapper`.
-impl Scalar for NaiveDateTimeWrapper {
-    type ScalarRefType<'a> = NaiveDateTimeWrapper;
+/// Implement `Scalar` for `Timestamp`.
+impl Scalar for Timestamp {
+    type ScalarRefType<'a> = Timestamp;
 
-    fn as_scalar_ref(&self) -> NaiveDateTimeWrapper {
+    fn as_scalar_ref(&self) -> Timestamp {
         *self
     }
 }
 
-/// Implement `ScalarRef` for `NaiveDateTimeWrapper`.
-impl<'a> ScalarRef<'a> for NaiveDateTimeWrapper {
-    type ScalarType = NaiveDateTimeWrapper;
+/// Implement `ScalarRef` for `Timestamp`.
+impl<'a> ScalarRef<'a> for Timestamp {
+    type ScalarType = Timestamp;
 
-    fn to_owned_scalar(&self) -> NaiveDateTimeWrapper {
+    fn to_owned_scalar(&self) -> Timestamp {
         *self
     }
 
@@ -247,20 +247,20 @@ impl<'a> ScalarRef<'a> for NaiveDateTimeWrapper {
     }
 }
 
-/// Implement `Scalar` for `NaiveTimeWrapper`.
-impl Scalar for NaiveTimeWrapper {
-    type ScalarRefType<'a> = NaiveTimeWrapper;
+/// Implement `Scalar` for `Time`.
+impl Scalar for Time {
+    type ScalarRefType<'a> = Time;
 
-    fn as_scalar_ref(&self) -> NaiveTimeWrapper {
+    fn as_scalar_ref(&self) -> Time {
         *self
     }
 }
 
-/// Implement `ScalarRef` for `NaiveTimeWrapper`.
-impl<'a> ScalarRef<'a> for NaiveTimeWrapper {
-    type ScalarType = NaiveTimeWrapper;
+/// Implement `ScalarRef` for `Time`.
+impl<'a> ScalarRef<'a> for Time {
+    type ScalarType = Time;
 
-    fn to_owned_scalar(&self) -> NaiveTimeWrapper {
+    fn to_owned_scalar(&self) -> Time {
         *self
     }
 
diff --git a/src/common/src/types/successor.rs b/src/common/src/types/successor.rs
index f3c4b26eb9c7d..23dc5b298d00f 100644
--- a/src/common/src/types/successor.rs
+++ b/src/common/src/types/successor.rs
@@ -14,7 +14,7 @@
 
 use chrono::Duration;
 
-use super::{NaiveDateTimeWrapper, NaiveDateWrapper, ScalarImpl};
+use super::{Date, ScalarImpl, Timestamp};
 
 /// A successor is a term that comes right after a particular value. Suppose n is a number (where n
 /// belongs to any whole number), then the successor of n is 'n+1'. The other terminologies used for
@@ -47,19 +47,17 @@ impl Successor for i64 {
     }
 }
 
-impl Successor for NaiveDateTimeWrapper {
+impl Successor for Timestamp {
     fn successor(&self) -> Option<Self> {
         self.0
             .checked_add_signed(Duration::nanoseconds(1))
-            .map(NaiveDateTimeWrapper)
+            .map(Timestamp)
     }
 }
 
-impl Successor for NaiveDateWrapper {
+impl Successor for Date {
     fn successor(&self) -> Option<Self> {
-        self.0
-            .checked_add_signed(Duration::days(1))
-            .map(NaiveDateWrapper)
+        self.0.checked_add_signed(Duration::days(1)).map(Date)
     }
 }
 
@@ -76,8 +74,8 @@ impl ScalarImpl {
             ScalarImpl::Int16(v) => v.successor().map(ScalarImpl::Int16),
             ScalarImpl::Int32(v) => v.successor().map(ScalarImpl::Int32),
             ScalarImpl::Int64(v) => v.successor().map(ScalarImpl::Int64),
-            ScalarImpl::NaiveDateTime(v) => v.successor().map(ScalarImpl::NaiveDateTime),
-            ScalarImpl::NaiveDate(v) => v.successor().map(ScalarImpl::NaiveDate),
+            ScalarImpl::Timestamp(v) => v.successor().map(ScalarImpl::Timestamp),
+            ScalarImpl::Date(v) => v.successor().map(ScalarImpl::Date),
             _ => None,
         }
     }
diff --git a/src/common/src/types/to_binary.rs b/src/common/src/types/to_binary.rs
index 669046c8415f7..ddebed84b566d 100644
--- a/src/common/src/types/to_binary.rs
+++ b/src/common/src/types/to_binary.rs
@@ -47,8 +47,8 @@ implement_using_to_sql! {
     { i16,Int16  },
     { i32,Int32  },
     { &str,Varchar },
-    { crate::types::OrderedF32,Float32 },
-    { crate::types::OrderedF64,Float64 },
+    { crate::types::F32,Float32 },
+    { crate::types::F64,Float64 },
     { bool,Boolean },
     { &[u8],Bytea }
 }
@@ -90,9 +90,9 @@ impl ToBinary for ScalarRefImpl<'_> {
             ScalarRefImpl::Bool(v) => v.to_binary_with_type(ty),
             ScalarRefImpl::Decimal(v) => v.to_binary_with_type(ty),
             ScalarRefImpl::Interval(v) => v.to_binary_with_type(ty),
-            ScalarRefImpl::NaiveDate(v) => v.to_binary_with_type(ty),
-            ScalarRefImpl::NaiveDateTime(v) => v.to_binary_with_type(ty),
-            ScalarRefImpl::NaiveTime(v) => v.to_binary_with_type(ty),
+            ScalarRefImpl::Date(v) => v.to_binary_with_type(ty),
+            ScalarRefImpl::Timestamp(v) => v.to_binary_with_type(ty),
+            ScalarRefImpl::Time(v) => v.to_binary_with_type(ty),
             ScalarRefImpl::Bytea(v) => v.to_binary_with_type(ty),
             ScalarRefImpl::Jsonb(v) => v.to_binary_with_type(ty),
             ScalarRefImpl::Struct(_) => todo!(),
diff --git a/src/common/src/types/to_text.rs b/src/common/src/types/to_text.rs
index 5ae7a6f967227..47e6e91fac2ef 100644
--- a/src/common/src/types/to_text.rs
+++ b/src/common/src/types/to_text.rs
@@ -51,9 +51,9 @@ pub trait ToText {
     /// - `ScalarRefImpl::Boolean` -> `DataType::Boolean`
     /// - `ScalarRefImpl::Utf8` -> `DataType::Varchar`
     /// - `ScalarRefImpl::Bytea` -> `DataType::Bytea`
-    /// - `ScalarRefImpl::NaiveDate` -> `DataType::Date`
-    /// - `ScalarRefImpl::NaiveTime` -> `DataType::Time`
-    /// - `ScalarRefImpl::NaiveDateTime` -> `DataType::Timestamp`
+    /// - `ScalarRefImpl::Date` -> `DataType::Date`
+    /// - `ScalarRefImpl::Time` -> `DataType::Time`
+    /// - `ScalarRefImpl::Timestamp` -> `DataType::Timestamp`
     /// - `ScalarRefImpl::Interval` -> `DataType::Interval`
     /// - `ScalarRefImpl::List` -> `DataType::List`
     /// - `ScalarRefImpl::Struct` -> `DataType::Struct`
@@ -161,8 +161,8 @@ macro_rules! implement_using_ryu {
 }
 
 implement_using_ryu! {
-    { crate::types::OrderedF32, Float32 },
-    { crate::types::OrderedF64, Float64 }
+    { crate::types::F32, Float32 },
+    { crate::types::F64, Float64 }
 }
 
 impl ToText for i64 {
diff --git a/src/common/src/util/addr.rs b/src/common/src/util/addr.rs
index 6cbd448405107..231a37becae0b 100644
--- a/src/common/src/util/addr.rs
+++ b/src/common/src/util/addr.rs
@@ -16,7 +16,7 @@ use std::net::SocketAddr;
 use std::str::FromStr;
 
 use anyhow::anyhow;
-use risingwave_pb::common::HostAddress as ProstHostAddress;
+use risingwave_pb::common::PbHostAddress;
 
 /// General host address and port.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -71,8 +71,8 @@ impl FromStr for HostAddr {
     }
 }
 
-impl From<&ProstHostAddress> for HostAddr {
-    fn from(addr: &ProstHostAddress) -> Self {
+impl From<&PbHostAddress> for HostAddr {
+    fn from(addr: &PbHostAddress) -> Self {
         HostAddr {
             host: addr.get_host().to_string(),
             port: addr.get_port() as u16,
@@ -81,8 +81,8 @@ impl From<&ProstHostAddress> for HostAddr {
 }
 
 impl HostAddr {
-    pub fn to_protobuf(&self) -> ProstHostAddress {
-        ProstHostAddress {
+    pub fn to_protobuf(&self) -> PbHostAddress {
+        PbHostAddress {
             host: self.host.clone(),
             port: self.port as i32,
         }
diff --git a/src/common/src/util/column_index_mapping.rs b/src/common/src/util/column_index_mapping.rs
index ffe67fbe32e38..b5efce2ee0499 100644
--- a/src/common/src/util/column_index_mapping.rs
+++ b/src/common/src/util/column_index_mapping.rs
@@ -17,7 +17,7 @@ use std::fmt::Debug;
 use std::vec;
 
 use itertools::Itertools;
-use risingwave_pb::catalog::ColIndexMapping as ProstColIndexMapping;
+use risingwave_pb::catalog::PbColIndexMapping;
 use risingwave_pb::stream_plan::DispatchStrategy;
 
 /// `ColIndexMapping` is a partial mapping from usize to usize.
@@ -282,8 +282,8 @@ impl ColIndexMapping {
 }
 
 impl ColIndexMapping {
-    pub fn to_protobuf(&self) -> ProstColIndexMapping {
-        ProstColIndexMapping {
+    pub fn to_protobuf(&self) -> PbColIndexMapping {
+        PbColIndexMapping {
             target_size: self.target_size as u64,
             map: self
                 .map
@@ -293,7 +293,7 @@ impl ColIndexMapping {
         }
     }
 
-    pub fn from_protobuf(prost: &ProstColIndexMapping) -> ColIndexMapping {
+    pub fn from_protobuf(prost: &PbColIndexMapping) -> ColIndexMapping {
         ColIndexMapping {
             target_size: prost.target_size as usize,
             map: prost.map.iter().map(|&x| x.try_into().ok()).collect(),
diff --git a/src/common/src/util/encoding_for_comparison.rs b/src/common/src/util/encoding_for_comparison.rs
deleted file mode 100644
index 409a3b2f4252f..0000000000000
--- a/src/common/src/util/encoding_for_comparison.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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 itertools::Itertools;
-
-use super::iter_util::ZipEqFast;
-use super::sort_util::Direction;
-use crate::array::{ArrayImpl, DataChunk};
-use crate::error::Result;
-use crate::row::OwnedRow;
-use crate::types::{memcmp_serialize_datum_into, ScalarRefImpl};
-use crate::util::sort_util::{ColumnOrder, OrderType};
-
-fn encode_value(value: Option<ScalarRefImpl<'_>>, order: &OrderType) -> Result<Vec<u8>> {
-    let mut serializer = memcomparable::Serializer::new(vec![]);
-    serializer.set_reverse(order.direction() == Direction::Descending);
-    memcmp_serialize_datum_into(value, &mut serializer)?;
-    Ok(serializer.into_inner())
-}
-
-fn encode_array(array: &ArrayImpl, order: &OrderType) -> Result<Vec<Vec<u8>>> {
-    let mut data = Vec::with_capacity(array.len());
-    for datum in array.iter() {
-        data.push(encode_value(datum, order)?);
-    }
-    Ok(data)
-}
-
-/// This function is used to accelerate the comparison of tuples. It takes datachunk and
-/// user-defined order as input, yield encoded binary string with order preserved for each tuple in
-/// the datachunk.
-///
-/// TODO: specify the order for `NULL`.
-pub fn encode_chunk(chunk: &DataChunk, column_orders: &[ColumnOrder]) -> Vec<Vec<u8>> {
-    let encoded_columns = column_orders
-        .iter()
-        .map(|o| encode_array(chunk.column_at(o.column_index).array_ref(), &o.order_type).unwrap())
-        .collect_vec();
-
-    let mut encoded_chunk = vec![vec![]; chunk.capacity()];
-    for encoded_column in encoded_columns {
-        for (encoded_row, data) in encoded_chunk.iter_mut().zip_eq_fast(encoded_column) {
-            encoded_row.extend(data);
-        }
-    }
-
-    encoded_chunk
-}
-
-pub fn encode_row(row: &OwnedRow, column_orders: &[ColumnOrder]) -> Vec<u8> {
-    let mut encoded_row = vec![];
-    column_orders.iter().for_each(|o| {
-        let value = row[o.column_index].as_ref();
-        encoded_row
-            .extend(encode_value(value.map(|x| x.as_scalar_ref_impl()), &o.order_type).unwrap());
-    });
-    encoded_row
-}
-
-#[cfg(test)]
-mod tests {
-    use itertools::Itertools;
-
-    use super::{encode_chunk, encode_row, encode_value};
-    use crate::array::DataChunk;
-    use crate::row::OwnedRow;
-    use crate::types::{DataType, ScalarImpl};
-    use crate::util::sort_util::{ColumnOrder, OrderType};
-
-    #[test]
-    fn test_encode_row() {
-        let v10 = Some(ScalarImpl::Int32(42));
-        let v10_cloned = v10.clone();
-        let v11 = Some(ScalarImpl::Utf8("hello".into()));
-        let v11_cloned = v11.clone();
-        let v12 = Some(ScalarImpl::Float32(4.0.into()));
-        let v20 = Some(ScalarImpl::Int32(42));
-        let v21 = Some(ScalarImpl::Utf8("hell".into()));
-        let v22 = Some(ScalarImpl::Float32(3.0.into()));
-
-        let row1 = OwnedRow::new(vec![v10, v11, v12]);
-        let row2 = OwnedRow::new(vec![v20, v21, v22]);
-        let column_orders = vec![
-            ColumnOrder::new(0, OrderType::ascending()),
-            ColumnOrder::new(1, OrderType::descending()),
-        ];
-
-        let encoded_row1 = encode_row(&row1, &column_orders);
-        let encoded_v10 = encode_value(
-            v10_cloned.as_ref().map(|x| x.as_scalar_ref_impl()),
-            &OrderType::ascending(),
-        )
-        .unwrap();
-        let encoded_v11 = encode_value(
-            v11_cloned.as_ref().map(|x| x.as_scalar_ref_impl()),
-            &OrderType::descending(),
-        )
-        .unwrap();
-        let concated_encoded_row1 = encoded_v10
-            .into_iter()
-            .chain(encoded_v11.into_iter())
-            .collect_vec();
-        assert_eq!(encoded_row1, concated_encoded_row1);
-
-        let encoded_row2 = encode_row(&row2, &column_orders);
-        assert!(encoded_row1 < encoded_row2);
-    }
-
-    #[test]
-    fn test_encode_chunk() {
-        let v10 = Some(ScalarImpl::Int32(42));
-        let v11 = Some(ScalarImpl::Utf8("hello".into()));
-        let v12 = Some(ScalarImpl::Float32(4.0.into()));
-        let v20 = Some(ScalarImpl::Int32(42));
-        let v21 = Some(ScalarImpl::Utf8("hell".into()));
-        let v22 = Some(ScalarImpl::Float32(3.0.into()));
-
-        let row1 = OwnedRow::new(vec![v10, v11, v12]);
-        let row2 = OwnedRow::new(vec![v20, v21, v22]);
-        let chunk = DataChunk::from_rows(
-            &[row1.clone(), row2.clone()],
-            &[DataType::Int32, DataType::Varchar, DataType::Float32],
-        );
-        let column_orders = vec![
-            ColumnOrder::new(0, OrderType::ascending()),
-            ColumnOrder::new(1, OrderType::descending()),
-        ];
-
-        let encoded_row1 = encode_row(&row1, &column_orders);
-        let encoded_row2 = encode_row(&row2, &column_orders);
-        let encoded_chunk = encode_chunk(&chunk, &column_orders);
-        assert_eq!(&encoded_chunk, &[encoded_row1, encoded_row2]);
-    }
-}
diff --git a/src/common/src/util/memcmp_encoding.rs b/src/common/src/util/memcmp_encoding.rs
new file mode 100644
index 0000000000000..d48779d643c2e
--- /dev/null
+++ b/src/common/src/util/memcmp_encoding.rs
@@ -0,0 +1,555 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 bytes::{Buf, BufMut};
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
+
+use super::iter_util::ZipEqFast;
+use crate::array::serial_array::Serial;
+use crate::array::{ArrayImpl, DataChunk};
+use crate::error::Result;
+use crate::row::Row;
+use crate::types::{DataType, Date, Datum, ScalarImpl, Time, Timestamp, ToDatumRef, F32, F64};
+use crate::util::sort_util::{ColumnOrder, OrderType};
+
+// NULL > any non-NULL value by default
+const DEFAULT_NULL_TAG_NONE: u8 = 1;
+const DEFAULT_NULL_TAG_SOME: u8 = 0;
+
+pub(crate) fn serialize_datum(
+    datum: impl ToDatumRef,
+    order: OrderType,
+    serializer: &mut memcomparable::Serializer<impl BufMut>,
+) -> memcomparable::Result<()> {
+    serializer.set_reverse(order.is_descending());
+    let (null_tag_none, null_tag_some) = if order.nulls_are_largest() {
+        (1u8, 0u8) // None > Some
+    } else {
+        (0u8, 1u8) // None < Some
+    };
+    if let Some(scalar) = datum.to_datum_ref() {
+        null_tag_some.serialize(&mut *serializer)?;
+        scalar.serialize(serializer)?;
+    } else {
+        null_tag_none.serialize(serializer)?;
+    }
+    Ok(())
+}
+
+pub(crate) fn serialize_datum_in_composite(
+    datum: impl ToDatumRef,
+    serializer: &mut memcomparable::Serializer<impl BufMut>,
+) -> memcomparable::Result<()> {
+    // NOTE: No need to call `serializer.set_reverse` because we are inside a
+    // composite type value, we should follow the outside order, except for `NULL`s.
+    if let Some(scalar) = datum.to_datum_ref() {
+        DEFAULT_NULL_TAG_SOME.serialize(&mut *serializer)?;
+        scalar.serialize(serializer)?;
+    } else {
+        DEFAULT_NULL_TAG_NONE.serialize(serializer)?;
+    }
+    Ok(())
+}
+
+pub(crate) fn deserialize_datum(
+    ty: &DataType,
+    order: OrderType,
+    deserializer: &mut memcomparable::Deserializer<impl Buf>,
+) -> memcomparable::Result<Datum> {
+    deserializer.set_reverse(order.is_descending());
+    let null_tag = u8::deserialize(&mut *deserializer)?;
+    let (null_tag_none, null_tag_some) = if order.nulls_are_largest() {
+        (1u8, 0u8) // None > Some
+    } else {
+        (0u8, 1u8) // None < Some
+    };
+    if null_tag == null_tag_none {
+        Ok(None)
+    } else if null_tag == null_tag_some {
+        Ok(Some(ScalarImpl::deserialize(ty, deserializer)?))
+    } else {
+        Err(memcomparable::Error::InvalidTagEncoding(null_tag as _))
+    }
+}
+
+pub(crate) fn deserialize_datum_in_composite(
+    ty: &DataType,
+    deserializer: &mut memcomparable::Deserializer<impl Buf>,
+) -> memcomparable::Result<Datum> {
+    // NOTE: Similar to serialization, we should follow the outside order, except for `NULL`s.
+    let null_tag = u8::deserialize(&mut *deserializer)?;
+    if null_tag == DEFAULT_NULL_TAG_NONE {
+        Ok(None)
+    } else if null_tag == DEFAULT_NULL_TAG_SOME {
+        Ok(Some(ScalarImpl::deserialize(ty, deserializer)?))
+    } else {
+        Err(memcomparable::Error::InvalidTagEncoding(null_tag as _))
+    }
+}
+
+/// Deserialize the `data_size` of `input_data_type` in `memcmp_encoding`. This function will
+/// consume the offset of deserializer then return the length (without memcopy, only length
+/// calculation).
+pub(crate) fn calculate_encoded_size(
+    ty: &DataType,
+    order: OrderType,
+    encoded_data: &[u8],
+) -> memcomparable::Result<usize> {
+    let mut deserializer = memcomparable::Deserializer::new(encoded_data);
+    let (null_tag_none, null_tag_some) = if order.nulls_are_largest() {
+        (1u8, 0u8) // None > Some
+    } else {
+        (0u8, 1u8) // None < Some
+    };
+    deserializer.set_reverse(order.is_descending());
+    calculate_encoded_size_inner(ty, null_tag_none, null_tag_some, &mut deserializer)
+}
+
+fn calculate_encoded_size_inner(
+    ty: &DataType,
+    null_tag_none: u8,
+    null_tag_some: u8,
+    deserializer: &mut memcomparable::Deserializer<impl Buf>,
+) -> memcomparable::Result<usize> {
+    let base_position = deserializer.position();
+    let null_tag = u8::deserialize(&mut *deserializer)?;
+    if null_tag == null_tag_none {
+        // deserialize nothing more
+    } else if null_tag == null_tag_some {
+        use std::mem::size_of;
+        let len = match ty {
+            DataType::Int16 => size_of::<i16>(),
+            DataType::Int32 => size_of::<i32>(),
+            DataType::Int64 => size_of::<i64>(),
+            DataType::Serial => size_of::<Serial>(),
+            DataType::Float32 => size_of::<F32>(),
+            DataType::Float64 => size_of::<F64>(),
+            DataType::Date => size_of::<Date>(),
+            DataType::Time => size_of::<Time>(),
+            DataType::Timestamp => size_of::<Timestamp>(),
+            DataType::Timestamptz => size_of::<i64>(),
+            DataType::Boolean => size_of::<u8>(),
+            // Interval is serialized as (i32, i32, i64)
+            DataType::Interval => size_of::<(i32, i32, i64)>(),
+            DataType::Decimal => {
+                deserializer.deserialize_decimal()?;
+                0 // the len is not used since decimal is not a fixed length type
+            }
+            // these two types is var-length and should only be determine at runtime.
+            // TODO: need some test for this case (e.g. e2e test)
+            DataType::List { .. } => deserializer.skip_bytes()?,
+            DataType::Struct(t) => t
+                .fields
+                .iter()
+                .map(|field| {
+                    // use default null tags inside composite type
+                    calculate_encoded_size_inner(
+                        field,
+                        DEFAULT_NULL_TAG_NONE,
+                        DEFAULT_NULL_TAG_SOME,
+                        deserializer,
+                    )
+                })
+                .try_fold(0, |a, b| b.map(|b| a + b))?,
+            DataType::Jsonb => deserializer.skip_bytes()?,
+            DataType::Varchar => deserializer.skip_bytes()?,
+            DataType::Bytea => deserializer.skip_bytes()?,
+        };
+
+        // consume offset of fixed_type
+        if deserializer.position() == base_position + 1 {
+            // fixed type
+            deserializer.advance(len);
+        }
+    } else {
+        return Err(memcomparable::Error::InvalidTagEncoding(null_tag as _));
+    }
+
+    Ok(deserializer.position() - base_position)
+}
+
+pub fn encode_value(value: impl ToDatumRef, order: OrderType) -> Result<Vec<u8>> {
+    let mut serializer = memcomparable::Serializer::new(vec![]);
+    serialize_datum(value, order, &mut serializer)?;
+    Ok(serializer.into_inner())
+}
+
+pub fn decode_value(ty: &DataType, encoded_value: &[u8], order: OrderType) -> Result<Datum> {
+    let mut deserializer = memcomparable::Deserializer::new(encoded_value);
+    Ok(deserialize_datum(ty, order, &mut deserializer)?)
+}
+
+pub fn encode_array(array: &ArrayImpl, order: OrderType) -> Result<Vec<Vec<u8>>> {
+    let mut data = Vec::with_capacity(array.len());
+    for datum in array.iter() {
+        data.push(encode_value(datum, order)?);
+    }
+    Ok(data)
+}
+
+/// This function is used to accelerate the comparison of tuples. It takes datachunk and
+/// user-defined order as input, yield encoded binary string with order preserved for each tuple in
+/// the datachunk.
+pub fn encode_chunk(chunk: &DataChunk, column_orders: &[ColumnOrder]) -> Vec<Vec<u8>> {
+    let encoded_columns = column_orders
+        .iter()
+        .map(|o| encode_array(chunk.column_at(o.column_index).array_ref(), o.order_type).unwrap())
+        .collect_vec();
+
+    let mut encoded_chunk = vec![vec![]; chunk.capacity()];
+    for encoded_column in encoded_columns {
+        for (encoded_row, data) in encoded_chunk.iter_mut().zip_eq_fast(encoded_column) {
+            encoded_row.extend(data);
+        }
+    }
+
+    encoded_chunk
+}
+
+/// Encode a row into memcomparable format.
+pub fn encode_row(row: impl Row, column_orders: &[ColumnOrder]) -> Vec<u8> {
+    let mut encoded_row = vec![];
+    column_orders.iter().for_each(|o| {
+        encoded_row.extend(encode_value(row.datum_at(o.column_index), o.order_type).unwrap());
+    });
+    encoded_row
+}
+
+#[cfg(test)]
+mod tests {
+    use std::ops::Neg;
+
+    use itertools::Itertools;
+    use rand::thread_rng;
+
+    use super::*;
+    use crate::array::{DataChunk, ListValue, StructValue};
+    use crate::row::OwnedRow;
+    use crate::types::{DataType, ScalarImpl, F32};
+    use crate::util::sort_util::{ColumnOrder, OrderType};
+
+    #[test]
+    fn test_memcomparable() {
+        fn encode_num(num: Option<i32>, order_type: OrderType) -> Vec<u8> {
+            encode_value(num.map(ScalarImpl::from), order_type).unwrap()
+        }
+
+        {
+            // default ascending
+            let order_type = OrderType::ascending();
+            let memcmp_minus_1 = encode_num(Some(-1), order_type);
+            let memcmp_3874 = encode_num(Some(3874), order_type);
+            let memcmp_45745 = encode_num(Some(45745), order_type);
+            let memcmp_i32_min = encode_num(Some(i32::MIN), order_type);
+            let memcmp_i32_max = encode_num(Some(i32::MAX), order_type);
+            let memcmp_none = encode_num(None, order_type);
+
+            assert!(memcmp_3874 < memcmp_45745);
+            assert!(memcmp_3874 < memcmp_i32_max);
+            assert!(memcmp_45745 < memcmp_i32_max);
+
+            assert!(memcmp_i32_min < memcmp_i32_max);
+            assert!(memcmp_i32_min < memcmp_3874);
+            assert!(memcmp_i32_min < memcmp_45745);
+
+            assert!(memcmp_minus_1 < memcmp_3874);
+            assert!(memcmp_minus_1 < memcmp_45745);
+            assert!(memcmp_minus_1 < memcmp_i32_max);
+            assert!(memcmp_minus_1 > memcmp_i32_min);
+
+            assert!(memcmp_none > memcmp_minus_1);
+            assert!(memcmp_none > memcmp_3874);
+            assert!(memcmp_none > memcmp_i32_min);
+            assert!(memcmp_none > memcmp_i32_max);
+        }
+        {
+            // default descending
+            let order_type = OrderType::descending();
+            let memcmp_minus_1 = encode_num(Some(-1), order_type);
+            let memcmp_3874 = encode_num(Some(3874), order_type);
+            let memcmp_none = encode_num(None, order_type);
+
+            assert!(memcmp_none < memcmp_minus_1);
+            assert!(memcmp_none < memcmp_3874);
+            assert!(memcmp_3874 < memcmp_minus_1);
+        }
+        {
+            // ASC NULLS FIRST (NULLS SMALLEST)
+            let order_type = OrderType::ascending_nulls_first();
+            let memcmp_minus_1 = encode_num(Some(-1), order_type);
+            let memcmp_3874 = encode_num(Some(3874), order_type);
+            let memcmp_none = encode_num(None, order_type);
+            assert!(memcmp_none < memcmp_minus_1);
+            assert!(memcmp_none < memcmp_3874);
+        }
+        {
+            // ASC NULLS LAST (NULLS LARGEST)
+            let order_type = OrderType::ascending_nulls_last();
+            let memcmp_minus_1 = encode_num(Some(-1), order_type);
+            let memcmp_3874 = encode_num(Some(3874), order_type);
+            let memcmp_none = encode_num(None, order_type);
+            assert!(memcmp_none > memcmp_minus_1);
+            assert!(memcmp_none > memcmp_3874);
+        }
+        {
+            // DESC NULLS FIRST (NULLS LARGEST)
+            let order_type = OrderType::descending_nulls_first();
+            let memcmp_minus_1 = encode_num(Some(-1), order_type);
+            let memcmp_3874 = encode_num(Some(3874), order_type);
+            let memcmp_none = encode_num(None, order_type);
+            assert!(memcmp_none < memcmp_minus_1);
+            assert!(memcmp_none < memcmp_3874);
+        }
+        {
+            // DESC NULLS LAST (NULLS SMALLEST)
+            let order_type = OrderType::descending_nulls_last();
+            let memcmp_minus_1 = encode_num(Some(-1), order_type);
+            let memcmp_3874 = encode_num(Some(3874), order_type);
+            let memcmp_none = encode_num(None, order_type);
+            assert!(memcmp_none > memcmp_minus_1);
+            assert!(memcmp_none > memcmp_3874);
+        }
+    }
+
+    #[test]
+    fn test_memcomparable_structs() {
+        // NOTE: `NULL`s inside composite type values are always the largest.
+
+        let struct_none = None;
+        let struct_1 = Some(
+            StructValue::new(vec![Some(ScalarImpl::from(1)), Some(ScalarImpl::from(2))]).into(),
+        );
+        let struct_2 = Some(
+            StructValue::new(vec![Some(ScalarImpl::from(1)), Some(ScalarImpl::from(3))]).into(),
+        );
+        let struct_3 = Some(StructValue::new(vec![Some(ScalarImpl::from(1)), None]).into());
+
+        {
+            // ASC NULLS FIRST (NULLS SMALLEST)
+            let order_type = OrderType::ascending_nulls_first();
+            let memcmp_struct_none = encode_value(&struct_none, order_type).unwrap();
+            let memcmp_struct_1 = encode_value(&struct_1, order_type).unwrap();
+            let memcmp_struct_2 = encode_value(&struct_2, order_type).unwrap();
+            let memcmp_struct_3 = encode_value(&struct_3, order_type).unwrap();
+            assert!(memcmp_struct_none < memcmp_struct_1);
+            assert!(memcmp_struct_1 < memcmp_struct_2);
+            assert!(memcmp_struct_2 < memcmp_struct_3);
+        }
+        {
+            // ASC NULLS LAST (NULLS LARGEST)
+            let order_type = OrderType::ascending_nulls_last();
+            let memcmp_struct_none = encode_value(&struct_none, order_type).unwrap();
+            let memcmp_struct_1 = encode_value(&struct_1, order_type).unwrap();
+            let memcmp_struct_2 = encode_value(&struct_2, order_type).unwrap();
+            let memcmp_struct_3 = encode_value(&struct_3, order_type).unwrap();
+            assert!(memcmp_struct_1 < memcmp_struct_2);
+            assert!(memcmp_struct_2 < memcmp_struct_3);
+            assert!(memcmp_struct_3 < memcmp_struct_none);
+        }
+        {
+            // DESC NULLS FIRST (NULLS LARGEST)
+            let order_type = OrderType::descending_nulls_first();
+            let memcmp_struct_none = encode_value(&struct_none, order_type).unwrap();
+            let memcmp_struct_1 = encode_value(&struct_1, order_type).unwrap();
+            let memcmp_struct_2 = encode_value(&struct_2, order_type).unwrap();
+            let memcmp_struct_3 = encode_value(&struct_3, order_type).unwrap();
+            assert!(memcmp_struct_none < memcmp_struct_3);
+            assert!(memcmp_struct_3 < memcmp_struct_2);
+            assert!(memcmp_struct_2 < memcmp_struct_1);
+        }
+        {
+            // DESC NULLS LAST (NULLS SMALLEST)
+            let order_type = OrderType::descending_nulls_last();
+            let memcmp_struct_none = encode_value(&struct_none, order_type).unwrap();
+            let memcmp_struct_1 = encode_value(&struct_1, order_type).unwrap();
+            let memcmp_struct_2 = encode_value(&struct_2, order_type).unwrap();
+            let memcmp_struct_3 = encode_value(&struct_3, order_type).unwrap();
+            assert!(memcmp_struct_3 < memcmp_struct_2);
+            assert!(memcmp_struct_2 < memcmp_struct_1);
+            assert!(memcmp_struct_1 < memcmp_struct_none);
+        }
+    }
+
+    #[test]
+    fn test_memcomparable_lists() {
+        // NOTE: `NULL`s inside composite type values are always the largest.
+
+        let list_none = None;
+        let list_1 =
+            Some(ListValue::new(vec![Some(ScalarImpl::from(1)), Some(ScalarImpl::from(2))]).into());
+        let list_2 =
+            Some(ListValue::new(vec![Some(ScalarImpl::from(1)), Some(ScalarImpl::from(3))]).into());
+        let list_3 = Some(ListValue::new(vec![Some(ScalarImpl::from(1)), None]).into());
+
+        {
+            // ASC NULLS FIRST (NULLS SMALLEST)
+            let order_type = OrderType::ascending_nulls_first();
+            let memcmp_list_none = encode_value(&list_none, order_type).unwrap();
+            let memcmp_list_1 = encode_value(&list_1, order_type).unwrap();
+            let memcmp_list_2 = encode_value(&list_2, order_type).unwrap();
+            let memcmp_list_3 = encode_value(&list_3, order_type).unwrap();
+            assert!(memcmp_list_none < memcmp_list_1);
+            assert!(memcmp_list_1 < memcmp_list_2);
+            assert!(memcmp_list_2 < memcmp_list_3);
+        }
+        {
+            // ASC NULLS LAST (NULLS LARGEST)
+            let order_type = OrderType::ascending_nulls_last();
+            let memcmp_list_none = encode_value(&list_none, order_type).unwrap();
+            let memcmp_list_1 = encode_value(&list_1, order_type).unwrap();
+            let memcmp_list_2 = encode_value(&list_2, order_type).unwrap();
+            let memcmp_list_3 = encode_value(&list_3, order_type).unwrap();
+            assert!(memcmp_list_1 < memcmp_list_2);
+            assert!(memcmp_list_2 < memcmp_list_3);
+            assert!(memcmp_list_3 < memcmp_list_none);
+        }
+        {
+            // DESC NULLS FIRST (NULLS LARGEST)
+            let order_type = OrderType::descending_nulls_first();
+            let memcmp_list_none = encode_value(&list_none, order_type).unwrap();
+            let memcmp_list_1 = encode_value(&list_1, order_type).unwrap();
+            let memcmp_list_2 = encode_value(&list_2, order_type).unwrap();
+            let memcmp_list_3 = encode_value(&list_3, order_type).unwrap();
+            assert!(memcmp_list_none < memcmp_list_3);
+            assert!(memcmp_list_3 < memcmp_list_2);
+            assert!(memcmp_list_2 < memcmp_list_1);
+        }
+        {
+            // DESC NULLS LAST (NULLS SMALLEST)
+            let order_type = OrderType::descending_nulls_last();
+            let memcmp_list_none = encode_value(&list_none, order_type).unwrap();
+            let memcmp_list_1 = encode_value(&list_1, order_type).unwrap();
+            let memcmp_list_2 = encode_value(&list_2, order_type).unwrap();
+            let memcmp_list_3 = encode_value(&list_3, order_type).unwrap();
+            assert!(memcmp_list_3 < memcmp_list_2);
+            assert!(memcmp_list_2 < memcmp_list_1);
+            assert!(memcmp_list_1 < memcmp_list_none);
+        }
+    }
+
+    #[test]
+    fn test_issue_legacy_2057_ordered_float_memcomparable() {
+        use num_traits::*;
+        use rand::seq::SliceRandom;
+
+        fn serialize(f: F32) -> Vec<u8> {
+            encode_value(&Some(ScalarImpl::from(f)), OrderType::default()).unwrap()
+        }
+
+        fn deserialize(data: Vec<u8>) -> F32 {
+            decode_value(&DataType::Float32, &data, OrderType::default())
+                .unwrap()
+                .unwrap()
+                .into_float32()
+        }
+
+        let floats = vec![
+            // -inf
+            F32::neg_infinity(),
+            // -1
+            F32::one().neg(),
+            // 0, -0 should be treated the same
+            F32::zero(),
+            F32::neg_zero(),
+            F32::zero(),
+            // 1
+            F32::one(),
+            // inf
+            F32::infinity(),
+            // nan, -nan should be treated the same
+            F32::nan(),
+            F32::nan().neg(),
+            F32::nan(),
+        ];
+        assert!(floats.is_sorted());
+
+        let mut floats_clone = floats.clone();
+        floats_clone.shuffle(&mut thread_rng());
+        floats_clone.sort();
+        assert_eq!(floats, floats_clone);
+
+        let memcomparables = floats.clone().into_iter().map(serialize).collect_vec();
+        assert!(memcomparables.is_sorted());
+
+        let decoded_floats = memcomparables.into_iter().map(deserialize).collect_vec();
+        assert!(decoded_floats.is_sorted());
+        assert_eq!(floats, decoded_floats);
+    }
+
+    #[test]
+    fn test_encode_row() {
+        let v10 = Some(ScalarImpl::Int32(42));
+        let v10_cloned = v10.clone();
+        let v11 = Some(ScalarImpl::Utf8("hello".into()));
+        let v11_cloned = v11.clone();
+        let v12 = Some(ScalarImpl::Float32(4.0.into()));
+        let v20 = Some(ScalarImpl::Int32(42));
+        let v21 = Some(ScalarImpl::Utf8("hell".into()));
+        let v22 = Some(ScalarImpl::Float32(3.0.into()));
+
+        let row1 = OwnedRow::new(vec![v10, v11, v12]);
+        let row2 = OwnedRow::new(vec![v20, v21, v22]);
+        let column_orders = vec![
+            ColumnOrder::new(0, OrderType::ascending()),
+            ColumnOrder::new(1, OrderType::descending()),
+        ];
+
+        let encoded_row1 = encode_row(&row1, &column_orders);
+        let encoded_v10 = encode_value(
+            v10_cloned.as_ref().map(|x| x.as_scalar_ref_impl()),
+            OrderType::ascending(),
+        )
+        .unwrap();
+        let encoded_v11 = encode_value(
+            v11_cloned.as_ref().map(|x| x.as_scalar_ref_impl()),
+            OrderType::descending(),
+        )
+        .unwrap();
+        let concated_encoded_row1 = encoded_v10
+            .into_iter()
+            .chain(encoded_v11.into_iter())
+            .collect_vec();
+        assert_eq!(encoded_row1, concated_encoded_row1);
+
+        let encoded_row2 = encode_row(&row2, &column_orders);
+        assert!(encoded_row1 < encoded_row2);
+    }
+
+    #[test]
+    fn test_encode_chunk() {
+        let v10 = Some(ScalarImpl::Int32(42));
+        let v11 = Some(ScalarImpl::Utf8("hello".into()));
+        let v12 = Some(ScalarImpl::Float32(4.0.into()));
+        let v20 = Some(ScalarImpl::Int32(42));
+        let v21 = Some(ScalarImpl::Utf8("hell".into()));
+        let v22 = Some(ScalarImpl::Float32(3.0.into()));
+
+        let row1 = OwnedRow::new(vec![v10, v11, v12]);
+        let row2 = OwnedRow::new(vec![v20, v21, v22]);
+        let chunk = DataChunk::from_rows(
+            &[row1.clone(), row2.clone()],
+            &[DataType::Int32, DataType::Varchar, DataType::Float32],
+        );
+        let column_orders = vec![
+            ColumnOrder::new(0, OrderType::ascending()),
+            ColumnOrder::new(1, OrderType::descending()),
+        ];
+
+        let encoded_row1 = encode_row(&row1, &column_orders);
+        let encoded_row2 = encode_row(&row2, &column_orders);
+        let encoded_chunk = encode_chunk(&chunk, &column_orders);
+        assert_eq!(&encoded_chunk, &[encoded_row1, encoded_row2]);
+    }
+}
diff --git a/src/common/src/util/mod.rs b/src/common/src/util/mod.rs
index 0420b0c59690a..9c7d214c660c1 100644
--- a/src/common/src/util/mod.rs
+++ b/src/common/src/util/mod.rs
@@ -23,12 +23,12 @@ pub mod addr;
 pub mod chunk_coalesce;
 pub mod column_index_mapping;
 pub mod compress;
-pub mod encoding_for_comparison;
 pub mod env_var;
 pub mod epoch;
 mod future_utils;
 pub mod hash_util;
 pub mod iter_util;
+pub mod memcmp_encoding;
 pub mod ordered;
 pub mod prost;
 pub mod resource_util;
diff --git a/src/common/src/util/ordered/mod.rs b/src/common/src/util/ordered/mod.rs
index 08e10965fda58..394ceee2fe318 100644
--- a/src/common/src/util/ordered/mod.rs
+++ b/src/common/src/util/ordered/mod.rs
@@ -14,159 +14,4 @@
 
 mod serde;
 
-use std::cmp::Reverse;
-
-use OrderedDatum::{NormalOrder, ReversedOrder};
-
 pub use self::serde::*;
-use super::iter_util::ZipEqFast;
-use super::sort_util::Direction;
-use crate::row::OwnedRow;
-use crate::types::{memcmp_serialize_datum_into, Datum};
-use crate::util::sort_util::OrderType;
-
-// TODO(rc): support `NULLS FIRST | LAST`
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd)]
-pub enum OrderedDatum {
-    NormalOrder(Datum),
-    ReversedOrder(Reverse<Datum>),
-}
-
-impl std::fmt::Debug for OrderedDatum {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            NormalOrder(d) => match d {
-                Some(s) => write!(f, "{:?}", s),
-                None => write!(f, "NULL"),
-            },
-            ReversedOrder(d) => match &d.0 {
-                Some(s) => write!(f, "{:?}", s),
-                None => write!(f, "NULL"),
-            },
-        }
-    }
-}
-
-/// `OrderedRow` is used for the pk in those states whose primary key contains several columns and
-/// requires comparison.
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd)]
-pub struct OrderedRow(Vec<OrderedDatum>);
-
-impl std::fmt::Debug for OrderedRow {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl OrderedRow {
-    pub fn new(row: OwnedRow, order_types: &[OrderType]) -> Self {
-        OrderedRow(
-            row.into_inner()
-                .into_iter()
-                .zip_eq_fast(order_types.iter())
-                .map(|(datum, order_type)| match order_type.direction() {
-                    Direction::Ascending => NormalOrder(datum),
-                    Direction::Descending => ReversedOrder(Reverse(datum)),
-                })
-                .collect::<Vec<_>>(),
-        )
-    }
-
-    pub fn into_vec(self) -> Vec<Datum> {
-        self.0
-            .into_iter()
-            .map(|ordered_datum| match ordered_datum {
-                NormalOrder(datum) => datum,
-                ReversedOrder(datum) => datum.0,
-            })
-            .collect::<Vec<_>>()
-    }
-
-    pub fn into_row(self) -> OwnedRow {
-        OwnedRow::new(self.into_vec())
-    }
-
-    /// Serialize the row into a memcomparable bytes.
-    ///
-    /// All values are nullable. Each value will have 1 extra byte to indicate whether it is null.
-    pub fn serialize(&self) -> Result<Vec<u8>, memcomparable::Error> {
-        let mut serializer = memcomparable::Serializer::new(vec![]);
-        for v in &self.0 {
-            let datum = match v {
-                NormalOrder(datum) => {
-                    serializer.set_reverse(false);
-                    datum
-                }
-                ReversedOrder(datum) => {
-                    serializer.set_reverse(true);
-                    &datum.0
-                }
-            };
-            memcmp_serialize_datum_into(datum, &mut serializer)?;
-        }
-        Ok(serializer.into_inner())
-    }
-
-    pub fn reverse_serialize(&self) -> Result<Vec<u8>, memcomparable::Error> {
-        let mut res = self.serialize()?;
-        res.iter_mut().for_each(|byte| *byte = !*byte);
-        Ok(res)
-    }
-
-    pub fn prefix(&self, n: usize) -> Self {
-        assert!(n <= self.0.len());
-        OrderedRow(self.0[..n].to_vec())
-    }
-
-    pub fn starts_with(&self, other: &Self) -> bool {
-        self.0.starts_with(&other.0)
-    }
-
-    pub fn skip(&self, n: usize) -> Self {
-        assert!(n < self.0.len());
-        OrderedRow(self.0[n..].to_vec())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::types::ScalarImpl;
-
-    fn make_row(values: Vec<i64>) -> OrderedRow {
-        let row = OwnedRow::new(
-            values
-                .into_iter()
-                .map(|v| Some(ScalarImpl::Int64(v)))
-                .collect(),
-        );
-        OrderedRow::new(row, ORDER_TYPES)
-    }
-
-    const ORDER_TYPES: &[OrderType] = &[
-        OrderType::ascending(),
-        OrderType::descending(),
-        OrderType::ascending(),
-    ];
-
-    #[test]
-    fn test_prefix() {
-        let row = make_row(vec![1, 2, 3]);
-
-        assert!(row.prefix(0) < row.prefix(1));
-        assert!(row.prefix(1) < row.prefix(2));
-        assert!(row.prefix(2) < row.prefix(3));
-        assert_eq!(row.prefix(3), row);
-
-        let row2 = make_row(vec![1, 3, 3]);
-        assert!(row.prefix(1) < row2);
-        assert!(row.prefix(2) > row2);
-    }
-
-    #[should_panic]
-    #[test]
-    fn test_prefix_panic() {
-        let row = make_row(vec![1, 2, 3]);
-        row.prefix(4);
-    }
-}
diff --git a/src/common/src/util/ordered/serde.rs b/src/common/src/util/ordered/serde.rs
index 2cff721756f41..47fa19e098b70 100644
--- a/src/common/src/util/ordered/serde.rs
+++ b/src/common/src/util/ordered/serde.rs
@@ -17,11 +17,10 @@ use std::borrow::Cow;
 use bytes::BufMut;
 
 use crate::row::{OwnedRow, Row};
-use crate::types::{
-    memcmp_deserialize_datum_from, memcmp_serialize_datum_into, DataType, ToDatumRef,
-};
+use crate::types::{DataType, ToDatumRef};
 use crate::util::iter_util::{ZipEqDebug, ZipEqFast};
-use crate::util::sort_util::{Direction, OrderType};
+use crate::util::memcmp_encoding;
+use crate::util::sort_util::OrderType;
 
 /// `OrderedRowSerde` is responsible for serializing and deserializing Ordered Row.
 #[derive(Clone)]
@@ -64,19 +63,21 @@ impl OrderedRowSerde {
         datum_refs: impl Iterator<Item = impl ToDatumRef>,
         mut append_to: impl BufMut,
     ) {
-        for (datum, order_type) in datum_refs.zip_eq_debug(self.order_types.iter()) {
-            let mut serializer = memcomparable::Serializer::new(&mut append_to);
-            serializer.set_reverse(order_type.direction() == Direction::Descending);
-            memcmp_serialize_datum_into(datum, &mut serializer).unwrap();
+        let mut serializer = memcomparable::Serializer::new(&mut append_to);
+        for (datum, order) in datum_refs.zip_eq_debug(self.order_types.iter().copied()) {
+            memcmp_encoding::serialize_datum(datum, order, &mut serializer).unwrap();
         }
     }
 
     pub fn deserialize(&self, data: &[u8]) -> memcomparable::Result<OwnedRow> {
         let mut values = Vec::with_capacity(self.schema.len());
         let mut deserializer = memcomparable::Deserializer::new(data);
-        for (data_type, order_type) in self.schema.iter().zip_eq_fast(self.order_types.iter()) {
-            deserializer.set_reverse(order_type.direction() == Direction::Descending);
-            let datum = memcmp_deserialize_datum_from(data_type, &mut deserializer)?;
+        for (data_type, order) in self
+            .schema
+            .iter()
+            .zip_eq_fast(self.order_types.iter().copied())
+        {
+            let datum = memcmp_encoding::deserialize_datum(data_type, order, &mut deserializer)?;
             values.push(datum);
         }
         Ok(OwnedRow::new(values))
@@ -95,18 +96,13 @@ impl OrderedRowSerde {
         key: &[u8],
         prefix_len: usize,
     ) -> memcomparable::Result<usize> {
-        use crate::types::ScalarImpl;
         let mut len: usize = 0;
         for index in 0..prefix_len {
             let data_type = &self.schema[index];
-            let order_type = &self.order_types[index];
             let data = &key[len..];
-            let mut deserializer = memcomparable::Deserializer::new(data);
-            deserializer.set_reverse(order_type.direction() == Direction::Descending);
-
-            len += ScalarImpl::encoding_data_size(data_type, &mut deserializer)?;
+            len +=
+                memcmp_encoding::calculate_encoded_size(data_type, self.order_types[index], data)?;
         }
-
         Ok(len)
     }
 }
@@ -116,9 +112,8 @@ mod tests {
     use std::str::FromStr;
 
     use super::*;
-    use crate::types::chrono_wrapper::*;
-    use crate::types::interval;
-    use crate::types::ScalarImpl::{self, *};
+    use crate::types::ScalarImpl::*;
+    use crate::types::{chrono_wrapper, interval};
 
     #[test]
     fn test_ordered_row_serializer() {
@@ -145,7 +140,7 @@ mod tests {
     #[test]
     fn test_ordered_row_deserializer() {
         pub use crate::types::decimal::Decimal;
-        use crate::types::ScalarImpl::{self, *};
+        use crate::types::*;
         {
             // basic
             let order_types = vec![OrderType::descending(), OrderType::ascending()];
@@ -174,17 +169,14 @@ mod tests {
 
             let schema = vec![DataType::Varchar, DataType::Decimal];
             let serde = OrderedRowSerde::new(schema, order_types);
-            let row1 = OwnedRow::new(vec![
-                Some(Utf8("abc".into())),
-                Some(ScalarImpl::Decimal(Decimal::NaN)),
-            ]);
+            let row1 = OwnedRow::new(vec![Some(Utf8("abc".into())), Some(Decimal(Decimal::NaN))]);
             let row2 = OwnedRow::new(vec![
                 Some(Utf8("abd".into())),
-                Some(ScalarImpl::Decimal(Decimal::PositiveInf)),
+                Some(Decimal(Decimal::PositiveInf)),
             ]);
             let row3 = OwnedRow::new(vec![
                 Some(Utf8("abc".into())),
-                Some(ScalarImpl::Decimal(Decimal::NegativeInf)),
+                Some(Decimal(Decimal::NegativeInf)),
             ]);
             let rows = vec![row1.clone(), row2.clone(), row3.clone()];
             let mut array = vec![];
@@ -242,12 +234,12 @@ mod tests {
     fn test_encoding_data_size() {
         use std::mem::size_of;
 
-        use crate::types::interval::IntervalUnit;
-        use crate::types::OrderedF64;
+        use crate::types::interval::Interval;
+        use crate::types::F64;
 
         let order_types = vec![OrderType::ascending()];
         let schema = vec![DataType::Int16];
-        let serde = OrderedRowSerde::new(schema, order_types);
+        let serde = OrderedRowSerde::new(schema, order_types.clone());
 
         // test fixed_size
         {
@@ -256,33 +248,42 @@ mod tests {
                 let row = OwnedRow::new(vec![None]);
                 let mut row_bytes = vec![];
                 serde.serialize(&row, &mut row_bytes);
-                let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                let encoding_data_size =
-                    ScalarImpl::encoding_data_size(&DataType::Int16, &mut deserializer).unwrap();
+                let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                    &DataType::Int16,
+                    order_types[0],
+                    &row_bytes[..],
+                )
+                .unwrap();
                 assert_eq!(1, encoding_data_size);
             }
 
             {
                 // float64
-                let row = OwnedRow::new(vec![Some(ScalarImpl::Float64(6.4.into()))]);
+                let row = OwnedRow::new(vec![Some(Float64(6.4.into()))]);
                 let mut row_bytes = vec![];
                 serde.serialize(&row, &mut row_bytes);
-                let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                let encoding_data_size =
-                    ScalarImpl::encoding_data_size(&DataType::Float64, &mut deserializer).unwrap();
-                let data_size = size_of::<OrderedF64>();
+                let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                    &DataType::Float64,
+                    order_types[0],
+                    &row_bytes[..],
+                )
+                .unwrap();
+                let data_size = size_of::<F64>();
                 assert_eq!(8, data_size);
                 assert_eq!(1 + data_size, encoding_data_size);
             }
 
             {
                 // bool
-                let row = OwnedRow::new(vec![Some(ScalarImpl::Bool(false))]);
+                let row = OwnedRow::new(vec![Some(Bool(false))]);
                 let mut row_bytes = vec![];
                 serde.serialize(&row, &mut row_bytes);
-                let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                let encoding_data_size =
-                    ScalarImpl::encoding_data_size(&DataType::Boolean, &mut deserializer).unwrap();
+                let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                    &DataType::Boolean,
+                    order_types[0],
+                    &row_bytes[..],
+                )
+                .unwrap();
 
                 let data_size = size_of::<u8>();
                 assert_eq!(1, data_size);
@@ -291,29 +292,31 @@ mod tests {
 
             {
                 // ts
-                let row = OwnedRow::new(vec![Some(ScalarImpl::NaiveDateTime(
-                    NaiveDateTimeWrapper::default(),
-                ))]);
+                let row = OwnedRow::new(vec![Some(Timestamp(Default::default()))]);
                 let mut row_bytes = vec![];
                 serde.serialize(&row, &mut row_bytes);
-                let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                let encoding_data_size =
-                    ScalarImpl::encoding_data_size(&DataType::Timestamp, &mut deserializer)
-                        .unwrap();
-                let data_size = size_of::<NaiveDateTimeWrapper>();
+                let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                    &DataType::Timestamp,
+                    order_types[0],
+                    &row_bytes[..],
+                )
+                .unwrap();
+                let data_size = size_of::<chrono_wrapper::Timestamp>();
                 assert_eq!(12, data_size);
                 assert_eq!(1 + data_size, encoding_data_size);
             }
 
             {
                 // tz
-                let row = OwnedRow::new(vec![Some(ScalarImpl::Int64(1111111111))]);
+                let row = OwnedRow::new(vec![Some(Int64(1111111111))]);
                 let mut row_bytes = vec![];
                 serde.serialize(&row, &mut row_bytes);
-                let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                let encoding_data_size =
-                    ScalarImpl::encoding_data_size(&DataType::Timestamptz, &mut deserializer)
-                        .unwrap();
+                let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                    &DataType::Timestamptz,
+                    order_types[0],
+                    &row_bytes[..],
+                )
+                .unwrap();
                 let data_size = size_of::<i64>();
                 assert_eq!(8, data_size);
                 assert_eq!(1 + data_size, encoding_data_size);
@@ -321,15 +324,16 @@ mod tests {
 
             {
                 // interval
-                let row = OwnedRow::new(vec![Some(ScalarImpl::Interval(
-                    interval::IntervalUnit::default(),
-                ))]);
+                let row = OwnedRow::new(vec![Some(Interval(interval::Interval::default()))]);
                 let mut row_bytes = vec![];
                 serde.serialize(&row, &mut row_bytes);
-                let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                let encoding_data_size =
-                    ScalarImpl::encoding_data_size(&DataType::Interval, &mut deserializer).unwrap();
-                let data_size = size_of::<IntervalUnit>();
+                let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                    &DataType::Interval,
+                    order_types[0],
+                    &row_bytes[..],
+                )
+                .unwrap();
+                let data_size = size_of::<Interval>();
                 assert_eq!(16, data_size);
                 assert_eq!(1 + data_size, encoding_data_size);
             }
@@ -343,52 +347,60 @@ mod tests {
 
                 {
                     let d = Decimal::from_str("41721.900909090909090909090909").unwrap();
-                    let row = OwnedRow::new(vec![Some(ScalarImpl::Decimal(d))]);
+                    let row = OwnedRow::new(vec![Some(Decimal(d))]);
                     let mut row_bytes = vec![];
                     serde.serialize(&row, &mut row_bytes);
-                    let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                    let encoding_data_size =
-                        ScalarImpl::encoding_data_size(&DataType::Decimal, &mut deserializer)
-                            .unwrap();
+                    let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                        &DataType::Decimal,
+                        order_types[0],
+                        &row_bytes[..],
+                    )
+                    .unwrap();
                     // [nulltag, flag, decimal_chunk]
                     assert_eq!(17, encoding_data_size);
                 }
 
                 {
                     let d = Decimal::from_str("1").unwrap();
-                    let row = OwnedRow::new(vec![Some(ScalarImpl::Decimal(d))]);
+                    let row = OwnedRow::new(vec![Some(Decimal(d))]);
                     let mut row_bytes = vec![];
                     serde.serialize(&row, &mut row_bytes);
-                    let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                    let encoding_data_size =
-                        ScalarImpl::encoding_data_size(&DataType::Decimal, &mut deserializer)
-                            .unwrap();
+                    let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                        &DataType::Decimal,
+                        order_types[0],
+                        &row_bytes[..],
+                    )
+                    .unwrap();
                     // [nulltag, flag, decimal_chunk]
                     assert_eq!(3, encoding_data_size);
                 }
 
                 {
                     let d = Decimal::from_str("inf").unwrap();
-                    let row = OwnedRow::new(vec![Some(ScalarImpl::Decimal(d))]);
+                    let row = OwnedRow::new(vec![Some(Decimal(d))]);
                     let mut row_bytes = vec![];
                     serde.serialize(&row, &mut row_bytes);
-                    let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                    let encoding_data_size =
-                        ScalarImpl::encoding_data_size(&DataType::Decimal, &mut deserializer)
-                            .unwrap();
+                    let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                        &DataType::Decimal,
+                        order_types[0],
+                        &row_bytes[..],
+                    )
+                    .unwrap();
 
                     assert_eq!(2, encoding_data_size); // [1, 35]
                 }
 
                 {
                     let d = Decimal::from_str("nan").unwrap();
-                    let row = OwnedRow::new(vec![Some(ScalarImpl::Decimal(d))]);
+                    let row = OwnedRow::new(vec![Some(Decimal(d))]);
                     let mut row_bytes = vec![];
                     serde.serialize(&row, &mut row_bytes);
-                    let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                    let encoding_data_size =
-                        ScalarImpl::encoding_data_size(&DataType::Decimal, &mut deserializer)
-                            .unwrap();
+                    let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                        &DataType::Decimal,
+                        order_types[0],
+                        &row_bytes[..],
+                    )
+                    .unwrap();
                     assert_eq!(2, encoding_data_size); // [1, 6]
                 }
 
@@ -402,10 +414,12 @@ mod tests {
                     let row = OwnedRow::new(vec![Some(Utf8(varchar.into()))]);
                     let mut row_bytes = vec![];
                     serde.serialize(&row, &mut row_bytes);
-                    let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                    let encoding_data_size =
-                        ScalarImpl::encoding_data_size(&DataType::Varchar, &mut deserializer)
-                            .unwrap();
+                    let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                        &DataType::Varchar,
+                        order_types[0],
+                        &row_bytes[..],
+                    )
+                    .unwrap();
                     // [1, 1, 97, 98, 99, 100, 101, 102, 103, 104, 9, 105, 106, 107, 108, 109, 110,
                     // 0, 0, 6]
                     assert_eq!(6 + varchar.len(), encoding_data_size);
@@ -416,16 +430,17 @@ mod tests {
                         // test varchar Descending
                         let order_types = vec![OrderType::descending()];
                         let schema = vec![DataType::Varchar];
-                        let serde = OrderedRowSerde::new(schema, order_types);
+                        let serde = OrderedRowSerde::new(schema, order_types.clone());
                         let varchar = "abcdefghijklmnopq";
                         let row = OwnedRow::new(vec![Some(Utf8(varchar.into()))]);
                         let mut row_bytes = vec![];
                         serde.serialize(&row, &mut row_bytes);
-                        let mut deserializer = memcomparable::Deserializer::new(&row_bytes[..]);
-                        deserializer.set_reverse(true);
-                        let encoding_data_size =
-                            ScalarImpl::encoding_data_size(&DataType::Varchar, &mut deserializer)
-                                .unwrap();
+                        let encoding_data_size = memcmp_encoding::calculate_encoded_size(
+                            &DataType::Varchar,
+                            order_types[0],
+                            &row_bytes[..],
+                        )
+                        .unwrap();
 
                         // [254, 254, 158, 157, 156, 155, 154, 153, 152, 151, 246, 150, 149, 148,
                         // 147, 146, 145, 144, 143, 246, 142, 255, 255, 255, 255, 255, 255, 255,
diff --git a/src/common/src/util/row_id.rs b/src/common/src/util/row_id.rs
index f3cdc7f5bb62f..10c1d4f9ac18b 100644
--- a/src/common/src/util/row_id.rs
+++ b/src/common/src/util/row_id.rs
@@ -14,6 +14,8 @@
 
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
+use crate::hash::VirtualNode;
+
 const TIMESTAMP_SHIFT_BITS: u8 = 22;
 const VNODE_ID_SHIFT_BITS: u8 = 12;
 const SEQUENCE_UPPER_BOUND: u16 = 1 << 12;
@@ -40,6 +42,13 @@ pub struct RowIdGenerator {
 
 pub type RowId = i64;
 
+#[inline]
+pub fn extract_vnode_id_from_row_id(id: RowId) -> VirtualNode {
+    let vnode_id = ((id >> VNODE_ID_SHIFT_BITS) & (VNODE_ID_UPPER_BOUND as i64 - 1)) as u32;
+    assert!(vnode_id < VNODE_ID_UPPER_BOUND);
+    VirtualNode::from_index(vnode_id as usize)
+}
+
 impl RowIdGenerator {
     pub fn new(vnode_id: u32) -> Self {
         assert!(vnode_id < VNODE_ID_UPPER_BOUND);
diff --git a/src/common/src/util/scan_range.rs b/src/common/src/util/scan_range.rs
index 831d494836287..02e534bc85833 100644
--- a/src/common/src/util/scan_range.rs
+++ b/src/common/src/util/scan_range.rs
@@ -15,31 +15,29 @@
 use std::ops::{Bound, RangeBounds};
 
 use paste::paste;
-use risingwave_pb::batch_plan::scan_range::Bound as BoundProst;
-use risingwave_pb::batch_plan::ScanRange as ScanRangeProst;
+use risingwave_pb::batch_plan::scan_range::Bound as BoundPb;
+use risingwave_pb::batch_plan::ScanRange as ScanRangePb;
 
 use super::value_encoding::serialize_datum;
 use crate::catalog::get_dist_key_in_pk_indices;
 use crate::hash::VirtualNode;
-use crate::row::{Row, RowExt};
 use crate::types::{Datum, ScalarImpl};
-use crate::util::hash_util::Crc32FastBuilder;
 use crate::util::value_encoding::serialize_datum_into;
 
-/// See also [`ScanRangeProst`]
+/// See also [`ScanRangePb`]
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ScanRange {
     pub eq_conds: Vec<Datum>,
     pub range: (Bound<ScalarImpl>, Bound<ScalarImpl>),
 }
 
-fn bound_to_proto(bound: &Bound<ScalarImpl>) -> Option<BoundProst> {
+fn bound_to_proto(bound: &Bound<ScalarImpl>) -> Option<BoundPb> {
     match bound {
-        Bound::Included(literal) => Some(BoundProst {
+        Bound::Included(literal) => Some(BoundPb {
             value: serialize_datum(Some(literal)),
             inclusive: true,
         }),
-        Bound::Excluded(literal) => Some(BoundProst {
+        Bound::Excluded(literal) => Some(BoundPb {
             value: serialize_datum(Some(literal)),
             inclusive: false,
         }),
@@ -48,8 +46,8 @@ fn bound_to_proto(bound: &Bound<ScalarImpl>) -> Option<BoundProst> {
 }
 
 impl ScanRange {
-    pub fn to_protobuf(&self) -> ScanRangeProst {
-        ScanRangeProst {
+    pub fn to_protobuf(&self) -> ScanRangePb {
+        ScanRangePb {
             eq_conds: self
                 .eq_conds
                 .iter()
@@ -95,16 +93,20 @@ impl ScanRange {
         }
 
         let dist_key_in_pk_indices = get_dist_key_in_pk_indices(dist_key_indices, pk_indices);
+        self.try_compute_vnode_with_dist_key_in_pk_indices(&dist_key_in_pk_indices)
+    }
+
+    pub fn try_compute_vnode_with_dist_key_in_pk_indices(
+        &self,
+        dist_key_in_pk_indices: &[usize],
+    ) -> Option<VirtualNode> {
         let pk_prefix_len = self.eq_conds.len();
         if dist_key_in_pk_indices.iter().any(|&i| i >= pk_prefix_len) {
             return None;
         }
 
-        let pk_prefix_value = &self.eq_conds;
-        let vnode = pk_prefix_value
-            .project(&dist_key_in_pk_indices)
-            .hash(Crc32FastBuilder)
-            .to_vnode();
+        let pk_prefix_value: &[_] = &self.eq_conds;
+        let vnode = VirtualNode::compute_row(pk_prefix_value, dist_key_in_pk_indices);
         Some(vnode)
     }
 }
@@ -186,13 +188,13 @@ mod tests {
         assert!(scan_range.try_compute_vnode(&dist_key, &pk).is_none());
 
         scan_range.eq_conds.push(Some(ScalarImpl::from(514)));
-        let vnode = OwnedRow::new(vec![
+        let row = OwnedRow::new(vec![
             Some(ScalarImpl::from(114)),
             Some(ScalarImpl::from(514)),
-        ])
-        .project(&[0, 1])
-        .hash(Crc32FastBuilder)
-        .to_vnode();
+        ]);
+
+        let vnode = VirtualNode::compute_row(&row, &[0, 1]);
+
         assert_eq!(scan_range.try_compute_vnode(&dist_key, &pk), Some(vnode));
     }
 
@@ -212,14 +214,14 @@ mod tests {
         assert!(scan_range.try_compute_vnode(&dist_key, &pk).is_none());
 
         scan_range.eq_conds.push(Some(ScalarImpl::from(114514)));
-        let vnode = OwnedRow::new(vec![
+        let row = OwnedRow::new(vec![
             Some(ScalarImpl::from(114)),
             Some(ScalarImpl::from(514)),
             Some(ScalarImpl::from(114514)),
-        ])
-        .project(&[2, 1])
-        .hash(Crc32FastBuilder)
-        .to_vnode();
+        ]);
+
+        let vnode = VirtualNode::compute_row(&row, &[2, 1]);
+
         assert_eq!(scan_range.try_compute_vnode(&dist_key, &pk), Some(vnode));
     }
 }
diff --git a/src/common/src/util/sort_util.rs b/src/common/src/util/sort_util.rs
index 65bae034a26b7..401b9037d87cb 100644
--- a/src/common/src/util/sort_util.rs
+++ b/src/common/src/util/sort_util.rs
@@ -17,17 +17,17 @@ use std::fmt;
 use std::sync::Arc;
 
 use parse_display::Display;
-use risingwave_pb::common::{PbColumnOrder, PbDirection, PbOrderType};
+use risingwave_pb::common::{PbColumnOrder, PbDirection, PbNullsAre, PbOrderType};
 
 use crate::array::{Array, ArrayImpl, DataChunk};
 use crate::catalog::{FieldDisplay, Schema};
 use crate::error::ErrorCode::InternalError;
 use crate::error::Result;
+use crate::types::ToDatumRef;
 
-// TODO(rc): to support `NULLS FIRST | LAST`, we may need to hide this enum, forcing developers use
-// `OrderType` instead.
+/// Sort direction, ascending/descending.
 #[derive(PartialEq, Eq, Hash, Copy, Clone, Debug, Display, Default)]
-pub enum Direction {
+enum Direction {
     #[default]
     #[display("ASC")]
     Ascending,
@@ -36,25 +36,25 @@ pub enum Direction {
 }
 
 impl Direction {
-    pub fn from_protobuf(order_type: &PbDirection) -> Direction {
-        match order_type {
-            PbDirection::Ascending => Direction::Ascending,
-            PbDirection::Descending => Direction::Descending,
+    pub fn from_protobuf(direction: &PbDirection) -> Self {
+        match direction {
+            PbDirection::Ascending => Self::Ascending,
+            PbDirection::Descending => Self::Descending,
             PbDirection::Unspecified => unreachable!(),
         }
     }
 
     pub fn to_protobuf(self) -> PbDirection {
         match self {
-            Direction::Ascending => PbDirection::Ascending,
-            Direction::Descending => PbDirection::Descending,
+            Self::Ascending => PbDirection::Ascending,
+            Self::Descending => PbDirection::Descending,
         }
     }
 }
 
-#[allow(dead_code)]
+/// Nulls are largest/smallest.
 #[derive(PartialEq, Eq, Hash, Copy, Clone, Debug, Display, Default)]
-pub enum NullsAre {
+enum NullsAre {
     #[default]
     #[display("LARGEST")]
     Largest,
@@ -62,55 +62,159 @@ pub enum NullsAre {
     Smallest,
 }
 
+impl NullsAre {
+    pub fn from_protobuf(nulls_are: &PbNullsAre) -> Self {
+        match nulls_are {
+            PbNullsAre::Largest => Self::Largest,
+            PbNullsAre::Smallest => Self::Smallest,
+            PbNullsAre::Unspecified => unreachable!(),
+        }
+    }
+
+    pub fn to_protobuf(self) -> PbNullsAre {
+        match self {
+            Self::Largest => PbNullsAre::Largest,
+            Self::Smallest => PbNullsAre::Smallest,
+        }
+    }
+}
+
+/// Order type of a column.
 #[derive(PartialEq, Eq, Hash, Copy, Clone, Debug, Default)]
 pub struct OrderType {
     direction: Direction,
-    // TODO(rc): enable `NULLS FIRST | LAST`
-    // nulls_are: NullsAre,
+    nulls_are: NullsAre,
 }
 
 impl OrderType {
     pub fn from_protobuf(order_type: &PbOrderType) -> OrderType {
         OrderType {
             direction: Direction::from_protobuf(&order_type.direction()),
+            nulls_are: NullsAre::from_protobuf(&order_type.nulls_are()),
         }
     }
 
     pub fn to_protobuf(self) -> PbOrderType {
         PbOrderType {
             direction: self.direction.to_protobuf() as _,
+            nulls_are: self.nulls_are.to_protobuf() as _,
         }
     }
 }
 
 impl OrderType {
-    pub const fn new(direction: Direction) -> Self {
-        Self { direction }
+    fn new(direction: Direction, nulls_are: NullsAre) -> Self {
+        Self {
+            direction,
+            nulls_are,
+        }
+    }
+
+    fn nulls_first(direction: Direction) -> Self {
+        match direction {
+            Direction::Ascending => Self::new(direction, NullsAre::Smallest),
+            Direction::Descending => Self::new(direction, NullsAre::Largest),
+        }
+    }
+
+    fn nulls_last(direction: Direction) -> Self {
+        match direction {
+            Direction::Ascending => Self::new(direction, NullsAre::Largest),
+            Direction::Descending => Self::new(direction, NullsAre::Smallest),
+        }
     }
 
-    /// Create an ascending order type, with other options set to default.
-    pub const fn ascending() -> Self {
+    pub fn from_bools(asc: Option<bool>, nulls_first: Option<bool>) -> Self {
+        let direction = match asc {
+            None => Direction::default(),
+            Some(true) => Direction::Ascending,
+            Some(false) => Direction::Descending,
+        };
+        match nulls_first {
+            None => Self::new(direction, NullsAre::default()),
+            Some(true) => Self::nulls_first(direction),
+            Some(false) => Self::nulls_last(direction),
+        }
+    }
+
+    // TODO(rc): Many places that call `ascending` should've call `default`.
+    /// Create an `ASC` order type.
+    pub fn ascending() -> Self {
         Self {
             direction: Direction::Ascending,
+            nulls_are: NullsAre::default(),
         }
     }
 
-    /// Create an descending order type, with other options set to default.
-    pub const fn descending() -> Self {
+    /// Create a `DESC` order type.
+    pub fn descending() -> Self {
         Self {
             direction: Direction::Descending,
+            nulls_are: NullsAre::default(),
         }
     }
 
-    /// Get the order direction.
-    pub fn direction(&self) -> Direction {
-        self.direction
+    /// Create an `ASC NULLS FIRST` order type.
+    pub fn ascending_nulls_first() -> Self {
+        Self::nulls_first(Direction::Ascending)
+    }
+
+    /// Create an `ASC NULLS LAST` order type.
+    pub fn ascending_nulls_last() -> Self {
+        Self::nulls_last(Direction::Ascending)
+    }
+
+    /// Create a `DESC NULLS FIRST` order type.
+    pub fn descending_nulls_first() -> Self {
+        Self::nulls_first(Direction::Descending)
+    }
+
+    /// Create a `DESC NULLS LAST` order type.
+    pub fn descending_nulls_last() -> Self {
+        Self::nulls_last(Direction::Descending)
+    }
+
+    pub fn is_ascending(&self) -> bool {
+        self.direction == Direction::Ascending
+    }
+
+    pub fn is_descending(&self) -> bool {
+        self.direction == Direction::Descending
+    }
+
+    pub fn nulls_are_largest(&self) -> bool {
+        self.nulls_are == NullsAre::Largest
+    }
+
+    pub fn nulls_are_smallest(&self) -> bool {
+        self.nulls_are == NullsAre::Smallest
+    }
+
+    pub fn nulls_are_first(&self) -> bool {
+        self.is_ascending() && self.nulls_are_smallest()
+            || self.is_descending() && self.nulls_are_largest()
+    }
+
+    pub fn nulls_are_last(&self) -> bool {
+        !self.nulls_are_first()
     }
 }
 
 impl fmt::Display for OrderType {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.direction)
+        write!(f, "{}", self.direction)?;
+        if self.nulls_are != NullsAre::default() {
+            write!(
+                f,
+                " NULLS {}",
+                if self.nulls_are_first() {
+                    "FIRST"
+                } else {
+                    "LAST"
+                }
+            )?;
+        }
+        Ok(())
     }
 }
 
@@ -232,18 +336,19 @@ impl PartialEq for HeapElem {
 
 impl Eq for HeapElem {}
 
-fn compare_values<T>(lhs: Option<&T>, rhs: Option<&T>, order_type: &OrderType) -> Ordering
+fn compare_values<T>(lhs: Option<&T>, rhs: Option<&T>, order_type: OrderType) -> Ordering
 where
     T: Ord,
 {
-    let ord = match (lhs, rhs) {
-        (Some(l), Some(r)) => l.cmp(r),
-        (None, None) => Ordering::Equal,
-        // TODO(yuchao): `null first` / `null last` is not supported yet.
-        (Some(_), None) => Ordering::Less,
-        (None, Some(_)) => Ordering::Greater,
+    let ord = match (lhs, rhs, order_type.nulls_are) {
+        (Some(l), Some(r), _) => l.cmp(r),
+        (None, None, _) => Ordering::Equal,
+        (Some(_), None, NullsAre::Largest) => Ordering::Less,
+        (Some(_), None, NullsAre::Smallest) => Ordering::Greater,
+        (None, Some(_), NullsAre::Largest) => Ordering::Greater,
+        (None, Some(_), NullsAre::Smallest) => Ordering::Less,
     };
-    if order_type.direction == Direction::Descending {
+    if order_type.is_descending() {
         ord.reverse()
     } else {
         ord
@@ -255,7 +360,7 @@ fn compare_values_in_array<'a, T>(
     lhs_idx: usize,
     rhs_array: &'a T,
     rhs_idx: usize,
-    order_type: &'a OrderType,
+    order_type: OrderType,
 ) -> Ordering
 where
     T: Array,
@@ -281,7 +386,7 @@ pub fn compare_rows_in_chunk(
         macro_rules! gen_match {
             ( $( { $variant_name:ident, $suffix_name:ident, $array:ty, $builder:ty } ),*) => {
                 match (lhs_array.as_ref(), rhs_array.as_ref()) {
-                    $((ArrayImpl::$variant_name(lhs_inner), ArrayImpl::$variant_name(rhs_inner)) => Ok(compare_values_in_array(lhs_inner, lhs_idx, rhs_inner, rhs_idx, &column_order.order_type)),)*
+                    $((ArrayImpl::$variant_name(lhs_inner), ArrayImpl::$variant_name(rhs_inner)) => Ok(compare_values_in_array(lhs_inner, lhs_idx, rhs_inner, rhs_idx, column_order.order_type)),)*
                     (l_arr, r_arr) => Err(InternalError(format!("Unmatched array types, lhs array is: {}, rhs array is: {}", l_arr.get_ident(), r_arr.get_ident()))),
                 }?
             }
@@ -294,17 +399,67 @@ pub fn compare_rows_in_chunk(
     Ok(Ordering::Equal)
 }
 
+/// Compare two `Datum`s with specified order type.
+pub fn compare_datum(
+    lhs: impl ToDatumRef,
+    rhs: impl ToDatumRef,
+    order_type: OrderType,
+) -> Ordering {
+    compare_values(
+        lhs.to_datum_ref().as_ref(),
+        rhs.to_datum_ref().as_ref(),
+        order_type,
+    )
+}
+
 #[cfg(test)]
 mod tests {
     use std::cmp::Ordering;
 
     use itertools::Itertools;
 
-    use super::{ColumnOrder, OrderType};
+    use super::*;
     use crate::array::{DataChunk, ListValue, StructValue};
     use crate::row::{OwnedRow, Row};
-    use crate::types::{DataType, ScalarImpl};
-    use crate::util::sort_util::compare_rows_in_chunk;
+    use crate::types::{DataType, Datum, ScalarImpl};
+
+    #[test]
+    fn test_order_type() {
+        assert_eq!(OrderType::default(), OrderType::ascending());
+        assert_eq!(
+            OrderType::default(),
+            OrderType::new(Direction::Ascending, NullsAre::Largest)
+        );
+        assert_eq!(
+            OrderType::default(),
+            OrderType::from_bools(Some(true), Some(false))
+        );
+        assert_eq!(OrderType::default(), OrderType::from_bools(None, None));
+
+        assert!(OrderType::ascending().is_ascending());
+        assert!(OrderType::ascending().nulls_are_largest());
+        assert!(OrderType::ascending().nulls_are_last());
+
+        assert!(OrderType::descending().is_descending());
+        assert!(OrderType::descending().nulls_are_largest());
+        assert!(OrderType::descending().nulls_are_first());
+
+        assert!(OrderType::ascending_nulls_first().is_ascending());
+        assert!(OrderType::ascending_nulls_first().nulls_are_smallest());
+        assert!(OrderType::ascending_nulls_first().nulls_are_first());
+
+        assert!(OrderType::ascending_nulls_last().is_ascending());
+        assert!(OrderType::ascending_nulls_last().nulls_are_largest());
+        assert!(OrderType::ascending_nulls_last().nulls_are_last());
+
+        assert!(OrderType::descending_nulls_first().is_descending());
+        assert!(OrderType::descending_nulls_first().nulls_are_largest());
+        assert!(OrderType::descending_nulls_first().nulls_are_first());
+
+        assert!(OrderType::descending_nulls_last().is_descending());
+        assert!(OrderType::descending_nulls_last().nulls_are_smallest());
+        assert!(OrderType::descending_nulls_last().nulls_are_last());
+    }
 
     #[test]
     fn test_compare_rows_in_chunk() {
@@ -348,9 +503,9 @@ mod tests {
             Some(ScalarImpl::Bool(true)),
             Some(ScalarImpl::Decimal(10.into())),
             Some(ScalarImpl::Interval(Default::default())),
-            Some(ScalarImpl::NaiveDate(Default::default())),
-            Some(ScalarImpl::NaiveDateTime(Default::default())),
-            Some(ScalarImpl::NaiveTime(Default::default())),
+            Some(ScalarImpl::Date(Default::default())),
+            Some(ScalarImpl::Timestamp(Default::default())),
+            Some(ScalarImpl::Time(Default::default())),
             Some(ScalarImpl::Struct(StructValue::new(vec![
                 Some(ScalarImpl::Int32(1)),
                 Some(ScalarImpl::Float32(3.0.into())),
@@ -370,9 +525,9 @@ mod tests {
             Some(ScalarImpl::Bool(true)),
             Some(ScalarImpl::Decimal(10.into())),
             Some(ScalarImpl::Interval(Default::default())),
-            Some(ScalarImpl::NaiveDate(Default::default())),
-            Some(ScalarImpl::NaiveDateTime(Default::default())),
-            Some(ScalarImpl::NaiveTime(Default::default())),
+            Some(ScalarImpl::Date(Default::default())),
+            Some(ScalarImpl::Timestamp(Default::default())),
+            Some(ScalarImpl::Time(Default::default())),
             Some(ScalarImpl::Struct(StructValue::new(vec![
                 Some(ScalarImpl::Int32(1)),
                 Some(ScalarImpl::Float32(33333.0.into())), // larger than row1
@@ -417,4 +572,60 @@ mod tests {
             compare_rows_in_chunk(&chunk, 0, &chunk, 1, &column_orders).unwrap()
         );
     }
+
+    #[test]
+    fn test_compare_datum() {
+        assert_eq!(
+            Ordering::Equal,
+            compare_datum(
+                Some(ScalarImpl::from(42)),
+                Some(ScalarImpl::from(42)),
+                OrderType::default(),
+            )
+        );
+        assert_eq!(
+            Ordering::Equal,
+            compare_datum(None as Datum, None as Datum, OrderType::default(),)
+        );
+        assert_eq!(
+            Ordering::Less,
+            compare_datum(
+                Some(ScalarImpl::from(42)),
+                Some(ScalarImpl::from(100)),
+                OrderType::ascending(),
+            )
+        );
+        assert_eq!(
+            Ordering::Greater,
+            compare_datum(
+                Some(ScalarImpl::from(42)),
+                None as Datum,
+                OrderType::ascending_nulls_first(),
+            )
+        );
+        assert_eq!(
+            Ordering::Less,
+            compare_datum(
+                Some(ScalarImpl::from(42)),
+                None as Datum,
+                OrderType::ascending_nulls_last(),
+            )
+        );
+        assert_eq!(
+            Ordering::Greater,
+            compare_datum(
+                Some(ScalarImpl::from(42)),
+                None as Datum,
+                OrderType::descending_nulls_first(),
+            )
+        );
+        assert_eq!(
+            Ordering::Less,
+            compare_datum(
+                Some(ScalarImpl::from(42)),
+                None as Datum,
+                OrderType::descending_nulls_last(),
+            )
+        );
+    }
 }
diff --git a/src/common/src/util/value_encoding/column_aware_row_encoding.rs b/src/common/src/util/value_encoding/column_aware_row_encoding.rs
index 7507be331a26e..a425cb884259b 100644
--- a/src/common/src/util/value_encoding/column_aware_row_encoding.rs
+++ b/src/common/src/util/value_encoding/column_aware_row_encoding.rs
@@ -19,6 +19,8 @@
 //! We have a `Serializer` and a `Deserializer` for each schema of `Row`, which can be reused
 //! until schema changes
 
+#![expect(clippy::disallowed_methods, reason = "used by bitflags!")]
+
 use std::collections::BTreeMap;
 use std::sync::Arc;
 
@@ -38,6 +40,7 @@ use crate::row::Row;
 // }
 
 bitflags! {
+    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
     struct Flag: u8 {
         const EMPTY = 0b_1000_0000;
         const OFFSET8 = 0b01;
@@ -133,7 +136,7 @@ impl Serializer {
         let mut row_bytes = Vec::with_capacity(
             5 + self.encoded_column_ids.len() + encoding.offsets.len() + encoding.buf.len(), /* 5 comes from u8+u32 */
         );
-        row_bytes.put_u8(encoding.flag.bits);
+        row_bytes.put_u8(encoding.flag.bits());
         row_bytes.put_u32_le(self.datum_num);
         row_bytes.extend(&self.encoded_column_ids);
         row_bytes.extend(&encoding.offsets);
@@ -182,7 +185,7 @@ impl ValueRowDeserializer for Deserializer {
             Flag::OFFSET8 => 1,
             Flag::OFFSET16 => 2,
             Flag::OFFSET32 => 4,
-            _ => return Err(ValueEncodingError::InvalidFlag(flag.bits)),
+            _ => return Err(ValueEncodingError::InvalidFlag(flag.bits())),
         };
         let datum_num = encoded_bytes.get_u32_le() as usize;
         let offsets_start_idx = 4 * datum_num;
diff --git a/src/common/src/util/value_encoding/error.rs b/src/common/src/util/value_encoding/error.rs
index e4252b2f91aa9..3b235c4155706 100644
--- a/src/common/src/util/value_encoding/error.rs
+++ b/src/common/src/util/value_encoding/error.rs
@@ -20,12 +20,12 @@ pub enum ValueEncodingError {
     InvalidBoolEncoding(u8),
     #[error("Invalid UTF8 value encoding: {0}")]
     InvalidUtf8(#[from] std::string::FromUtf8Error),
-    #[error("Invalid NaiveDate value encoding: days: {0}")]
-    InvalidNaiveDateEncoding(i32),
-    #[error("invalid NaiveDateTime value encoding: secs: {0} nsecs: {1}")]
-    InvalidNaiveDateTimeEncoding(i64, u32),
-    #[error("invalid NaiveTime value encoding: secs: {0} nano: {1}")]
-    InvalidNaiveTimeEncoding(u32, u32),
+    #[error("Invalid Date value encoding: days: {0}")]
+    InvalidDateEncoding(i32),
+    #[error("invalid Timestamp value encoding: secs: {0} nsecs: {1}")]
+    InvalidTimestampEncoding(i64, u32),
+    #[error("invalid Time value encoding: secs: {0} nano: {1}")]
+    InvalidTimeEncoding(u32, u32),
     #[error("Invalid null tag value encoding: {0}")]
     InvalidTagEncoding(u8),
     #[error("Invalid jsonb encoding")]
diff --git a/src/common/src/util/value_encoding/mod.rs b/src/common/src/util/value_encoding/mod.rs
index b5a0cdb8494eb..fd4e5fd7cd4e6 100644
--- a/src/common/src/util/value_encoding/mod.rs
+++ b/src/common/src/util/value_encoding/mod.rs
@@ -29,8 +29,8 @@ use crate::catalog::ColumnId;
 use crate::row::{Row, RowDeserializer as BasicDeserializer};
 use crate::types::struct_type::StructType;
 use crate::types::{
-    DataType, Datum, Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper,
-    NaiveTimeWrapper, OrderedF32, OrderedF64, ScalarImpl, ScalarRefImpl, ToDatumRef,
+    DataType, Date, Datum, Decimal, Interval, ScalarImpl, ScalarRefImpl, Time, Timestamp,
+    ToDatumRef, F32, F64,
 };
 
 pub mod error;
@@ -183,6 +183,14 @@ pub fn serialize_datum_into(datum_ref: impl ToDatumRef, buf: &mut impl BufMut) {
     }
 }
 
+pub fn estimate_serialize_datum_size(datum_ref: impl ToDatumRef) -> usize {
+    if let Some(d) = datum_ref.to_datum_ref() {
+        1 + estimate_serialize_scalar_size(d)
+    } else {
+        1
+    }
+}
+
 /// Deserialize bytes into a datum (Not order guarantee, used in value encoding).
 pub fn deserialize_datum(mut data: impl Buf, ty: &DataType) -> Result<Datum> {
     inner_deserialize_datum(&mut data, ty)
@@ -212,12 +220,12 @@ fn serialize_scalar(value: ScalarRefImpl<'_>, buf: &mut impl BufMut) {
         ScalarRefImpl::Bool(v) => buf.put_u8(v as u8),
         ScalarRefImpl::Decimal(v) => serialize_decimal(&v, buf),
         ScalarRefImpl::Interval(v) => serialize_interval(&v, buf),
-        ScalarRefImpl::NaiveDate(v) => serialize_naivedate(v.0.num_days_from_ce(), buf),
-        ScalarRefImpl::NaiveDateTime(v) => {
-            serialize_naivedatetime(v.0.timestamp(), v.0.timestamp_subsec_nanos(), buf)
+        ScalarRefImpl::Date(v) => serialize_date(v.0.num_days_from_ce(), buf),
+        ScalarRefImpl::Timestamp(v) => {
+            serialize_timestamp(v.0.timestamp(), v.0.timestamp_subsec_nanos(), buf)
         }
-        ScalarRefImpl::NaiveTime(v) => {
-            serialize_naivetime(v.0.num_seconds_from_midnight(), v.0.nanosecond(), buf)
+        ScalarRefImpl::Time(v) => {
+            serialize_time(v.0.num_seconds_from_midnight(), v.0.nanosecond(), buf)
         }
         ScalarRefImpl::Jsonb(v) => serialize_str(&v.value_serialize(), buf),
         ScalarRefImpl::Struct(s) => serialize_struct(s, buf),
@@ -225,6 +233,28 @@ fn serialize_scalar(value: ScalarRefImpl<'_>, buf: &mut impl BufMut) {
     }
 }
 
+fn estimate_serialize_scalar_size(value: ScalarRefImpl<'_>) -> usize {
+    match value {
+        ScalarRefImpl::Int16(_) => 2,
+        ScalarRefImpl::Int32(_) => 4,
+        ScalarRefImpl::Int64(_) => 8,
+        ScalarRefImpl::Serial(_) => 8,
+        ScalarRefImpl::Float32(_) => 4,
+        ScalarRefImpl::Float64(_) => 8,
+        ScalarRefImpl::Utf8(v) => estimate_serialize_str_size(v.as_bytes()),
+        ScalarRefImpl::Bytea(v) => estimate_serialize_str_size(v),
+        ScalarRefImpl::Bool(_) => 1,
+        ScalarRefImpl::Decimal(_) => estimate_serialize_decimal_size(),
+        ScalarRefImpl::Interval(_) => estimate_serialize_interval_size(),
+        ScalarRefImpl::Date(_) => estimate_serialize_date_size(),
+        ScalarRefImpl::Timestamp(_) => estimate_serialize_timestamp_size(),
+        ScalarRefImpl::Time(_) => estimate_serialize_time_size(),
+        ScalarRefImpl::Jsonb(_) => 8,
+        ScalarRefImpl::Struct(s) => estimate_serialize_struct_size(s),
+        ScalarRefImpl::List(v) => estimate_serialize_list_size(v),
+    }
+}
+
 fn serialize_struct(value: StructRef<'_>, buf: &mut impl BufMut) {
     value
         .fields_ref()
@@ -235,6 +265,9 @@ fn serialize_struct(value: StructRef<'_>, buf: &mut impl BufMut) {
         .collect_vec();
 }
 
+fn estimate_serialize_struct_size(s: StructRef<'_>) -> usize {
+    s.estimate_serialize_size_inner()
+}
 fn serialize_list(value: ListRef<'_>, buf: &mut impl BufMut) {
     let values_ref = value.values_ref();
     buf.put_u32_le(values_ref.len() as u32);
@@ -246,52 +279,79 @@ fn serialize_list(value: ListRef<'_>, buf: &mut impl BufMut) {
         })
         .collect_vec();
 }
+fn estimate_serialize_list_size(list: ListRef<'_>) -> usize {
+    4 + list.estimate_serialize_size_inner()
+}
 
 fn serialize_str(bytes: &[u8], buf: &mut impl BufMut) {
     buf.put_u32_le(bytes.len() as u32);
     buf.put_slice(bytes);
 }
 
-fn serialize_interval(interval: &IntervalUnit, buf: &mut impl BufMut) {
+fn estimate_serialize_str_size(bytes: &[u8]) -> usize {
+    4 + bytes.len()
+}
+
+fn serialize_interval(interval: &Interval, buf: &mut impl BufMut) {
     buf.put_i32_le(interval.get_months());
     buf.put_i32_le(interval.get_days());
     buf.put_i64_le(interval.get_usecs());
 }
 
-fn serialize_naivedate(days: i32, buf: &mut impl BufMut) {
+fn estimate_serialize_interval_size() -> usize {
+    4 + 4 + 8
+}
+
+fn serialize_date(days: i32, buf: &mut impl BufMut) {
     buf.put_i32_le(days);
 }
 
-fn serialize_naivedatetime(secs: i64, nsecs: u32, buf: &mut impl BufMut) {
+fn estimate_serialize_date_size() -> usize {
+    4
+}
+
+fn serialize_timestamp(secs: i64, nsecs: u32, buf: &mut impl BufMut) {
     buf.put_i64_le(secs);
     buf.put_u32_le(nsecs);
 }
 
-fn serialize_naivetime(secs: u32, nano: u32, buf: &mut impl BufMut) {
+fn estimate_serialize_timestamp_size() -> usize {
+    8 + 4
+}
+
+fn serialize_time(secs: u32, nano: u32, buf: &mut impl BufMut) {
     buf.put_u32_le(secs);
     buf.put_u32_le(nano);
 }
 
+fn estimate_serialize_time_size() -> usize {
+    4 + 4
+}
+
 fn serialize_decimal(decimal: &Decimal, buf: &mut impl BufMut) {
     buf.put_slice(&decimal.unordered_serialize());
 }
 
+fn estimate_serialize_decimal_size() -> usize {
+    16
+}
+
 fn deserialize_value(ty: &DataType, data: &mut impl Buf) -> Result<ScalarImpl> {
     Ok(match ty {
         DataType::Int16 => ScalarImpl::Int16(data.get_i16_le()),
         DataType::Int32 => ScalarImpl::Int32(data.get_i32_le()),
         DataType::Int64 => ScalarImpl::Int64(data.get_i64_le()),
         DataType::Serial => ScalarImpl::Serial(Serial::from(data.get_i64_le())),
-        DataType::Float32 => ScalarImpl::Float32(OrderedF32::from(data.get_f32_le())),
-        DataType::Float64 => ScalarImpl::Float64(OrderedF64::from(data.get_f64_le())),
+        DataType::Float32 => ScalarImpl::Float32(F32::from(data.get_f32_le())),
+        DataType::Float64 => ScalarImpl::Float64(F64::from(data.get_f64_le())),
         DataType::Varchar => ScalarImpl::Utf8(deserialize_str(data)?),
         DataType::Boolean => ScalarImpl::Bool(deserialize_bool(data)?),
         DataType::Decimal => ScalarImpl::Decimal(deserialize_decimal(data)?),
         DataType::Interval => ScalarImpl::Interval(deserialize_interval(data)?),
-        DataType::Time => ScalarImpl::NaiveTime(deserialize_naivetime(data)?),
-        DataType::Timestamp => ScalarImpl::NaiveDateTime(deserialize_naivedatetime(data)?),
+        DataType::Time => ScalarImpl::Time(deserialize_time(data)?),
+        DataType::Timestamp => ScalarImpl::Timestamp(deserialize_timestamp(data)?),
         DataType::Timestamptz => ScalarImpl::Int64(data.get_i64_le()),
-        DataType::Date => ScalarImpl::NaiveDate(deserialize_naivedate(data)?),
+        DataType::Date => ScalarImpl::Date(deserialize_date(data)?),
         DataType::Jsonb => ScalarImpl::Jsonb(
             JsonbVal::value_deserialize(&deserialize_bytea(data))
                 .ok_or(ValueEncodingError::InvalidJsonbEncoding)?,
@@ -347,31 +407,30 @@ fn deserialize_bool(data: &mut impl Buf) -> Result<bool> {
     }
 }
 
-fn deserialize_interval(data: &mut impl Buf) -> Result<IntervalUnit> {
+fn deserialize_interval(data: &mut impl Buf) -> Result<Interval> {
     let months = data.get_i32_le();
     let days = data.get_i32_le();
     let usecs = data.get_i64_le();
-    Ok(IntervalUnit::from_month_day_usec(months, days, usecs))
+    Ok(Interval::from_month_day_usec(months, days, usecs))
 }
 
-fn deserialize_naivetime(data: &mut impl Buf) -> Result<NaiveTimeWrapper> {
+fn deserialize_time(data: &mut impl Buf) -> Result<Time> {
     let secs = data.get_u32_le();
     let nano = data.get_u32_le();
-    NaiveTimeWrapper::with_secs_nano(secs, nano)
-        .map_err(|_e| ValueEncodingError::InvalidNaiveTimeEncoding(secs, nano))
+    Time::with_secs_nano(secs, nano)
+        .map_err(|_e| ValueEncodingError::InvalidTimeEncoding(secs, nano))
 }
 
-fn deserialize_naivedatetime(data: &mut impl Buf) -> Result<NaiveDateTimeWrapper> {
+fn deserialize_timestamp(data: &mut impl Buf) -> Result<Timestamp> {
     let secs = data.get_i64_le();
     let nsecs = data.get_u32_le();
-    NaiveDateTimeWrapper::with_secs_nsecs(secs, nsecs)
-        .map_err(|_e| ValueEncodingError::InvalidNaiveDateTimeEncoding(secs, nsecs))
+    Timestamp::with_secs_nsecs(secs, nsecs)
+        .map_err(|_e| ValueEncodingError::InvalidTimestampEncoding(secs, nsecs))
 }
 
-fn deserialize_naivedate(data: &mut impl Buf) -> Result<NaiveDateWrapper> {
+fn deserialize_date(data: &mut impl Buf) -> Result<Date> {
     let days = data.get_i32_le();
-    NaiveDateWrapper::with_days(days)
-        .map_err(|_e| ValueEncodingError::InvalidNaiveDateEncoding(days))
+    Date::with_days(days).map_err(|_e| ValueEncodingError::InvalidDateEncoding(days))
 }
 
 fn deserialize_decimal(data: &mut impl Buf) -> Result<Decimal> {
@@ -379,3 +438,57 @@ fn deserialize_decimal(data: &mut impl Buf) -> Result<Decimal> {
     data.copy_to_slice(&mut bytes);
     Ok(Decimal::unordered_deserialize(bytes))
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::array::serial_array::Serial;
+    use crate::array::{ListValue, StructValue};
+    use crate::types::{Date, Datum, Decimal, Interval, ScalarImpl, Time, Timestamp};
+    use crate::util::value_encoding::{estimate_serialize_datum_size, serialize_datum};
+
+    fn test_estimate_serialize_scalar_size(s: ScalarImpl) {
+        let d = Datum::from(s);
+        assert_eq!(estimate_serialize_datum_size(&d), serialize_datum(&d).len());
+    }
+
+    #[test]
+    fn test_estimate_size() {
+        let d: Datum = None;
+        assert_eq!(estimate_serialize_datum_size(&d), serialize_datum(&d).len());
+
+        test_estimate_serialize_scalar_size(ScalarImpl::Bool(true));
+        test_estimate_serialize_scalar_size(ScalarImpl::Int16(1));
+        test_estimate_serialize_scalar_size(ScalarImpl::Int32(1));
+        test_estimate_serialize_scalar_size(ScalarImpl::Int64(1));
+        test_estimate_serialize_scalar_size(ScalarImpl::Float32(1.0.into()));
+        test_estimate_serialize_scalar_size(ScalarImpl::Float64(1.0.into()));
+        test_estimate_serialize_scalar_size(ScalarImpl::Serial(Serial::from(i64::MIN)));
+
+        test_estimate_serialize_scalar_size(ScalarImpl::Utf8("abc".into()));
+        test_estimate_serialize_scalar_size(ScalarImpl::Utf8("".into()));
+        test_estimate_serialize_scalar_size(ScalarImpl::Decimal(Decimal::NegativeInf));
+        test_estimate_serialize_scalar_size(ScalarImpl::Decimal(Decimal::PositiveInf));
+        test_estimate_serialize_scalar_size(ScalarImpl::Decimal(Decimal::NaN));
+        test_estimate_serialize_scalar_size(ScalarImpl::Decimal(123123.into()));
+        test_estimate_serialize_scalar_size(ScalarImpl::Interval(Interval::from_month_day_usec(
+            7, 8, 9,
+        )));
+        test_estimate_serialize_scalar_size(ScalarImpl::Date(Date::from_ymd_uncheck(2333, 3, 3)));
+        test_estimate_serialize_scalar_size(ScalarImpl::Bytea("\\x233".as_bytes().into()));
+        test_estimate_serialize_scalar_size(ScalarImpl::Time(Time::from_hms_uncheck(2, 3, 3)));
+        test_estimate_serialize_scalar_size(ScalarImpl::Timestamp(
+            Timestamp::from_timestamp_uncheck(23333333, 2333),
+        ));
+        test_estimate_serialize_scalar_size(ScalarImpl::Interval(Interval::from_month_day_usec(
+            2, 3, 3333,
+        )));
+        test_estimate_serialize_scalar_size(ScalarImpl::Struct(StructValue::new(vec![
+            ScalarImpl::Int64(233).into(),
+            ScalarImpl::Float64(23.33.into()).into(),
+        ])));
+        test_estimate_serialize_scalar_size(ScalarImpl::List(ListValue::new(vec![
+            ScalarImpl::Int64(233).into(),
+            ScalarImpl::Int64(2333).into(),
+        ])));
+    }
+}
diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml
index 985f7a58f1175..74338843457f2 100644
--- a/src/compute/Cargo.toml
+++ b/src/compute/Cargo.toml
@@ -39,6 +39,7 @@ risingwave_source = { path = "../source" }
 risingwave_storage = { path = "../storage" }
 risingwave_stream = { path = "../stream" }
 risingwave_tracing = { path = "../tracing" }
+serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
@@ -53,6 +54,7 @@ tokio-stream = "0.1"
 tonic = { version = "0.2", package = "madsim-tonic" }
 tower = { version = "0.4", features = ["util", "load-shed"] }
 tracing = "0.1"
+uuid = "1.2.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 tikv-jemalloc-ctl = "0.5"
diff --git a/src/compute/src/lib.rs b/src/compute/src/lib.rs
index ab6614eae7ca4..a4b5b2d471ddb 100644
--- a/src/compute/src/lib.rs
+++ b/src/compute/src/lib.rs
@@ -28,6 +28,7 @@ pub mod memory_management;
 pub mod observer;
 pub mod rpc;
 pub mod server;
+pub mod telemetry;
 
 use clap::Parser;
 use risingwave_common::config::AsyncStackTraceOption;
@@ -65,14 +66,9 @@ pub struct ComputeNodeOpts {
     #[clap(long, env = "RW_CONNECTOR_RPC_ENDPOINT")]
     pub connector_rpc_endpoint: Option<String>,
 
-    /// One of:
-    /// 1. `hummock+{object_store}` where `object_store`
-    /// is one of `s3://{path}`, `s3-compatible://{path}`, `minio://{path}`, `disk://{path}`,
-    /// `memory` or `memory-shared`.
-    /// 2. `in-memory`
-    /// 3. `sled://{path}`
-    #[clap(long, env = "RW_STATE_STORE")]
-    pub state_store: Option<String>,
+    /// Payload format of connector sink rpc
+    #[clap(long, env = "RW_CONNECTOR_RPC_SINK_PAYLOAD_FORMAT")]
+    pub connector_rpc_sink_payload_format: Option<String>,
 
     /// The path of `risingwave.toml` configuration file.
     ///
@@ -168,7 +164,6 @@ pub fn start(opts: ComputeNodeOpts) -> Pin<Box<dyn Future<Output = ()> + Send>>
     // slow compile in release mode.
     Box::pin(async move {
         tracing::info!("options: {:?}", opts);
-        warn_future_deprecate_options(&opts);
         validate_opts(&opts);
 
         let listen_addr = opts.listen_addr.parse().unwrap();
@@ -201,9 +196,3 @@ fn default_total_memory_bytes() -> usize {
 fn default_parallelism() -> usize {
     total_cpu_available().ceil() as usize
 }
-
-fn warn_future_deprecate_options(opts: &ComputeNodeOpts) {
-    if opts.state_store.is_some() {
-        tracing::warn!("`--state-store` will not be accepted by compute node in the next release. Please consider moving this argument to the meta node.");
-    }
-}
diff --git a/src/compute/src/memory_management/memory_manager.rs b/src/compute/src/memory_management/memory_manager.rs
index b585bfbc973ef..a5d349ad4f9a9 100644
--- a/src/compute/src/memory_management/memory_manager.rs
+++ b/src/compute/src/memory_management/memory_manager.rs
@@ -24,14 +24,7 @@ use risingwave_stream::task::LocalStreamManager;
 use super::MemoryControlPolicy;
 use crate::memory_management::MemoryControlStats;
 
-/// The minimal memory requirement of computing tasks in megabytes.
-pub const MIN_COMPUTE_MEMORY_MB: usize = 512;
-/// The memory reserved for system usage (stack and code segment of processes, allocation overhead,
-/// network buffer, etc.) in megabytes.
-pub const SYSTEM_RESERVED_MEMORY_MB: usize = 512;
-
-/// When `enable_managed_cache` is set, compute node will launch a [`GlobalMemoryManager`] to limit
-/// the memory usage.
+/// Compute node uses [`GlobalMemoryManager`] to limit the memory usage.
 pub struct GlobalMemoryManager {
     /// All cached data before the watermark should be evicted.
     watermark_epoch: Arc<AtomicU64>,
diff --git a/src/compute/src/memory_management/mod.rs b/src/compute/src/memory_management/mod.rs
index 6e3c7526af8aa..a114b9c687918 100644
--- a/src/compute/src/memory_management/mod.rs
+++ b/src/compute/src/memory_management/mod.rs
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 pub mod memory_manager;
+
+// Only enable the non-trivial policies on Linux as it relies on statistics from `jemalloc-ctl`
+// which might be inaccurate on other platforms.
 #[cfg(target_os = "linux")]
 pub mod policy;
 
@@ -20,11 +23,30 @@ use std::sync::atomic::AtomicU64;
 use std::sync::Arc;
 
 use risingwave_batch::task::BatchManager;
+use risingwave_common::config::{StorageConfig, StorageMemoryConfig};
 use risingwave_common::error::Result;
 use risingwave_stream::task::LocalStreamManager;
 
 use crate::ComputeNodeOpts;
 
+/// The minimal memory requirement of computing tasks in megabytes.
+pub const MIN_COMPUTE_MEMORY_MB: usize = 512;
+/// The memory reserved for system usage (stack and code segment of processes, allocation
+/// overhead, network buffer, etc.) in megabytes.
+pub const MIN_SYSTEM_RESERVED_MEMORY_MB: usize = 512;
+pub const MAX_SYSTEM_RESERVED_MEMORY_MB: usize = 2048;
+pub const SYSTEM_RESERVED_MEMORY_PROPORTION: f64 = 0.1;
+
+pub const STORAGE_MEMORY_PROPORTION: f64 = 0.3;
+
+pub const COMPACTOR_MEMORY_PROPORTION: f64 = 0.1;
+
+pub const STORAGE_BLOCK_CACHE_MEMORY_PROPORTION: f64 = 0.3;
+pub const STORAGE_META_CACHE_MEMORY_PROPORTION: f64 = 0.1;
+pub const STORAGE_SHARED_BUFFER_MEMORY_PROPORTION: f64 = 0.5;
+pub const STORAGE_FILE_CACHE_MEMORY_PROPORTION: f64 = 0.1;
+pub const STORAGE_DEFAULT_HIGH_PRIORITY_BLOCK_CACHE_RATIO: usize = 70;
+
 /// `MemoryControlStats` contains the necessary information for memory control, including both batch
 /// and streaming.
 #[derive(Default)]
@@ -108,3 +130,121 @@ impl MemoryControl for DummyPolicy {
         "DummyPolicy".to_string()
     }
 }
+
+/// Each compute node reserves some memory for stack and code segment of processes, allocation
+/// overhead, network buffer, etc. based on `SYSTEM_RESERVED_MEMORY_PROPORTION`. The reserve memory
+/// size belongs to [`MIN_SYSTEM_RESERVED_MEMORY_MB`, `MAX_SYSTEM_RESERVED_MEMORY_MB`]
+pub fn reserve_memory_bytes(total_memory_bytes: usize) -> (usize, usize) {
+    let reserved = std::cmp::min(
+        std::cmp::max(
+            (total_memory_bytes as f64 * SYSTEM_RESERVED_MEMORY_PROPORTION).ceil() as usize,
+            MIN_SYSTEM_RESERVED_MEMORY_MB << 20,
+        ),
+        MAX_SYSTEM_RESERVED_MEMORY_MB << 20,
+    );
+    (reserved, total_memory_bytes - reserved)
+}
+
+/// Decide the memory limit for each storage cache. If not specified in `StorageConfig`, memory
+/// limits are calculated based on the proportions to total `non_reserved_memory_bytes`.
+pub fn storage_memory_config(
+    non_reserved_memory_bytes: usize,
+    storage_config: &StorageConfig,
+) -> StorageMemoryConfig {
+    let block_cache_capacity_mb = storage_config.block_cache_capacity_mb.unwrap_or(
+        ((non_reserved_memory_bytes as f64
+            * STORAGE_MEMORY_PROPORTION
+            * STORAGE_BLOCK_CACHE_MEMORY_PROPORTION)
+            .ceil() as usize)
+            >> 20,
+    );
+    let high_priority_ratio_in_percent = storage_config
+        .high_priority_ratio_in_percent
+        .unwrap_or(STORAGE_DEFAULT_HIGH_PRIORITY_BLOCK_CACHE_RATIO);
+    let meta_cache_capacity_mb = storage_config.meta_cache_capacity_mb.unwrap_or(
+        ((non_reserved_memory_bytes as f64
+            * STORAGE_MEMORY_PROPORTION
+            * STORAGE_META_CACHE_MEMORY_PROPORTION)
+            .ceil() as usize)
+            >> 20,
+    );
+    let shared_buffer_capacity_mb = storage_config.shared_buffer_capacity_mb.unwrap_or(
+        ((non_reserved_memory_bytes as f64
+            * STORAGE_MEMORY_PROPORTION
+            * STORAGE_SHARED_BUFFER_MEMORY_PROPORTION)
+            .ceil() as usize)
+            >> 20,
+    );
+    let file_cache_total_buffer_capacity_mb = storage_config
+        .file_cache
+        .total_buffer_capacity_mb
+        .unwrap_or(
+            ((non_reserved_memory_bytes as f64
+                * STORAGE_MEMORY_PROPORTION
+                * STORAGE_FILE_CACHE_MEMORY_PROPORTION)
+                .ceil() as usize)
+                >> 20,
+        );
+    let compactor_memory_limit_mb = storage_config.compactor_memory_limit_mb.unwrap_or(
+        ((non_reserved_memory_bytes as f64 * COMPACTOR_MEMORY_PROPORTION).ceil() as usize) >> 20,
+    );
+
+    StorageMemoryConfig {
+        block_cache_capacity_mb,
+        meta_cache_capacity_mb,
+        shared_buffer_capacity_mb,
+        file_cache_total_buffer_capacity_mb,
+        compactor_memory_limit_mb,
+        high_priority_ratio_in_percent,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use risingwave_common::config::StorageConfig;
+
+    use super::{reserve_memory_bytes, storage_memory_config};
+
+    #[test]
+    fn test_reserve_memory_bytes() {
+        // at least 512 MB
+        let (reserved, non_reserved) = reserve_memory_bytes(2 << 30);
+        assert_eq!(reserved, 512 << 20);
+        assert_eq!(non_reserved, 1536 << 20);
+
+        // reserve based on proportion
+        let (reserved, non_reserved) = reserve_memory_bytes(10 << 30);
+        assert_eq!(reserved, 1 << 30);
+        assert_eq!(non_reserved, 9 << 30);
+
+        // at most 2 MB
+        let (reserved, non_reserved) = reserve_memory_bytes(100 << 30);
+        assert_eq!(reserved, 2 << 30);
+        assert_eq!(non_reserved, 98 << 30);
+    }
+
+    #[test]
+    fn test_storage_memory_config() {
+        let mut storage_config = StorageConfig::default();
+        let total_non_reserved_memory_bytes = 8 << 30;
+
+        let memory_config = storage_memory_config(total_non_reserved_memory_bytes, &storage_config);
+        assert_eq!(memory_config.block_cache_capacity_mb, 737);
+        assert_eq!(memory_config.meta_cache_capacity_mb, 245);
+        assert_eq!(memory_config.shared_buffer_capacity_mb, 1228);
+        assert_eq!(memory_config.file_cache_total_buffer_capacity_mb, 245);
+        assert_eq!(memory_config.compactor_memory_limit_mb, 819);
+
+        storage_config.block_cache_capacity_mb = Some(512);
+        storage_config.meta_cache_capacity_mb = Some(128);
+        storage_config.shared_buffer_capacity_mb = Some(1024);
+        storage_config.file_cache.total_buffer_capacity_mb = Some(128);
+        storage_config.compactor_memory_limit_mb = Some(512);
+        let memory_config = storage_memory_config(0, &storage_config);
+        assert_eq!(memory_config.block_cache_capacity_mb, 512);
+        assert_eq!(memory_config.meta_cache_capacity_mb, 128);
+        assert_eq!(memory_config.shared_buffer_capacity_mb, 1024);
+        assert_eq!(memory_config.file_cache_total_buffer_capacity_mb, 128);
+        assert_eq!(memory_config.compactor_memory_limit_mb, 512);
+    }
+}
diff --git a/src/compute/src/rpc/service/stream_service.rs b/src/compute/src/rpc/service/stream_service.rs
index 0ad43df5dc746..00ac75068d9a0 100644
--- a/src/compute/src/rpc/service/stream_service.rs
+++ b/src/compute/src/rpc/service/stream_service.rs
@@ -108,7 +108,7 @@ impl StreamService for StreamServiceImpl {
     ) -> std::result::Result<Response<DropActorsResponse>, Status> {
         let req = request.into_inner();
         let actors = req.actor_ids;
-        self.mgr.drop_actor(&actors).await?;
+        self.mgr.drop_actors(&actors).await?;
         Ok(Response::new(DropActorsResponse {
             request_id: req.request_id,
             status: None,
diff --git a/src/compute/src/server.rs b/src/compute/src/server.rs
index e8cf9ee282c1c..6f1793bdf08f4 100644
--- a/src/compute/src/server.rs
+++ b/src/compute/src/server.rs
@@ -21,11 +21,13 @@ use risingwave_batch::executor::{BatchManagerMetrics, BatchTaskMetrics};
 use risingwave_batch::rpc::service::task_service::BatchServiceImpl;
 use risingwave_batch::task::{BatchEnvironment, BatchManager};
 use risingwave_common::config::{
-    load_config, AsyncStackTraceOption, StorageConfig, MAX_CONNECTION_WINDOW_SIZE,
+    load_config, AsyncStackTraceOption, StorageMemoryConfig, MAX_CONNECTION_WINDOW_SIZE,
     STREAM_WINDOW_SIZE,
 };
 use risingwave_common::monitor::process_linux::monitor_process;
 use risingwave_common::system_param::local_manager::LocalSystemParamsManager;
+use risingwave_common::telemetry::manager::TelemetryManager;
+use risingwave_common::telemetry::telemetry_env_enabled;
 use risingwave_common::util::addr::HostAddr;
 use risingwave_common::{GIT_SHA, RW_VERSION};
 use risingwave_common_service::metrics_manager::MetricsManager;
@@ -34,6 +36,7 @@ use risingwave_connector::source::monitor::SourceMetrics;
 use risingwave_hummock_sdk::compact::CompactorRuntimeConfig;
 use risingwave_pb::common::WorkerType;
 use risingwave_pb::compute::config_service_server::ConfigServiceServer;
+use risingwave_pb::connector_service::SinkPayloadFormat;
 use risingwave_pb::health::health_server::HealthServer;
 use risingwave_pb::monitor_service::monitor_service_server::MonitorServiceServer;
 use risingwave_pb::stream_service::stream_service_server::StreamServiceServer;
@@ -57,9 +60,10 @@ use risingwave_stream::task::{LocalStreamManager, StreamEnvironment};
 use tokio::sync::oneshot::Sender;
 use tokio::task::JoinHandle;
 
-use crate::memory_management::memory_control_policy_from_config;
-use crate::memory_management::memory_manager::{
-    GlobalMemoryManager, MIN_COMPUTE_MEMORY_MB, SYSTEM_RESERVED_MEMORY_MB,
+use crate::memory_management::memory_manager::GlobalMemoryManager;
+use crate::memory_management::{
+    memory_control_policy_from_config, reserve_memory_bytes, storage_memory_config,
+    MIN_COMPUTE_MEMORY_MB,
 };
 use crate::observer::observer_manager::ComputeObserverNode;
 use crate::rpc::service::config_service::ConfigServiceImpl;
@@ -70,6 +74,7 @@ use crate::rpc::service::monitor_service::{
     AwaitTreeMiddlewareLayer, AwaitTreeRegistryRef, MonitorServiceImpl,
 };
 use crate::rpc::service::stream_service::StreamServiceImpl;
+use crate::telemetry::ComputeTelemetryCreator;
 use crate::ComputeNodeOpts;
 
 /// Bootstraps the compute-node.
@@ -102,24 +107,39 @@ pub async fn compute_node_serve(
     )
     .await
     .unwrap();
-    let storage_opts = Arc::new(StorageOpts::from((&config, &system_params)));
-
-    let state_store_url = {
-        let from_local = opts
-            .state_store
-            .clone()
-            .unwrap_or_else(|| "hummock+memory".to_string());
-        system_params.state_store(from_local)
-    };
+
+    let state_store_url = system_params.state_store();
 
     let embedded_compactor_enabled =
-        embedded_compactor_enabled(&state_store_url, config.storage.disable_remote_compactor);
+        embedded_compactor_enabled(state_store_url, config.storage.disable_remote_compactor);
+
+    let (reserved_memory_bytes, non_reserved_memory_bytes) =
+        reserve_memory_bytes(opts.total_memory_bytes);
+    let storage_memory_config = storage_memory_config(non_reserved_memory_bytes, &config.storage);
+
     let storage_memory_bytes =
-        total_storage_memory_limit_bytes(&config.storage, embedded_compactor_enabled);
-    let compute_memory_bytes =
-        validate_compute_node_memory_config(opts.total_memory_bytes, storage_memory_bytes);
+        total_storage_memory_limit_bytes(&storage_memory_config, embedded_compactor_enabled);
+    let compute_memory_bytes = validate_compute_node_memory_config(
+        opts.total_memory_bytes,
+        reserved_memory_bytes,
+        storage_memory_bytes,
+    );
+    print_memory_config(
+        opts.total_memory_bytes,
+        compute_memory_bytes,
+        storage_memory_bytes,
+        &storage_memory_config,
+        embedded_compactor_enabled,
+    );
+
     let memory_control_policy = memory_control_policy_from_config(&opts).unwrap();
 
+    let storage_opts = Arc::new(StorageOpts::from((
+        &config,
+        &system_params,
+        &storage_memory_config,
+    )));
+
     let worker_id = meta_client.worker_id();
     info!("Assigned worker node id {}", worker_id);
 
@@ -148,7 +168,7 @@ pub async fn compute_node_serve(
     let mut join_handle_vec = vec![];
 
     let state_store = StateStoreImpl::new(
-        &state_store_url,
+        state_store_url,
         storage_opts.clone(),
         hummock_meta_client.clone(),
         state_store_metrics.clone(),
@@ -214,10 +234,10 @@ pub async fn compute_node_serve(
         ));
         monitor_cache(memory_collector, &registry).unwrap();
         let backup_reader = storage.backup_reader();
-        let system_params_manager = system_params_manager.clone();
+        let system_params_mgr = system_params_manager.clone();
         tokio::spawn(async move {
             backup_reader
-                .watch_config_change(system_params_manager.watch_params())
+                .watch_config_change(system_params_mgr.watch_params())
                 .await;
         });
     }
@@ -253,8 +273,16 @@ pub async fn compute_node_serve(
     // Spawn LRU Manager that have access to collect memory from batch mgr and stream mgr.
     let batch_mgr_clone = batch_mgr.clone();
     let stream_mgr_clone = stream_mgr.clone();
+
+    // NOTE: Due to some limits, we use `total_memory_bytes` as `total_compute_memory_bytes` for
+    // memory control. This is just a workaround for some memory control issues and should be
+    // modified as soon as we figure out a better solution.
+    //
+    // Related issues:
+    // - https://github.com/risingwavelabs/risingwave/issues/8696
+    // - https://github.com/risingwavelabs/risingwave/issues/8822
     let memory_mgr = GlobalMemoryManager::new(
-        compute_memory_bytes,
+        opts.total_memory_bytes,
         system_params.barrier_interval_ms(),
         streaming_metrics.clone(),
         memory_control_policy,
@@ -267,6 +295,8 @@ pub async fn compute_node_serve(
     // of lru manager.
     stream_mgr.set_watermark_epoch(watermark_epoch).await;
 
+    let telemetry_enabled = system_params.telemetry_enabled();
+
     let grpc_await_tree_reg = await_tree_config
         .map(|config| AwaitTreeRegistryRef::new(await_tree::Registry::new(config).into()));
     let dml_mgr = Arc::new(DmlManager::default());
@@ -287,7 +317,20 @@ pub async fn compute_node_serve(
 
     let connector_params = risingwave_connector::ConnectorParams {
         connector_rpc_endpoint: opts.connector_rpc_endpoint,
+        sink_payload_format: match opts.connector_rpc_sink_payload_format.as_deref() {
+            None | Some("json") => SinkPayloadFormat::Json,
+            Some("stream_chunk") => SinkPayloadFormat::StreamChunk,
+            _ => {
+                unreachable!(
+                    "invalid sink payload format: {:?}. Should be either json or stream_chunk",
+                    opts.connector_rpc_sink_payload_format
+                )
+            }
+        },
     };
+
+    info!("connector param: {:?}", connector_params);
+
     // Initialize the streaming environment.
     let stream_env = StreamEnvironment::new(
         advertise_addr.clone(),
@@ -296,7 +339,7 @@ pub async fn compute_node_serve(
         worker_id,
         state_store,
         dml_mgr,
-        system_params_manager,
+        system_params_manager.clone(),
         source_metrics,
     );
 
@@ -318,6 +361,25 @@ pub async fn compute_node_serve(
     let config_srv = ConfigServiceImpl::new(batch_mgr, stream_mgr);
     let health_srv = HealthServiceImpl::new();
 
+    let telemetry_manager = TelemetryManager::new(
+        system_params_manager.watch_params(),
+        Arc::new(meta_client.clone()),
+        Arc::new(ComputeTelemetryCreator::new()),
+    );
+
+    // if the toml config file or env variable disables telemetry, do not watch system params change
+    // because if any of configs disable telemetry, we should never start it
+    if config.server.telemetry_enabled && telemetry_env_enabled() {
+        // if all configs are true, start reporting
+        if telemetry_enabled {
+            telemetry_manager.start_telemetry_reporting();
+        }
+        // if config and env are true, starting watching
+        sub_tasks.push(telemetry_manager.watch_params_change());
+    } else {
+        tracing::info!("Telemetry didn't start due to config");
+    }
+
     let (shutdown_send, mut shutdown_recv) = tokio::sync::oneshot::channel::<()>();
     let join_handle = tokio::spawn(async move {
         tonic::transport::Server::builder()
@@ -368,10 +430,12 @@ pub async fn compute_node_serve(
 
 /// Check whether the compute node has enough memory to perform computing tasks. Apart from storage,
 /// it is recommended to reserve at least `MIN_COMPUTE_MEMORY_MB` for computing and
-/// `SYSTEM_RESERVED_MEMORY_MB` for other system usage. If the requirement is not met, we will print
-/// out a warning and enforce the memory used for computing tasks as `MIN_COMPUTE_MEMORY_MB`.
+/// `SYSTEM_RESERVED_MEMORY_PROPORTION` of total memory for other system usage. If the requirement
+/// is not met, we will print out a warning and enforce the memory used for computing tasks as
+/// `MIN_COMPUTE_MEMORY_MB`.
 fn validate_compute_node_memory_config(
     cn_total_memory_bytes: usize,
+    reserved_memory_bytes: usize,
     storage_memory_bytes: usize,
 ) -> usize {
     if storage_memory_bytes > cn_total_memory_bytes {
@@ -381,7 +445,7 @@ fn validate_compute_node_memory_config(
             convert(storage_memory_bytes as _)
         );
         MIN_COMPUTE_MEMORY_MB << 20
-    } else if storage_memory_bytes + ((MIN_COMPUTE_MEMORY_MB + SYSTEM_RESERVED_MEMORY_MB) << 20)
+    } else if storage_memory_bytes + (MIN_COMPUTE_MEMORY_MB << 20) + reserved_memory_bytes
         >= cn_total_memory_bytes
     {
         tracing::warn!(
@@ -391,24 +455,24 @@ fn validate_compute_node_memory_config(
         );
         MIN_COMPUTE_MEMORY_MB << 20
     } else {
-        cn_total_memory_bytes - storage_memory_bytes - (SYSTEM_RESERVED_MEMORY_MB << 20)
+        cn_total_memory_bytes - storage_memory_bytes - reserved_memory_bytes
     }
 }
 
 /// The maximal memory that storage components may use based on the configurations in bytes. Note
 /// that this is the total storage memory for one compute node instead of the whole cluster.
 fn total_storage_memory_limit_bytes(
-    storage_config: &StorageConfig,
+    storage_memory_config: &StorageMemoryConfig,
     embedded_compactor_enabled: bool,
 ) -> usize {
-    let total_memory = storage_config.block_cache_capacity_mb
-        + storage_config.meta_cache_capacity_mb
-        + storage_config.shared_buffer_capacity_mb
-        + storage_config.file_cache.total_buffer_capacity_mb;
+    let total_storage_memory_mb = storage_memory_config.block_cache_capacity_mb
+        + storage_memory_config.meta_cache_capacity_mb
+        + storage_memory_config.shared_buffer_capacity_mb
+        + storage_memory_config.file_cache_total_buffer_capacity_mb;
     if embedded_compactor_enabled {
-        (total_memory + storage_config.compactor_memory_limit_mb) << 20
+        (storage_memory_config.compactor_memory_limit_mb + total_storage_memory_mb) << 20
     } else {
-        total_memory << 20
+        total_storage_memory_mb << 20
     }
 }
 
@@ -420,3 +484,45 @@ fn embedded_compactor_enabled(state_store_url: &str, disable_remote_compactor: b
         || state_store_url.starts_with("hummock+disk")
         || disable_remote_compactor
 }
+
+// Print out the memory outline of the compute node.
+fn print_memory_config(
+    cn_total_memory_bytes: usize,
+    compute_memory_bytes: usize,
+    storage_memory_bytes: usize,
+    storage_memory_config: &StorageMemoryConfig,
+    embedded_compactor_enabled: bool,
+) {
+    info!("Memory outline: ");
+    info!("> total_memory: {}", convert(cn_total_memory_bytes as _));
+    info!(
+        ">     storage_memory: {}",
+        convert(storage_memory_bytes as _)
+    );
+    info!(
+        ">         block_cache_capacity: {}",
+        convert((storage_memory_config.block_cache_capacity_mb << 20) as _)
+    );
+    info!(
+        ">         meta_cache_capacity: {}",
+        convert((storage_memory_config.meta_cache_capacity_mb << 20) as _)
+    );
+    info!(
+        ">         shared_buffer_capacity: {}",
+        convert((storage_memory_config.shared_buffer_capacity_mb << 20) as _)
+    );
+    info!(
+        ">         file_cache_total_buffer_capacity: {}",
+        convert((storage_memory_config.file_cache_total_buffer_capacity_mb << 20) as _)
+    );
+    if embedded_compactor_enabled {
+        info!(
+            ">         compactor_memory_limit: {}",
+            convert((storage_memory_config.compactor_memory_limit_mb << 20) as _)
+        );
+    }
+    info!(
+        ">     compute_memory: {}",
+        convert(compute_memory_bytes as _)
+    );
+}
diff --git a/src/compute/src/telemetry.rs b/src/compute/src/telemetry.rs
new file mode 100644
index 0000000000000..aab7af87fc906
--- /dev/null
+++ b/src/compute/src/telemetry.rs
@@ -0,0 +1,76 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 anyhow::Result;
+use risingwave_common::telemetry::report::TelemetryReportCreator;
+use risingwave_common::telemetry::{
+    current_timestamp, SystemData, TelemetryNodeType, TelemetryReport, TelemetryReportBase,
+};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy)]
+pub(crate) struct ComputeTelemetryCreator {}
+
+impl ComputeTelemetryCreator {
+    pub(crate) fn new() -> Self {
+        Self {}
+    }
+}
+
+impl TelemetryReportCreator for ComputeTelemetryCreator {
+    fn create_report(
+        &self,
+        tracking_id: String,
+        session_id: String,
+        up_time: u64,
+    ) -> Result<ComputeTelemetryReport> {
+        Ok(ComputeTelemetryReport::new(
+            tracking_id,
+            session_id,
+            up_time,
+        ))
+    }
+
+    fn report_type(&self) -> &str {
+        "compute"
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub(crate) struct ComputeTelemetryReport {
+    #[serde(flatten)]
+    base: TelemetryReportBase,
+}
+
+impl TelemetryReport for ComputeTelemetryReport {
+    fn to_json(&self) -> Result<String> {
+        let json = serde_json::to_string(self)?;
+        Ok(json)
+    }
+}
+
+impl ComputeTelemetryReport {
+    pub(crate) fn new(tracking_id: String, session_id: String, up_time: u64) -> Self {
+        Self {
+            base: TelemetryReportBase {
+                tracking_id,
+                session_id,
+                up_time,
+                system_data: SystemData::new(),
+                time_stamp: current_timestamp(),
+                node_type: TelemetryNodeType::Compute,
+            },
+        }
+    }
+}
diff --git a/src/compute/tests/integration_tests.rs b/src/compute/tests/integration_tests.rs
index 68da7aa01c14f..350ee7f38a975 100644
--- a/src/compute/tests/integration_tests.rs
+++ b/src/compute/tests/integration_tests.rs
@@ -26,7 +26,8 @@ use risingwave_batch::executor::{
     BoxedDataChunkStream, BoxedExecutor, DeleteExecutor, Executor as BatchExecutor, InsertExecutor,
     RowSeqScanExecutor, ScanRange,
 };
-use risingwave_common::array::{Array, DataChunk, F64Array, I64Array};
+use risingwave_common::array::serial_array::SerialArray;
+use risingwave_common::array::{Array, DataChunk, F64Array};
 use risingwave_common::buffer::Bitmap;
 use risingwave_common::catalog::{
     ColumnDesc, ColumnId, ConflictBehavior, Field, Schema, TableId, INITIAL_TABLE_VERSION_ID,
@@ -41,7 +42,7 @@ use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
 use risingwave_hummock_sdk::to_committed_batch_query_epoch;
 use risingwave_pb::catalog::StreamSourceInfo;
-use risingwave_pb::plan_common::RowFormatType as ProstRowFormatType;
+use risingwave_pb::plan_common::PbRowFormatType;
 use risingwave_source::connector_test_utils::create_source_desc_builder;
 use risingwave_source::dml_manager::DmlManager;
 use risingwave_storage::memory::MemoryStateStore;
@@ -106,12 +107,12 @@ async fn test_table_materialize() -> StreamResult<()> {
     let table_id = TableId::default();
     let schema = Schema {
         fields: vec![
-            Field::unnamed(DataType::Int64),
+            Field::unnamed(DataType::Serial),
             Field::unnamed(DataType::Float64),
         ],
     };
     let source_info = StreamSourceInfo {
-        row_format: ProstRowFormatType::Json as i32,
+        row_format: PbRowFormatType::Json as i32,
         ..Default::default()
     };
     let properties = convert_args!(hashmap!(
@@ -157,6 +158,7 @@ async fn test_table_materialize() -> StreamResult<()> {
             name: field.name,
             field_descs: vec![],
             type_name: "".to_string(),
+            generated_column: None,
         })
         .collect_vec();
     let (barrier_tx, barrier_rx) = unbounded_channel();
@@ -292,7 +294,7 @@ async fn test_table_materialize() -> StreamResult<()> {
             todo!("https://github.com/risingwavelabs/risingwave/issues/6042")
         }
         Message::Chunk(c) => {
-            let col_row_id = c.columns()[0].array_ref().as_int64();
+            let col_row_id = c.columns()[0].array_ref().as_serial();
             col_row_ids.push(col_row_id.value_at(0).unwrap());
             col_row_ids.push(col_row_id.value_at(1).unwrap());
 
@@ -343,7 +345,7 @@ async fn test_table_materialize() -> StreamResult<()> {
 
     // Delete some data using `DeleteExecutor`, assuming we are inserting into the "mv".
     let columns = vec![
-        column_nonnull! { I64Array, [ col_row_ids[0]] }, // row id column
+        column_nonnull! { SerialArray, [ col_row_ids[0]] }, // row id column
         column_nonnull! { F64Array, [1.14] },
     ];
     let chunk = DataChunk::new(columns.clone(), 1);
@@ -371,7 +373,7 @@ async fn test_table_materialize() -> StreamResult<()> {
             todo!("https://github.com/risingwavelabs/risingwave/issues/6042")
         }
         Message::Chunk(c) => {
-            let col_row_id = c.columns()[0].array_ref().as_int64();
+            let col_row_id = c.columns()[0].array_ref().as_serial();
             assert_eq!(col_row_id.value_at(0).unwrap(), col_row_ids[0]);
 
             let col_data = c.columns()[1].array_ref().as_float64();
diff --git a/src/config/ci-compaction-test-meta.toml b/src/config/ci-compaction-test-meta.toml
index d8248d283f61c..7e4f6a6704c40 100644
--- a/src/config/ci-compaction-test-meta.toml
+++ b/src/config/ci-compaction-test-meta.toml
@@ -3,11 +3,7 @@ enable_compaction_deterministic = true
 max_heartbeat_interval_secs = 600
 
 [streaming]
-barrier_interval_ms = 250
 in_flight_barrier_nums = 40
-# We set a large checkpoint frequency to prevent the embedded meta node
-# to commit new epochs to avoid bumping the hummock version during version log replay.
-checkpoint_frequency = 99999999
 
 [storage]
 shared_buffer_capacity_mb = 4096
@@ -21,3 +17,13 @@ total_buffer_capacity_mb = 128
 cache_file_fallocate_unit_mb = 512
 cache_meta_fallocate_unit_mb = 16
 cache_file_max_write_size_mb = 4
+
+[system]
+sstable_size_mb = 256
+block_size_kb = 1024
+bloom_false_positive = 0.001
+data_directory = "hummock_001"
+# We set a large checkpoint frequency to prevent the embedded meta node
+# to commit new epochs to avoid bumping the hummock version during version log replay.
+checkpoint_frequency = 99999999
+barrier_interval_ms = 250
diff --git a/src/config/ci-compaction-test.toml b/src/config/ci-compaction-test.toml
index 797ec68a7678d..3a13e35c03e51 100644
--- a/src/config/ci-compaction-test.toml
+++ b/src/config/ci-compaction-test.toml
@@ -3,9 +3,7 @@ enable_compaction_deterministic = true
 max_heartbeat_interval_secs = 600
 
 [streaming]
-barrier_interval_ms = 250
 in_flight_barrier_nums = 40
-checkpoint_frequency = 10
 
 [storage]
 shared_buffer_capacity_mb = 4096
@@ -19,3 +17,11 @@ total_buffer_capacity_mb = 128
 cache_file_fallocate_unit_mb = 512
 cache_meta_fallocate_unit_mb = 16
 cache_file_max_write_size_mb = 4
+
+[system]
+sstable_size_mb = 256
+block_size_kb = 1024
+bloom_false_positive = 0.001
+data_directory = "hummock_001"
+checkpoint_frequency = 10
+barrier_interval_ms = 250
diff --git a/src/config/ci-iceberg-test.toml b/src/config/ci-iceberg-test.toml
index a7a5db0a603fd..4321dbc93d78e 100644
--- a/src/config/ci-iceberg-test.toml
+++ b/src/config/ci-iceberg-test.toml
@@ -4,6 +4,8 @@ enable_committed_sst_sanity_check = true
 max_heartbeat_interval_secs = 600
 
 [streaming]
-barrier_interval_ms = 5000
 in_flight_barrier_nums = 10
+
+[system]
+barrier_interval_ms = 5000
 checkpoint_frequency = 1
\ No newline at end of file
diff --git a/src/config/ci-meta-backup-test.toml b/src/config/ci-meta-backup-test.toml
index 732b948e476d6..9aa5e2ec5a9a3 100644
--- a/src/config/ci-meta-backup-test.toml
+++ b/src/config/ci-meta-backup-test.toml
@@ -2,3 +2,7 @@
 min_sst_retention_time_sec = 0
 collect_gc_watermark_spin_interval_sec = 1
 vacuum_interval_sec = 10
+
+[system]
+backup_storage_url = "minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001"
+backup_storage_directory = "backup"
\ No newline at end of file
diff --git a/src/config/ci-recovery.toml b/src/config/ci-recovery.toml
index b2fecb8d0e359..3df87a3044645 100644
--- a/src/config/ci-recovery.toml
+++ b/src/config/ci-recovery.toml
@@ -4,6 +4,8 @@ enable_committed_sst_sanity_check = true
 max_heartbeat_interval_secs = 600
 
 [streaming]
-barrier_interval_ms = 250
 in_flight_barrier_nums = 10
-checkpoint_frequency = 5
+
+[system]
+barrier_interval_ms = 250
+checkpoint_frequency = 5
\ No newline at end of file
diff --git a/src/config/ci.toml b/src/config/ci.toml
index 3d93081ac2d35..719d7644e30a9 100644
--- a/src/config/ci.toml
+++ b/src/config/ci.toml
@@ -4,6 +4,8 @@ enable_committed_sst_sanity_check = true
 max_heartbeat_interval_secs = 600
 
 [streaming]
-barrier_interval_ms = 250
 in_flight_barrier_nums = 10
-checkpoint_frequency = 5
+
+[system]
+barrier_interval_ms = 250
+checkpoint_frequency = 5
\ No newline at end of file
diff --git a/src/config/example.toml b/src/config/example.toml
index 04c5d8f7a79a2..b6c20b15faa4b 100644
--- a/src/config/example.toml
+++ b/src/config/example.toml
@@ -1,39 +1,87 @@
+# This file is generated by ./risedev generate-example-config
+# Check detailed comments in src/common/src/config.rs
 [server]
 heartbeat_interval_ms = 1000
 max_heartbeat_interval_secs = 600
 connection_pool_size = 16
+metrics_level = 0
+telemetry_enabled = true
 
 [meta]
+min_sst_retention_time_sec = 604800
+collect_gc_watermark_spin_interval_sec = 5
+periodic_compaction_interval_sec = 60
+vacuum_interval_sec = 30
+max_heartbeat_interval_secs = 300
+disable_recovery = false
+meta_leader_lease_secs = 10
+enable_compaction_deterministic = false
+enable_committed_sst_sanity_check = false
+node_num_monitor_interval_sec = 10
+backend = "Mem"
+periodic_space_reclaim_compaction_interval_sec = 3600
+periodic_ttl_reclaim_compaction_interval_sec = 1800
+max_compactor_task_multiplier = 2
 
-[batch]
+[batch.developer]
+batch_output_channel_size = 64
+batch_chunk_size = 1024
+stream_enable_executor_row_count = false
+stream_connector_message_buffer_size = 16
+unsafe_stream_extreme_cache_size = 1024
+stream_chunk_size = 1024
+stream_exchange_initial_permits = 8192
+stream_exchange_batched_permits = 1024
 
 [streaming]
-barrier_interval_ms = 1000
-in_flight_barrier_nums = 10
-checkpoint_frequency = 10
+in_flight_barrier_nums = 10000
+enable_jaeger_tracing = false
+async_stack_trace = "On"
+unique_user_stream_errors = 10
+
+[streaming.developer]
+batch_output_channel_size = 64
+batch_chunk_size = 1024
+stream_enable_executor_row_count = false
+stream_connector_message_buffer_size = 16
+unsafe_stream_extreme_cache_size = 1024
+stream_chunk_size = 1024
+stream_exchange_initial_permits = 8192
+stream_exchange_batched_permits = 1024
 
 [storage]
-shared_buffer_capacity_mb = 4096
-block_cache_capacity_mb = 4096
-meta_cache_capacity_mb = 1024
-compactor_memory_limit_mb = 5120
+share_buffers_sync_parallelism = 1
+share_buffer_compaction_worker_threads_number = 4
+shared_buffer_capacity_mb = 1024
+write_conflict_detection_enabled = true
+block_cache_capacity_mb = 512
+meta_cache_capacity_mb = 128
+disable_remote_compactor = false
+enable_local_spill = true
+local_object_store = "tempdisk"
+share_buffer_upload_concurrency = 8
+compactor_memory_limit_mb = 512
+sstable_id_remote_fetch_number = 10
+min_sst_size_for_streaming_upload = 33554432
+max_sub_compaction = 4
+max_concurrent_compaction_task_number = 16
 
 [storage.file_cache]
+dir = ""
 capacity_mb = 1024
 total_buffer_capacity_mb = 128
 cache_file_fallocate_unit_mb = 512
 cache_meta_fallocate_unit_mb = 16
 cache_file_max_write_size_mb = 4
 
-#The configurable parameters in [XXX.developer] subsection are for developers.
-#Users are not encouraged to tune or depend on the following parameters.
-#Some configurable parameters exist only temporarily.
-[batch.developer]
-batch_output_channel_size = 64
-batch_chunk_size = 1024
-
-[streaming.developer]
-stream_enable_executor_row_count = false
-stream_connector_message_buffer_size = 16
-unsafe_stream_extreme_cache_size = 1024
-stream_chunk_size = 1024
+[system]
+barrier_interval_ms = 1000
+checkpoint_frequency = 10
+sstable_size_mb = 256
+block_size_kb = 64
+bloom_false_positive = 0.001
+state_store = ""
+data_directory = "hummock_001"
+backup_storage_url = "memory"
+backup_storage_directory = "backup"
+telemetry_enabled = true
diff --git a/src/connector/src/lib.rs b/src/connector/src/lib.rs
index ea2a45df11e1d..59dbd0969bbfb 100644
--- a/src/connector/src/lib.rs
+++ b/src/connector/src/lib.rs
@@ -30,6 +30,7 @@
 use std::time::Duration;
 
 use duration_str::parse_std;
+use risingwave_pb::connector_service::SinkPayloadFormat;
 use serde::de;
 
 pub mod aws_utils;
@@ -45,12 +46,17 @@ pub mod common;
 #[derive(Clone, Debug, Default)]
 pub struct ConnectorParams {
     pub connector_rpc_endpoint: Option<String>,
+    pub sink_payload_format: SinkPayloadFormat,
 }
 
 impl ConnectorParams {
-    pub fn new(connector_rpc_endpoint: Option<String>) -> Self {
+    pub fn new(
+        connector_rpc_endpoint: Option<String>,
+        sink_payload_format: SinkPayloadFormat,
+    ) -> Self {
         Self {
             connector_rpc_endpoint,
+            sink_payload_format,
         }
     }
 }
diff --git a/src/connector/src/macros.rs b/src/connector/src/macros.rs
index cd1e44df821e4..c0f09342ecc91 100644
--- a/src/connector/src/macros.rs
+++ b/src/connector/src/macros.rs
@@ -200,7 +200,7 @@ macro_rules! impl_common_parser_logic {
 
                             let old_op_num = builder.op_num();
 
-                            if let Err(e) = self.parse_inner(content.as_ref(), builder.row_writer())
+                            if let Err(e) = self.parse_inner(content, builder.row_writer())
                                 .await
                             {
                                 tracing::warn!("message parsing failed {}, skipping", e.to_string());
diff --git a/src/connector/src/parser/avro/parser.rs b/src/connector/src/parser/avro/parser.rs
index c4cccdc9800dd..361a95c4472fc 100644
--- a/src/connector/src/parser/avro/parser.rs
+++ b/src/connector/src/parser/avro/parser.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fmt::Debug;
 use std::sync::Arc;
@@ -175,7 +176,7 @@ impl AvroParser {
 
     pub(crate) async fn parse_inner(
         &self,
-        payload: &[u8],
+        payload: Vec<u8>,
         mut writer: SourceStreamChunkRowWriter<'_>,
     ) -> Result<WriteGuard> {
         enum Op {
@@ -184,7 +185,7 @@ impl AvroParser {
         }
 
         let (_payload, op) = if self.is_enable_upsert() {
-            let msg: UpsertMessage<'_> = bincode::deserialize(payload).map_err(|e| {
+            let msg: UpsertMessage<'_> = bincode::deserialize(&payload).map_err(|e| {
                 RwError::from(ProtocolError(format!(
                     "extract payload err {:?}, you may need to check the 'upsert' parameter",
                     e
@@ -196,7 +197,7 @@ impl AvroParser {
                 (msg.primary_key, Op::Delete)
             }
         } else {
-            (payload.into(), Op::Insert)
+            (Cow::from(&payload), Op::Insert)
         };
 
         // parse payload to avro value
@@ -212,7 +213,7 @@ impl AvroParser {
             from_avro_datum(writer_schema.as_ref(), &mut raw_payload, reader_schema)
                 .map_err(|e| RwError::from(ProtocolError(e.to_string())))?
         } else {
-            let mut reader = Reader::with_schema(&self.schema, payload as &[u8])
+            let mut reader = Reader::with_schema(&self.schema, &payload as &[u8])
                 .map_err(|e| RwError::from(ProtocolError(e.to_string())))?;
             match reader.next() {
                 Some(Ok(v)) => v,
@@ -237,7 +238,7 @@ impl AvroParser {
                 from_avro_value(tuple.1.clone(), field_schema).map_err(|e| {
                     tracing::error!(
                         "failed to process value ({}): {}",
-                        String::from_utf8_lossy(payload),
+                        String::from_utf8_lossy(&payload),
                         e
                     );
                     e
@@ -271,7 +272,7 @@ impl AvroParser {
                         .map_err(|e| {
                             tracing::error!(
                                 "failed to process value ({}): {}",
-                                String::from_utf8_lossy(payload),
+                                String::from_utf8_lossy(&payload),
                                 e
                             );
                             e
@@ -299,9 +300,7 @@ mod test {
     use risingwave_common::catalog::ColumnId;
     use risingwave_common::error;
     use risingwave_common::row::Row;
-    use risingwave_common::types::{
-        DataType, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, ScalarImpl,
-    };
+    use risingwave_common::types::{DataType, Date, Interval, ScalarImpl};
     use url::Url;
 
     use super::{
@@ -388,10 +387,7 @@ mod test {
         let mut builder = SourceStreamChunkBuilder::with_capacity(columns, 1);
         {
             let writer = builder.row_writer();
-            avro_parser
-                .parse_inner(&input_data[..], writer)
-                .await
-                .unwrap();
+            avro_parser.parse_inner(input_data, writer).await.unwrap();
         }
         let chunk = builder.finish();
         let (op, row) = chunk.rows().next().unwrap();
@@ -419,36 +415,24 @@ mod test {
                     assert_eq!(row[i], Some(ScalarImpl::Float64(f64_val.into())));
                 }
                 Value::Date(days) => {
-                    let date = Some(ScalarImpl::NaiveDate(
-                        NaiveDateWrapper::with_days(days + unix_epoch_days()).unwrap(),
+                    let date = Some(ScalarImpl::Date(
+                        Date::with_days(days + unix_epoch_days()).unwrap(),
                     ));
                     assert_eq!(row[i], date);
                 }
                 Value::TimestampMillis(millis) => {
-                    let datetime = Some(ScalarImpl::NaiveDateTime(
-                        NaiveDateTimeWrapper::with_secs_nsecs(
-                            millis / 1000,
-                            (millis % 1000) as u32 * 1_000_000,
-                        )
-                        .unwrap(),
-                    ));
-                    assert_eq!(row[i], datetime);
+                    let millis = Some(ScalarImpl::Int64(millis * 1000));
+                    assert_eq!(row[i], millis);
                 }
                 Value::TimestampMicros(micros) => {
-                    let datetime = Some(ScalarImpl::NaiveDateTime(
-                        NaiveDateTimeWrapper::with_secs_nsecs(
-                            micros / 1_000_000,
-                            (micros % 1_000_000) as u32 * 1_000,
-                        )
-                        .unwrap(),
-                    ));
-                    assert_eq!(row[i], datetime);
+                    let micros = Some(ScalarImpl::Int64(micros));
+                    assert_eq!(row[i], micros);
                 }
                 Value::Duration(duration) => {
                     let months = u32::from(duration.months()) as i32;
                     let days = u32::from(duration.days()) as i32;
                     let usecs = (u32::from(duration.millis()) as i64) * 1000; // never overflows
-                    let duration = Some(ScalarImpl::Interval(IntervalUnit::from_month_day_usec(
+                    let duration = Some(ScalarImpl::Interval(Interval::from_month_day_usec(
                         months, days, usecs,
                     )));
                     assert_eq!(row[i], duration);
@@ -462,86 +446,16 @@ mod test {
 
     fn build_rw_columns() -> Vec<SourceColumnDesc> {
         vec![
-            SourceColumnDesc {
-                name: "id".to_string(),
-                data_type: DataType::Int32,
-                column_id: ColumnId::from(0),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
-            SourceColumnDesc {
-                name: "sequence_id".to_string(),
-                data_type: DataType::Int64,
-                column_id: ColumnId::from(1),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
-            SourceColumnDesc {
-                name: "name".to_string(),
-                data_type: DataType::Varchar,
-                column_id: ColumnId::from(2),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
-            SourceColumnDesc {
-                name: "score".to_string(),
-                data_type: DataType::Float32,
-                column_id: ColumnId::from(3),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
-            SourceColumnDesc {
-                name: "avg_score".to_string(),
-                data_type: DataType::Float64,
-                column_id: ColumnId::from(4),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
-            SourceColumnDesc {
-                name: "is_lasted".to_string(),
-                data_type: DataType::Boolean,
-                column_id: ColumnId::from(5),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
-            SourceColumnDesc {
-                name: "entrance_date".to_string(),
-                data_type: DataType::Date,
-                column_id: ColumnId::from(6),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
-            SourceColumnDesc {
-                name: "birthday".to_string(),
-                data_type: DataType::Timestamp,
-                column_id: ColumnId::from(7),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
-            SourceColumnDesc {
-                name: "anniversary".to_string(),
-                data_type: DataType::Timestamp,
-                column_id: ColumnId::from(8),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
-            SourceColumnDesc {
-                name: "passed".to_string(),
-                data_type: DataType::Interval,
-                column_id: ColumnId::from(9),
-                is_row_id: false,
-                is_meta: false,
-                fields: vec![],
-            },
+            SourceColumnDesc::simple("id", DataType::Int32, ColumnId::from(0)),
+            SourceColumnDesc::simple("sequence_id", DataType::Int64, ColumnId::from(1)),
+            SourceColumnDesc::simple("name", DataType::Varchar, ColumnId::from(2)),
+            SourceColumnDesc::simple("score", DataType::Float32, ColumnId::from(3)),
+            SourceColumnDesc::simple("avg_score", DataType::Float64, ColumnId::from(4)),
+            SourceColumnDesc::simple("is_lasted", DataType::Boolean, ColumnId::from(5)),
+            SourceColumnDesc::simple("entrance_date", DataType::Date, ColumnId::from(6)),
+            SourceColumnDesc::simple("birthday", DataType::Timestamptz, ColumnId::from(7)),
+            SourceColumnDesc::simple("anniversary", DataType::Timestamptz, ColumnId::from(8)),
+            SourceColumnDesc::simple("passed", DataType::Interval, ColumnId::from(9)),
         ]
     }
 
@@ -555,22 +469,18 @@ mod test {
             Schema::Boolean => Some(Value::Boolean(true)),
 
             Schema::Date => {
-                let original_date =
-                    NaiveDateWrapper::from_ymd_uncheck(1970, 1, 1).and_hms_uncheck(0, 0, 0);
-                let naive_date =
-                    NaiveDateWrapper::from_ymd_uncheck(1970, 1, 1).and_hms_uncheck(0, 0, 0);
+                let original_date = Date::from_ymd_uncheck(1970, 1, 1).and_hms_uncheck(0, 0, 0);
+                let naive_date = Date::from_ymd_uncheck(1970, 1, 1).and_hms_uncheck(0, 0, 0);
                 let num_days = naive_date.0.sub(original_date.0).num_days() as i32;
                 Some(Value::Date(num_days))
             }
             Schema::TimestampMillis => {
-                let datetime =
-                    NaiveDateWrapper::from_ymd_uncheck(1970, 1, 1).and_hms_uncheck(0, 0, 0);
+                let datetime = Date::from_ymd_uncheck(1970, 1, 1).and_hms_uncheck(0, 0, 0);
                 let timestamp_mills = Value::TimestampMillis(datetime.0.timestamp() * 1_000);
                 Some(timestamp_mills)
             }
             Schema::TimestampMicros => {
-                let datetime =
-                    NaiveDateWrapper::from_ymd_uncheck(1970, 1, 1).and_hms_uncheck(0, 0, 0);
+                let datetime = Date::from_ymd_uncheck(1970, 1, 1).and_hms_uncheck(0, 0, 0);
                 let timestamp_micros = Value::TimestampMicros(datetime.0.timestamp() * 1_000_000);
                 Some(timestamp_micros)
             }
diff --git a/src/connector/src/parser/avro/util.rs b/src/connector/src/parser/avro/util.rs
index 33937e62282ad..a20cb1db28ff0 100644
--- a/src/connector/src/parser/avro/util.rs
+++ b/src/connector/src/parser/avro/util.rs
@@ -19,10 +19,7 @@ use itertools::Itertools;
 use risingwave_common::array::{ListValue, StructValue};
 use risingwave_common::error::ErrorCode::{InternalError, ProtocolError};
 use risingwave_common::error::{Result, RwError};
-use risingwave_common::types::{
-    DataType, Datum, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, OrderedF32, OrderedF64,
-    ScalarImpl,
-};
+use risingwave_common::types::{DataType, Date, Datum, Interval, ScalarImpl, F32, F64};
 use risingwave_pb::plan_common::ColumnDesc;
 
 const RW_DECIMAL_MAX_PRECISION: usize = 28;
@@ -50,6 +47,7 @@ pub(crate) fn avro_field_to_column_desc(
                 name: name.to_owned(),
                 field_descs: vec_column,
                 type_name: schema_name.to_string(),
+                generated_column: None,
             })
         }
         _ => {
@@ -74,8 +72,8 @@ fn avro_type_mapping(schema: &Schema) -> Result<DataType> {
         Schema::Double => DataType::Float64,
         Schema::Decimal { .. } => DataType::Decimal,
         Schema::Date => DataType::Date,
-        Schema::TimestampMillis => DataType::Timestamp,
-        Schema::TimestampMicros => DataType::Timestamp,
+        Schema::TimestampMillis => DataType::Timestamptz,
+        Schema::TimestampMicros => DataType::Timestamptz,
         Schema::Duration => DataType::Interval,
         Schema::Enum { .. } => DataType::Varchar,
         Schema::Record { fields, .. } => {
@@ -189,9 +187,7 @@ pub(crate) fn avro_decimal_to_rust_decimal(
 }
 
 pub(crate) fn unix_epoch_days() -> i32 {
-    NaiveDateWrapper::from_ymd_uncheck(1970, 1, 1)
-        .0
-        .num_days_from_ce()
+    Date::from_ymd_uncheck(1970, 1, 1).0.num_days_from_ce()
 }
 
 // extract inner filed/item schema of record/array/union
@@ -259,8 +255,8 @@ pub(crate) fn from_avro_value(value: Value, value_schema: &Schema) -> Result<Dat
         Value::String(s) => ScalarImpl::Utf8(s.into_boxed_str()),
         Value::Int(i) => ScalarImpl::Int32(i),
         Value::Long(i) => ScalarImpl::Int64(i),
-        Value::Float(f) => ScalarImpl::Float32(OrderedF32::from(f)),
-        Value::Double(f) => ScalarImpl::Float64(OrderedF64::from(f)),
+        Value::Float(f) => ScalarImpl::Float32(F32::from(f)),
+        Value::Double(f) => ScalarImpl::Float64(F64::from(f)),
         Value::Decimal(avro_decimal) => {
             let (precision, scale) = match value_schema {
                 Schema::Decimal {
@@ -275,43 +271,24 @@ pub(crate) fn from_avro_value(value: Value, value_schema: &Schema) -> Result<Dat
             let decimal = avro_decimal_to_rust_decimal(avro_decimal, precision, scale)?;
             ScalarImpl::Decimal(risingwave_common::types::Decimal::Normalized(decimal))
         }
-        Value::Date(days) => ScalarImpl::NaiveDate(
-            NaiveDateWrapper::with_days(days + unix_epoch_days()).map_err(|e| {
+        Value::Date(days) => {
+            ScalarImpl::Date(Date::with_days(days + unix_epoch_days()).map_err(|e| {
                 let err_msg = format!("avro parse error.wrong date value {}, err {:?}", days, e);
                 RwError::from(InternalError(err_msg))
-            })?,
-        ),
-        Value::TimestampMillis(millis) => ScalarImpl::NaiveDateTime(
-            NaiveDateTimeWrapper::with_secs_nsecs(
-                millis / 1_000,
-                (millis % 1_000) as u32 * 1_000_000,
-            )
-            .map_err(|e| {
-                let err_msg = format!(
-                    "avro parse error.wrong timestamp millis value {}, err {:?}",
-                    millis, e
-                );
-                RwError::from(InternalError(err_msg))
-            })?,
-        ),
-        Value::TimestampMicros(micros) => ScalarImpl::NaiveDateTime(
-            NaiveDateTimeWrapper::with_secs_nsecs(
-                micros / 1_000_000,
-                (micros % 1_000_000) as u32 * 1_000,
-            )
-            .map_err(|e| {
-                let err_msg = format!(
-                    "avro parse error.wrong timestamp micros value {}, err {:?}",
-                    micros, e
-                );
-                RwError::from(InternalError(err_msg))
-            })?,
-        ),
+            })?)
+        }
+        Value::TimestampMicros(us) => ScalarImpl::Int64(us),
+        Value::TimestampMillis(ms) => ScalarImpl::Int64(ms.checked_mul(1000).ok_or_else(|| {
+            RwError::from(InternalError(format!(
+                "avro parse millis overflow, value: {}",
+                ms
+            )))
+        })?),
         Value::Duration(duration) => {
             let months = u32::from(duration.months()) as i32;
             let days = u32::from(duration.days()) as i32;
             let usecs = (u32::from(duration.millis()) as i64) * 1000; // never overflows
-            ScalarImpl::Interval(IntervalUnit::from_month_day_usec(months, days, usecs))
+            ScalarImpl::Interval(Interval::from_month_day_usec(months, days, usecs))
         }
         Value::Enum(_, symbol) => ScalarImpl::Utf8(symbol.into_boxed_str()),
         Value::Record(descs) => {
@@ -364,4 +341,16 @@ mod tests {
         let rust_decimal = avro_decimal_to_rust_decimal(avro_decimal, 28, 1).unwrap();
         assert_eq!(rust_decimal, rust_decimal::Decimal::from_f32(28.1).unwrap());
     }
+
+    #[test]
+    fn test_avro_timestamp_micros() {
+        let v1 = Value::TimestampMicros(1620000000000);
+        let v2 = Value::TimestampMillis(1620000000);
+        let value_schema1 = Schema::TimestampMicros;
+        let value_schema2 = Schema::TimestampMillis;
+        let datum1 = from_avro_value(v1, &value_schema1).unwrap();
+        let datum2 = from_avro_value(v2, &value_schema2).unwrap();
+        assert_eq!(datum1, Some(ScalarImpl::Int64(1620000000000)));
+        assert_eq!(datum2, Some(ScalarImpl::Int64(1620000000000)));
+    }
 }
diff --git a/src/connector/src/parser/canal/simd_json_parser.rs b/src/connector/src/parser/canal/simd_json_parser.rs
index ab41a7bb18c8f..db47a1a204502 100644
--- a/src/connector/src/parser/canal/simd_json_parser.rs
+++ b/src/connector/src/parser/canal/simd_json_parser.rs
@@ -54,11 +54,10 @@ impl CanalJsonParser {
     #[allow(clippy::unused_async)]
     pub async fn parse_inner(
         &self,
-        payload: &[u8],
+        mut payload: Vec<u8>,
         mut writer: SourceStreamChunkRowWriter<'_>,
     ) -> Result<WriteGuard> {
-        let mut payload_mut = payload.to_vec();
-        let event: BorrowedValue<'_> = simd_json::to_borrowed_value(&mut payload_mut)
+        let event: BorrowedValue<'_> = simd_json::to_borrowed_value(&mut payload)
             .map_err(|e| RwError::from(ProtocolError(e.to_string())))?;
 
         let is_ddl = event.get(IS_DDL).and_then(|v| v.as_bool()).ok_or_else(|| {
@@ -96,7 +95,7 @@ impl CanalJsonParser {
                         writer.insert(|column| {
                             cannal_simd_json_parse_value(
                                 &column.data_type,
-                                v.get(column.name.to_ascii_lowercase().as_str()),
+                                v.get(column.name_in_lower_case.as_str()),
                             )
                         })
                     })
@@ -135,15 +134,14 @@ impl CanalJsonParser {
                             // in origin canal, old only contains the changed columns but data
                             // contains all columns.
                             // in ticdc, old contains all fields
-                            let col_name_lc = column.name.to_ascii_lowercase();
-                            let before_value = before
-                                .get(col_name_lc.as_str())
-                                .or_else(|| after.get(col_name_lc.as_str()));
+                            let col_name_lc = column.name_in_lower_case.as_str();
+                            let before_value =
+                                before.get(col_name_lc).or_else(|| after.get(col_name_lc));
                             let before =
                                 cannal_simd_json_parse_value(&column.data_type, before_value)?;
                             let after = cannal_simd_json_parse_value(
                                 &column.data_type,
-                                after.get(col_name_lc.as_str()),
+                                after.get(col_name_lc),
                             )?;
                             Ok((before, after))
                         })
@@ -169,7 +167,7 @@ impl CanalJsonParser {
                         writer.delete(|column| {
                             cannal_simd_json_parse_value(
                                 &column.data_type,
-                                v.get(column.name.to_ascii_lowercase().as_str()),
+                                v.get(column.name_in_lower_case.as_str()),
                             )
                         })
                     })
@@ -264,7 +262,7 @@ mod tests {
         let mut builder = SourceStreamChunkBuilder::with_capacity(descs, 2);
 
         let writer = builder.row_writer();
-        parser.parse_inner(payload, writer).await.unwrap();
+        parser.parse_inner(payload.to_vec(), writer).await.unwrap();
 
         let chunk = builder.finish();
 
@@ -288,7 +286,7 @@ mod tests {
             );
             assert_eq!(
                 row.datum_at(4).to_owned_datum(),
-                (Some(ScalarImpl::NaiveDateTime(
+                (Some(ScalarImpl::Timestamp(
                     str_to_timestamp("2018-01-01 00:00:01").unwrap()
                 )))
             );
@@ -316,7 +314,7 @@ mod tests {
             );
             assert_eq!(
                 row.datum_at(4).to_owned_datum(),
-                (Some(ScalarImpl::NaiveDateTime(
+                (Some(ScalarImpl::Timestamp(
                     str_to_timestamp("2018-01-01 00:00:01").unwrap()
                 )))
             );
@@ -341,7 +339,7 @@ mod tests {
         let mut builder = SourceStreamChunkBuilder::with_capacity(descs, 2);
 
         let writer = builder.row_writer();
-        parser.parse_inner(payload, writer).await.unwrap();
+        parser.parse_inner(payload.to_vec(), writer).await.unwrap();
 
         let chunk = builder.finish();
 
diff --git a/src/connector/src/parser/common.rs b/src/connector/src/parser/common.rs
index 4bf7d543aa6d7..402b0d6f7fb43 100644
--- a/src/connector/src/parser/common.rs
+++ b/src/connector/src/parser/common.rs
@@ -15,9 +15,7 @@
 use anyhow::{anyhow, Result};
 use num_traits::FromPrimitive;
 use risingwave_common::array::{ListValue, StructValue};
-use risingwave_common::types::{
-    DataType, Datum, Decimal, NaiveDateWrapper, NaiveTimeWrapper, ScalarImpl,
-};
+use risingwave_common::types::{DataType, Date, Datum, Decimal, ScalarImpl, Time};
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_expr::vector_op::cast::{
     i64_to_timestamp, i64_to_timestamptz, str_to_date, str_to_time, str_to_timestamp,
@@ -65,14 +63,14 @@ fn do_parse_simd_json_value(dtype: &DataType, v: &BorrowedValue<'_>) -> Result<S
         DataType::Date => match v {
             BorrowedValue::String(s) => str_to_date(s)?.into(),
             BorrowedValue::Static(_) => {
-                NaiveDateWrapper::with_days_since_unix_epoch(ensure_i32!(v, i32))?.into()
+                Date::with_days_since_unix_epoch(ensure_i32!(v, i32))?.into()
             }
             _ => anyhow::bail!("expect date, but found {v}"),
         },
         // debezium converts time to i64 for mysql and postgres
         DataType::Time => match v {
             BorrowedValue::String(s) => str_to_time(s)?.into(),
-            BorrowedValue::Static(_) => NaiveTimeWrapper::with_milli(
+            BorrowedValue::Static(_) => Time::with_milli(
                 ensure_i64!(v, i64)
                     .try_into()
                     .map_err(|_| anyhow!("cannot cast i64 to time, value out of range"))?,
diff --git a/src/connector/src/parser/csv_parser.rs b/src/connector/src/parser/csv_parser.rs
index 52a00cf974abd..317cf7e1bdbf8 100644
--- a/src/connector/src/parser/csv_parser.rs
+++ b/src/connector/src/parser/csv_parser.rs
@@ -113,10 +113,10 @@ impl CsvParser {
     #[allow(clippy::unused_async)]
     pub async fn parse_inner(
         &mut self,
-        payload: &[u8],
+        payload: Vec<u8>,
         mut writer: SourceStreamChunkRowWriter<'_>,
     ) -> Result<WriteGuard> {
-        let mut fields = self.read_row(payload)?;
+        let mut fields = self.read_row(&payload)?;
         if let Some(headers) = &mut self.headers {
             if headers.is_empty() {
                 *headers = fields;
@@ -126,10 +126,11 @@ impl CsvParser {
             }
             writer.insert(|desc| {
                 if let Some(i) = headers.iter().position(|name| name == &desc.name) {
-                    Self::parse_string(
-                        &desc.data_type,
-                        fields.get_mut(i).map(std::mem::take).unwrap_or_default(),
-                    )
+                    let value = fields.get_mut(i).map(std::mem::take).unwrap_or_default();
+                    if value.is_empty() {
+                        return Ok(None);
+                    }
+                    Self::parse_string(&desc.data_type, value)
                 } else {
                     Ok(None)
                 }
@@ -138,6 +139,9 @@ impl CsvParser {
             fields.reverse();
             writer.insert(|desc| {
                 if let Some(value) = fields.pop() {
+                    if value.is_empty() {
+                        return Ok(None);
+                    }
                     Self::parse_string(&desc.data_type, value)
                 } else {
                     Ok(None)
@@ -157,11 +161,12 @@ mod tests {
     use crate::parser::SourceStreamChunkBuilder;
     #[tokio::test]
     async fn test_csv_without_headers() {
-        let data = [
+        let data = vec![
             r#"1,a,2"#,
             r#""15541","a,1,1,",4"#,
             r#"0,"""0",0"#,
             r#"0,0,0,0,0,0,0,0,0,0,0,0,0,"#,
+            r#",,,,"#,
         ];
         let descs = vec![
             SourceColumnDesc::simple("a", DataType::Int32, 0.into()),
@@ -180,7 +185,7 @@ mod tests {
         let mut builder = SourceStreamChunkBuilder::with_capacity(descs, 4);
         for item in data {
             parser
-                .parse_inner(item.as_bytes(), builder.row_writer())
+                .parse_inner(item.as_bytes().to_vec(), builder.row_writer())
                 .await
                 .unwrap();
         }
@@ -252,6 +257,14 @@ mod tests {
                 (Some(ScalarImpl::Int32(0)))
             );
         }
+
+        {
+            let (op, row) = rows.next().unwrap();
+            assert_eq!(op, Op::Insert);
+            assert_eq!(row.datum_at(0), None);
+            assert_eq!(row.datum_at(1), None);
+            assert_eq!(row.datum_at(2), None);
+        }
     }
     #[tokio::test]
     async fn test_csv_with_headers() {
@@ -279,7 +292,7 @@ mod tests {
         let mut builder = SourceStreamChunkBuilder::with_capacity(descs, 4);
         for item in data {
             let _ = parser
-                .parse_inner(item.as_bytes(), builder.row_writer())
+                .parse_inner(item.as_bytes().to_vec(), builder.row_writer())
                 .await;
         }
         let chunk = builder.finish();
diff --git a/src/connector/src/parser/debezium/avro_parser.rs b/src/connector/src/parser/debezium/avro_parser.rs
index 0946a32e20868..f545d74f027ba 100644
--- a/src/connector/src/parser/debezium/avro_parser.rs
+++ b/src/connector/src/parser/debezium/avro_parser.rs
@@ -189,10 +189,10 @@ impl DebeziumAvroParser {
 
     pub(crate) async fn parse_inner(
         &self,
-        payload: &[u8],
+        payload: Vec<u8>,
         mut writer: SourceStreamChunkRowWriter<'_>,
     ) -> Result<WriteGuard> {
-        let (schema_id, mut raw_payload) = extract_schema_id(payload)?;
+        let (schema_id, mut raw_payload) = extract_schema_id(&payload)?;
         let writer_schema = self.schema_resolver.get(schema_id).await?;
 
         let avro_value = from_avro_datum(writer_schema.as_ref(), &mut raw_payload, None)
@@ -296,7 +296,7 @@ mod tests {
     async fn parse_one(
         parser: DebeziumAvroParser,
         columns: Vec<SourceColumnDesc>,
-        payload: &[u8],
+        payload: Vec<u8>,
     ) -> Vec<(Op, OwnedRow)> {
         let mut builder = SourceStreamChunkBuilder::with_capacity(columns, 2);
         {
@@ -382,46 +382,22 @@ mod tests {
 
         assert_eq!(columns.len(), 4);
         assert_eq!(
-            CatColumnDesc {
-                data_type: DataType::Int32,
-                column_id: 1.into(),
-                name: "id".to_owned(),
-                field_descs: Vec::new(),
-                type_name: "".to_owned()
-            },
+            CatColumnDesc::new_atomic(DataType::Int32, "id", 1),
             columns[0]
         );
 
         assert_eq!(
-            CatColumnDesc {
-                data_type: DataType::Varchar,
-                column_id: 2.into(),
-                name: "first_name".to_owned(),
-                field_descs: Vec::new(),
-                type_name: "".to_owned()
-            },
+            CatColumnDesc::new_atomic(DataType::Varchar, "first_name", 2),
             columns[1]
         );
 
         assert_eq!(
-            CatColumnDesc {
-                data_type: DataType::Varchar,
-                column_id: 3.into(),
-                name: "last_name".to_owned(),
-                field_descs: Vec::new(),
-                type_name: "".to_owned()
-            },
+            CatColumnDesc::new_atomic(DataType::Varchar, "last_name", 3),
             columns[2]
         );
 
         assert_eq!(
-            CatColumnDesc {
-                data_type: DataType::Varchar,
-                column_id: 4.into(),
-                name: "email".to_owned(),
-                field_descs: Vec::new(),
-                type_name: "".to_owned()
-            },
+            CatColumnDesc::new_atomic(DataType::Varchar, "email", 4),
             columns[3]
         );
     }
@@ -442,7 +418,7 @@ mod tests {
 
         let parser =
             DebeziumAvroParser::new(columns.clone(), config, Arc::new(Default::default()))?;
-        let [(op, row)]: [_; 1] = parse_one(parser, columns, DEBEZIUM_AVRO_DATA)
+        let [(op, row)]: [_; 1] = parse_one(parser, columns, DEBEZIUM_AVRO_DATA.to_vec())
             .await
             .try_into()
             .unwrap();
diff --git a/src/connector/src/parser/debezium/simd_json_parser.rs b/src/connector/src/parser/debezium/simd_json_parser.rs
index 8a0c5718bd51a..03fd48def96ec 100644
--- a/src/connector/src/parser/debezium/simd_json_parser.rs
+++ b/src/connector/src/parser/debezium/simd_json_parser.rs
@@ -57,11 +57,10 @@ impl DebeziumJsonParser {
     #[allow(clippy::unused_async)]
     pub async fn parse_inner(
         &self,
-        payload: &[u8],
+        mut payload: Vec<u8>,
         mut writer: SourceStreamChunkRowWriter<'_>,
     ) -> Result<WriteGuard> {
-        let mut payload_mut = payload.to_vec();
-        let event: BorrowedValue<'_> = simd_json::to_borrowed_value(&mut payload_mut)
+        let event: BorrowedValue<'_> = simd_json::to_borrowed_value(&mut payload)
             .map_err(|e| RwError::from(ProtocolError(e.to_string())))?;
 
         let payload = event
@@ -97,11 +96,11 @@ impl DebeziumJsonParser {
                 writer.update(|column| {
                     let before = simd_json_parse_value(
                         &column.data_type,
-                        before.get(column.name.to_ascii_lowercase().as_str()),
+                        before.get(column.name_in_lower_case.as_str()),
                     )?;
                     let after = simd_json_parse_value(
                         &column.data_type,
-                        after.get(column.name.to_ascii_lowercase().as_str()),
+                        after.get(column.name_in_lower_case.as_str()),
                     )?;
 
                     Ok((before, after))
@@ -120,7 +119,7 @@ impl DebeziumJsonParser {
                 writer.insert(|column| {
                     simd_json_parse_value(
                         &column.data_type,
-                        after.get(column.name.to_ascii_lowercase().as_str()),
+                        after.get(column.name_in_lower_case.as_str()),
                     )
                     .map_err(Into::into)
                 })
@@ -138,7 +137,7 @@ impl DebeziumJsonParser {
                 writer.delete(|column| {
                     simd_json_parse_value(
                         &column.data_type,
-                        before.get(column.name.to_ascii_lowercase().as_str()),
+                        before.get(column.name_in_lower_case.as_str()),
                     )
                     .map_err(Into::into)
                 })
@@ -160,9 +159,7 @@ mod tests {
     use risingwave_common::array::Op;
     use risingwave_common::catalog::ColumnId;
     use risingwave_common::row::{OwnedRow, Row};
-    use risingwave_common::types::{
-        DataType, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper, Scalar, ScalarImpl,
-    };
+    use risingwave_common::types::{DataType, Date, Scalar, ScalarImpl, Time, Timestamp};
     use serde_json::Value;
 
     use super::*;
@@ -216,7 +213,7 @@ mod tests {
     async fn parse_one(
         parser: DebeziumJsonParser,
         columns: Vec<SourceColumnDesc>,
-        payload: &[u8],
+        payload: Vec<u8>,
     ) -> Vec<(Op, OwnedRow)> {
         let mut builder = SourceStreamChunkBuilder::with_capacity(columns, 2);
         {
@@ -238,7 +235,10 @@ mod tests {
 
         let parser = DebeziumJsonParser::new(columns.clone(), Default::default()).unwrap();
 
-        let [(_op, row)]: [_; 1] = parse_one(parser, columns, data).await.try_into().unwrap();
+        let [(_op, row)]: [_; 1] = parse_one(parser, columns, data.to_vec())
+            .await
+            .try_into()
+            .unwrap();
 
         assert!(row[0].eq(&Some(ScalarImpl::Int64(111))));
         assert!(row[1].eq(&Some(ScalarImpl::Bool(true))));
@@ -248,22 +248,18 @@ mod tests {
         assert!(row[5].eq(&Some(ScalarImpl::Float64((-111.11111).into()))));
         assert!(row[6].eq(&Some(ScalarImpl::Decimal("-111.11".parse().unwrap()))));
         assert!(row[7].eq(&Some(ScalarImpl::Utf8("yes please".into()))));
-        assert!(row[8].eq(&Some(ScalarImpl::NaiveDate(NaiveDateWrapper::new(
+        assert!(row[8].eq(&Some(ScalarImpl::Date(Date::new(
             NaiveDate::from_ymd_opt(1000, 1, 1).unwrap()
         )))));
-        assert!(row[9].eq(&Some(ScalarImpl::NaiveTime(NaiveTimeWrapper::new(
+        assert!(row[9].eq(&Some(ScalarImpl::Time(Time::new(
             NaiveTime::from_hms_micro_opt(0, 0, 0, 0).unwrap()
         )))));
-        assert!(
-            row[10].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "1970-01-01T00:00:00".parse().unwrap()
-            ))))
-        );
-        assert!(
-            row[11].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "1970-01-01T00:00:01".parse().unwrap()
-            ))))
-        );
+        assert!(row[10].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "1970-01-01T00:00:00".parse().unwrap()
+        )))));
+        assert!(row[11].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "1970-01-01T00:00:01".parse().unwrap()
+        )))));
         assert_json_eq(&row[12], "{\"k1\": \"v1\", \"k2\": 11}");
     }
 
@@ -273,7 +269,10 @@ mod tests {
 
         let columns = get_test2_columns();
         let parser = DebeziumJsonParser::new(columns.clone(), Default::default()).unwrap();
-        let [(op, row)]: [_; 1] = parse_one(parser, columns, data).await.try_into().unwrap();
+        let [(op, row)]: [_; 1] = parse_one(parser, columns, data.to_vec())
+            .await
+            .try_into()
+            .unwrap();
         assert_eq!(op, Op::Insert);
 
         assert!(row[0].eq(&Some(ScalarImpl::Int64(111))));
@@ -284,22 +283,18 @@ mod tests {
         assert!(row[5].eq(&Some(ScalarImpl::Float64((-111.11111).into()))));
         assert!(row[6].eq(&Some(ScalarImpl::Decimal("-111.11".parse().unwrap()))));
         assert!(row[7].eq(&Some(ScalarImpl::Utf8("yes please".into()))));
-        assert!(row[8].eq(&Some(ScalarImpl::NaiveDate(NaiveDateWrapper::new(
+        assert!(row[8].eq(&Some(ScalarImpl::Date(Date::new(
             NaiveDate::from_ymd_opt(1000, 1, 1).unwrap()
         )))));
-        assert!(row[9].eq(&Some(ScalarImpl::NaiveTime(NaiveTimeWrapper::new(
+        assert!(row[9].eq(&Some(ScalarImpl::Time(Time::new(
             NaiveTime::from_hms_micro_opt(0, 0, 0, 0).unwrap()
         )))));
-        assert!(
-            row[10].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "1970-01-01T00:00:00".parse().unwrap()
-            ))))
-        );
-        assert!(
-            row[11].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "1970-01-01T00:00:01".parse().unwrap()
-            ))))
-        );
+        assert!(row[10].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "1970-01-01T00:00:00".parse().unwrap()
+        )))));
+        assert!(row[11].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "1970-01-01T00:00:01".parse().unwrap()
+        )))));
         assert_json_eq(&row[12], "{\"k1\": \"v1\", \"k2\": 11}");
     }
 
@@ -309,7 +304,10 @@ mod tests {
 
         let columns = get_test2_columns();
         let parser = DebeziumJsonParser::new(columns.clone(), Default::default()).unwrap();
-        let [(op, row)]: [_; 1] = parse_one(parser, columns, data).await.try_into().unwrap();
+        let [(op, row)]: [_; 1] = parse_one(parser, columns, data.to_vec())
+            .await
+            .try_into()
+            .unwrap();
 
         assert_eq!(op, Op::Delete);
 
@@ -321,22 +319,18 @@ mod tests {
         assert!(row[5].eq(&Some(ScalarImpl::Float64((333.33333).into()))));
         assert!(row[6].eq(&Some(ScalarImpl::Decimal("333.33".parse().unwrap()))));
         assert!(row[7].eq(&Some(ScalarImpl::Utf8("no thanks".into()))));
-        assert!(row[8].eq(&Some(ScalarImpl::NaiveDate(NaiveDateWrapper::new(
+        assert!(row[8].eq(&Some(ScalarImpl::Date(Date::new(
             NaiveDate::from_ymd_opt(9999, 12, 31).unwrap()
         )))));
-        assert!(row[9].eq(&Some(ScalarImpl::NaiveTime(NaiveTimeWrapper::new(
+        assert!(row[9].eq(&Some(ScalarImpl::Time(Time::new(
             NaiveTime::from_hms_micro_opt(23, 59, 59, 0).unwrap()
         )))));
-        assert!(
-            row[10].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "5138-11-16T09:46:39".parse().unwrap()
-            ))))
-        );
-        assert!(
-            row[11].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "2038-01-09T03:14:07".parse().unwrap()
-            ))))
-        );
+        assert!(row[10].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "5138-11-16T09:46:39".parse().unwrap()
+        )))));
+        assert!(row[11].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "2038-01-09T03:14:07".parse().unwrap()
+        )))));
         assert_json_eq(&row[12], "{\"k1\":\"v1_updated\",\"k2\":33}");
     }
 
@@ -347,8 +341,10 @@ mod tests {
         let columns = get_test2_columns();
 
         let parser = DebeziumJsonParser::new(columns.clone(), Default::default()).unwrap();
-        let [(op1, row1), (op2, row2)]: [_; 2] =
-            parse_one(parser, columns, data).await.try_into().unwrap();
+        let [(op1, row1), (op2, row2)]: [_; 2] = parse_one(parser, columns, data.to_vec())
+            .await
+            .try_into()
+            .unwrap();
 
         assert_eq!(op1, Op::UpdateDelete);
         assert_eq!(op2, Op::UpdateInsert);
@@ -361,26 +357,18 @@ mod tests {
         assert!(row1[5].eq(&Some(ScalarImpl::Float64((-111.11111).into()))));
         assert!(row1[6].eq(&Some(ScalarImpl::Decimal("-111.11".parse().unwrap()))));
         assert!(row1[7].eq(&Some(ScalarImpl::Utf8("yes please".into()))));
-        assert!(
-            row1[8].eq(&Some(ScalarImpl::NaiveDate(NaiveDateWrapper::new(
-                NaiveDate::from_ymd_opt(1000, 1, 1).unwrap()
-            ))))
-        );
-        assert!(
-            row1[9].eq(&Some(ScalarImpl::NaiveTime(NaiveTimeWrapper::new(
-                NaiveTime::from_hms_micro_opt(0, 0, 0, 0).unwrap()
-            ))))
-        );
-        assert!(
-            row1[10].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "1970-01-01T00:00:00".parse().unwrap()
-            ))))
-        );
-        assert!(
-            row1[11].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "1970-01-01T00:00:01".parse().unwrap()
-            ))))
-        );
+        assert!(row1[8].eq(&Some(ScalarImpl::Date(Date::new(
+            NaiveDate::from_ymd_opt(1000, 1, 1).unwrap()
+        )))));
+        assert!(row1[9].eq(&Some(ScalarImpl::Time(Time::new(
+            NaiveTime::from_hms_micro_opt(0, 0, 0, 0).unwrap()
+        )))));
+        assert!(row1[10].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "1970-01-01T00:00:00".parse().unwrap()
+        )))));
+        assert!(row1[11].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "1970-01-01T00:00:01".parse().unwrap()
+        )))));
         assert_json_eq(&row1[12], "{\"k1\": \"v1\", \"k2\": 11}");
 
         assert!(row2[0].eq(&Some(ScalarImpl::Int64(111))));
@@ -391,26 +379,18 @@ mod tests {
         assert!(row2[5].eq(&Some(ScalarImpl::Float64((333.33333).into()))));
         assert!(row2[6].eq(&Some(ScalarImpl::Decimal("333.33".parse().unwrap()))));
         assert!(row2[7].eq(&Some(ScalarImpl::Utf8("no thanks".into()))));
-        assert!(
-            row2[8].eq(&Some(ScalarImpl::NaiveDate(NaiveDateWrapper::new(
-                NaiveDate::from_ymd_opt(9999, 12, 31).unwrap()
-            ))))
-        );
-        assert!(
-            row2[9].eq(&Some(ScalarImpl::NaiveTime(NaiveTimeWrapper::new(
-                NaiveTime::from_hms_micro_opt(23, 59, 59, 0).unwrap()
-            ))))
-        );
-        assert!(
-            row2[10].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "5138-11-16T09:46:39".parse().unwrap()
-            ))))
-        );
-        assert!(
-            row2[11].eq(&Some(ScalarImpl::NaiveDateTime(NaiveDateTimeWrapper::new(
-                "2038-01-09T03:14:07".parse().unwrap()
-            ))))
-        );
+        assert!(row2[8].eq(&Some(ScalarImpl::Date(Date::new(
+            NaiveDate::from_ymd_opt(9999, 12, 31).unwrap()
+        )))));
+        assert!(row2[9].eq(&Some(ScalarImpl::Time(Time::new(
+            NaiveTime::from_hms_micro_opt(23, 59, 59, 0).unwrap()
+        )))));
+        assert!(row2[10].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "5138-11-16T09:46:39".parse().unwrap()
+        )))));
+        assert!(row2[11].eq(&Some(ScalarImpl::Timestamp(Timestamp::new(
+            "2038-01-09T03:14:07".parse().unwrap()
+        )))));
         assert_json_eq(&row2[12], "{\"k1\": \"v1_updated\", \"k2\": 33}");
     }
 
@@ -429,35 +409,50 @@ mod tests {
         let mut builder = SourceStreamChunkBuilder::with_capacity(columns, 2);
         // i64 overflow
         let data0 = br#"{"schema":{"type":"struct","fields":[{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"before"},{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"after"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"version"},{"type":"string","optional":false,"field":"connector"},{"type":"string","optional":false,"field":"name"},{"type":"int64","optional":false,"field":"ts_ms"},{"type":"string","optional":true,"name":"io.debezium.data.Enum","version":1,"parameters":{"allowed":"true,last,false,incremental"},"default":"false","field":"snapshot"},{"type":"string","optional":false,"field":"db"},{"type":"string","optional":true,"field":"sequence"},{"type":"string","optional":true,"field":"table"},{"type":"int64","optional":false,"field":"server_id"},{"type":"string","optional":true,"field":"gtid"},{"type":"string","optional":false,"field":"file"},{"type":"int64","optional":false,"field":"pos"},{"type":"int32","optional":false,"field":"row"},{"type":"int64","optional":true,"field":"thread"},{"type":"string","optional":true,"field":"query"}],"optional":false,"name":"io.debezium.connector.mysql.Source","field":"source"},{"type":"string","optional":false,"field":"op"},{"type":"int64","optional":true,"field":"ts_ms"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"id"},{"type":"int64","optional":false,"field":"total_order"},{"type":"int64","optional":false,"field":"data_collection_order"}],"optional":true,"field":"transaction"}],"optional":false,"name":"RW_CDC_test.orders.test.orders.Envelope"},"payload":{"before":null,"after":{"O_KEY":9223372036854775808,"O_BOOL":1,"O_TINY":33,"O_INT":444,"O_REAL":555.0,"O_DOUBLE":666.0},"source":{"version":"1.9.7.Final","connector":"mysql","name":"RW_CDC_test.orders","ts_ms":1678158055000,"snapshot":"false","db":"test","sequence":null,"table":"orders","server_id":223344,"gtid":null,"file":"mysql-bin.000003","pos":637,"row":0,"thread":4,"query":null},"op":"c","ts_ms":1678158055464,"transaction":null}}"#;
-        if let Err(e) = parser.parse_inner(data0, builder.row_writer()).await {
+        if let Err(e) = parser
+            .parse_inner(data0.to_vec(), builder.row_writer())
+            .await
+        {
             println!("{:?}", e.to_string());
         } else {
             panic!("the test case is expected fail");
         }
         // bool incorrect value
         let data1 = br#"{"schema":{"type":"struct","fields":[{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"before"},{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"after"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"version"},{"type":"string","optional":false,"field":"connector"},{"type":"string","optional":false,"field":"name"},{"type":"int64","optional":false,"field":"ts_ms"},{"type":"string","optional":true,"name":"io.debezium.data.Enum","version":1,"parameters":{"allowed":"true,last,false,incremental"},"default":"false","field":"snapshot"},{"type":"string","optional":false,"field":"db"},{"type":"string","optional":true,"field":"sequence"},{"type":"string","optional":true,"field":"table"},{"type":"int64","optional":false,"field":"server_id"},{"type":"string","optional":true,"field":"gtid"},{"type":"string","optional":false,"field":"file"},{"type":"int64","optional":false,"field":"pos"},{"type":"int32","optional":false,"field":"row"},{"type":"int64","optional":true,"field":"thread"},{"type":"string","optional":true,"field":"query"}],"optional":false,"name":"io.debezium.connector.mysql.Source","field":"source"},{"type":"string","optional":false,"field":"op"},{"type":"int64","optional":true,"field":"ts_ms"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"id"},{"type":"int64","optional":false,"field":"total_order"},{"type":"int64","optional":false,"field":"data_collection_order"}],"optional":true,"field":"transaction"}],"optional":false,"name":"RW_CDC_test.orders.test.orders.Envelope"},"payload":{"before":null,"after":{"O_KEY":111,"O_BOOL":2,"O_TINY":33,"O_INT":444,"O_REAL":555.0,"O_DOUBLE":666.0},"source":{"version":"1.9.7.Final","connector":"mysql","name":"RW_CDC_test.orders","ts_ms":1678158055000,"snapshot":"false","db":"test","sequence":null,"table":"orders","server_id":223344,"gtid":null,"file":"mysql-bin.000003","pos":637,"row":0,"thread":4,"query":null},"op":"c","ts_ms":1678158055464,"transaction":null}}"#;
-        if let Err(e) = parser.parse_inner(data1, builder.row_writer()).await {
+        if let Err(e) = parser
+            .parse_inner(data1.to_vec(), builder.row_writer())
+            .await
+        {
             println!("{:?}", e.to_string());
         } else {
             panic!("the test case is expected failed");
         }
         // i16 overflow
         let data2 = br#"{"schema":{"type":"struct","fields":[{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"before"},{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"after"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"version"},{"type":"string","optional":false,"field":"connector"},{"type":"string","optional":false,"field":"name"},{"type":"int64","optional":false,"field":"ts_ms"},{"type":"string","optional":true,"name":"io.debezium.data.Enum","version":1,"parameters":{"allowed":"true,last,false,incremental"},"default":"false","field":"snapshot"},{"type":"string","optional":false,"field":"db"},{"type":"string","optional":true,"field":"sequence"},{"type":"string","optional":true,"field":"table"},{"type":"int64","optional":false,"field":"server_id"},{"type":"string","optional":true,"field":"gtid"},{"type":"string","optional":false,"field":"file"},{"type":"int64","optional":false,"field":"pos"},{"type":"int32","optional":false,"field":"row"},{"type":"int64","optional":true,"field":"thread"},{"type":"string","optional":true,"field":"query"}],"optional":false,"name":"io.debezium.connector.mysql.Source","field":"source"},{"type":"string","optional":false,"field":"op"},{"type":"int64","optional":true,"field":"ts_ms"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"id"},{"type":"int64","optional":false,"field":"total_order"},{"type":"int64","optional":false,"field":"data_collection_order"}],"optional":true,"field":"transaction"}],"optional":false,"name":"RW_CDC_test.orders.test.orders.Envelope"},"payload":{"before":null,"after":{"O_KEY":111,"O_BOOL":1,"O_TINY":32768,"O_INT":444,"O_REAL":555.0,"O_DOUBLE":666.0},"source":{"version":"1.9.7.Final","connector":"mysql","name":"RW_CDC_test.orders","ts_ms":1678158055000,"snapshot":"false","db":"test","sequence":null,"table":"orders","server_id":223344,"gtid":null,"file":"mysql-bin.000003","pos":637,"row":0,"thread":4,"query":null},"op":"c","ts_ms":1678158055464,"transaction":null}}"#;
-        if let Err(e) = parser.parse_inner(data2, builder.row_writer()).await {
+        if let Err(e) = parser
+            .parse_inner(data2.to_vec(), builder.row_writer())
+            .await
+        {
             println!("{:?}", e.to_string());
         } else {
             panic!("the test case is expected to fail");
         }
         // i32 overflow
         let data3 = br#"{"schema":{"type":"struct","fields":[{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"before"},{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"after"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"version"},{"type":"string","optional":false,"field":"connector"},{"type":"string","optional":false,"field":"name"},{"type":"int64","optional":false,"field":"ts_ms"},{"type":"string","optional":true,"name":"io.debezium.data.Enum","version":1,"parameters":{"allowed":"true,last,false,incremental"},"default":"false","field":"snapshot"},{"type":"string","optional":false,"field":"db"},{"type":"string","optional":true,"field":"sequence"},{"type":"string","optional":true,"field":"table"},{"type":"int64","optional":false,"field":"server_id"},{"type":"string","optional":true,"field":"gtid"},{"type":"string","optional":false,"field":"file"},{"type":"int64","optional":false,"field":"pos"},{"type":"int32","optional":false,"field":"row"},{"type":"int64","optional":true,"field":"thread"},{"type":"string","optional":true,"field":"query"}],"optional":false,"name":"io.debezium.connector.mysql.Source","field":"source"},{"type":"string","optional":false,"field":"op"},{"type":"int64","optional":true,"field":"ts_ms"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"id"},{"type":"int64","optional":false,"field":"total_order"},{"type":"int64","optional":false,"field":"data_collection_order"}],"optional":true,"field":"transaction"}],"optional":false,"name":"RW_CDC_test.orders.test.orders.Envelope"},"payload":{"before":null,"after":{"O_KEY":111,"O_BOOL":1,"O_TINY":33,"O_INT":2147483648,"O_REAL":555.0,"O_DOUBLE":666.0},"source":{"version":"1.9.7.Final","connector":"mysql","name":"RW_CDC_test.orders","ts_ms":1678158055000,"snapshot":"false","db":"test","sequence":null,"table":"orders","server_id":223344,"gtid":null,"file":"mysql-bin.000003","pos":637,"row":0,"thread":4,"query":null},"op":"c","ts_ms":1678158055464,"transaction":null}}"#;
-        if let Err(e) = parser.parse_inner(data3, builder.row_writer()).await {
+        if let Err(e) = parser
+            .parse_inner(data3.to_vec(), builder.row_writer())
+            .await
+        {
             println!("{:?}", e.to_string());
         } else {
             panic!("the test case is expected to fail");
         }
         // float32 overflow
         let data4 = br#"{"schema":{"type":"struct","fields":[{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"before"},{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_KEY"},{"type":"int16","optional":true,"field":"O_BOOL"},{"type":"int16","optional":true,"field":"O_TINY"},{"type":"int32","optional":true,"field":"O_INT"},{"type":"double","optional":true,"field":"O_REAL"},{"type":"double","optional":true,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"after"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"version"},{"type":"string","optional":false,"field":"connector"},{"type":"string","optional":false,"field":"name"},{"type":"int64","optional":false,"field":"ts_ms"},{"type":"string","optional":true,"name":"io.debezium.data.Enum","version":1,"parameters":{"allowed":"true,last,false,incremental"},"default":"false","field":"snapshot"},{"type":"string","optional":false,"field":"db"},{"type":"string","optional":true,"field":"sequence"},{"type":"string","optional":true,"field":"table"},{"type":"int64","optional":false,"field":"server_id"},{"type":"string","optional":true,"field":"gtid"},{"type":"string","optional":false,"field":"file"},{"type":"int64","optional":false,"field":"pos"},{"type":"int32","optional":false,"field":"row"},{"type":"int64","optional":true,"field":"thread"},{"type":"string","optional":true,"field":"query"}],"optional":false,"name":"io.debezium.connector.mysql.Source","field":"source"},{"type":"string","optional":false,"field":"op"},{"type":"int64","optional":true,"field":"ts_ms"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"id"},{"type":"int64","optional":false,"field":"total_order"},{"type":"int64","optional":false,"field":"data_collection_order"}],"optional":true,"field":"transaction"}],"optional":false,"name":"RW_CDC_test.orders.test.orders.Envelope"},"payload":{"before":null,"after":{"O_KEY":111,"O_BOOL":1,"O_TINY":33,"O_INT":444,"O_REAL":3.80282347E38,"O_DOUBLE":666.0},"source":{"version":"1.9.7.Final","connector":"mysql","name":"RW_CDC_test.orders","ts_ms":1678158055000,"snapshot":"false","db":"test","sequence":null,"table":"orders","server_id":223344,"gtid":null,"file":"mysql-bin.000003","pos":637,"row":0,"thread":4,"query":null},"op":"c","ts_ms":1678158055464,"transaction":null}}"#;
-        if let Err(e) = parser.parse_inner(data4, builder.row_writer()).await {
+        if let Err(e) = parser
+            .parse_inner(data4.to_vec(), builder.row_writer())
+            .await
+        {
             println!("{:?}", e.to_string());
         } else {
             panic!("the test case is expected to fail");
@@ -477,7 +472,10 @@ mod tests {
         let parser = DebeziumJsonParser::new(columns.clone(), Default::default()).unwrap();
         let mut builder = SourceStreamChunkBuilder::with_capacity(columns, 2);
         let data = br#"{"schema":{"type":"struct","fields":[{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"before"},{"type":"struct","fields":[{"type":"int64","optional":false,"field":"O_DOUBLE"}],"optional":true,"name":"RW_CDC_test.orders.test.orders.Value","field":"after"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"version"},{"type":"string","optional":false,"field":"connector"},{"type":"string","optional":false,"field":"name"},{"type":"int64","optional":false,"field":"ts_ms"},{"type":"string","optional":true,"name":"io.debezium.data.Enum","version":1,"parameters":{"allowed":"true,last,false,incremental"},"default":"false","field":"snapshot"},{"type":"string","optional":false,"field":"db"},{"type":"string","optional":true,"field":"sequence"},{"type":"string","optional":true,"field":"table"},{"type":"int64","optional":false,"field":"server_id"},{"type":"string","optional":true,"field":"gtid"},{"type":"string","optional":false,"field":"file"},{"type":"int64","optional":false,"field":"pos"},{"type":"int32","optional":false,"field":"row"},{"type":"int64","optional":true,"field":"thread"},{"type":"string","optional":true,"field":"query"}],"optional":false,"name":"io.debezium.connector.mysql.Source","field":"source"},{"type":"string","optional":false,"field":"op"},{"type":"int64","optional":true,"field":"ts_ms"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"id"},{"type":"int64","optional":false,"field":"total_order"},{"type":"int64","optional":false,"field":"data_collection_order"}],"optional":true,"field":"transaction"}],"optional":false,"name":"RW_CDC_test.orders.test.orders.Envelope"},"payload":{"before":null,"after":{"O_DOUBLE":1.797695E308},"source":{"version":"1.9.7.Final","connector":"mysql","name":"RW_CDC_test.orders","ts_ms":1678174483000,"snapshot":"false","db":"test","sequence":null,"table":"orders","server_id":223344,"gtid":null,"file":"mysql-bin.000003","pos":563,"row":0,"thread":3,"query":null},"op":"c","ts_ms":1678174483866,"transaction":null}}"#;
-        if let Err(e) = parser.parse_inner(data, builder.row_writer()).await {
+        if let Err(e) = parser
+            .parse_inner(data.to_vec(), builder.row_writer())
+            .await
+        {
             println!("{:?}", e.to_string());
         } else {
             panic!("the test case is expected to fail");
@@ -499,7 +497,10 @@ mod tests {
 
         let parser = DebeziumJsonParser::new(columns.clone(), Default::default()).unwrap();
 
-        let [(_op, row)]: [_; 1] = parse_one(parser, columns, data).await.try_into().unwrap();
+        let [(_op, row)]: [_; 1] = parse_one(parser, columns, data.to_vec())
+            .await
+            .try_into()
+            .unwrap();
 
         assert!(row[0].eq(&Some(ScalarImpl::Int32(101))));
         assert!(row[1].eq(&Some(ScalarImpl::Utf8("scooter".into()))));
@@ -520,7 +521,10 @@ mod tests {
 
         let columns = get_test1_columns();
         let parser = DebeziumJsonParser::new(columns.clone(), Default::default()).unwrap();
-        let [(op, row)]: [_; 1] = parse_one(parser, columns, data).await.try_into().unwrap();
+        let [(op, row)]: [_; 1] = parse_one(parser, columns, data.to_vec())
+            .await
+            .try_into()
+            .unwrap();
         assert_eq!(op, Op::Insert);
 
         assert!(row[0].eq(&Some(ScalarImpl::Int32(102))));
@@ -542,7 +546,10 @@ mod tests {
 
         let columns = get_test1_columns();
         let parser = DebeziumJsonParser::new(columns.clone(), Default::default()).unwrap();
-        let [(op, row)]: [_; 1] = parse_one(parser, columns, data).await.try_into().unwrap();
+        let [(op, row)]: [_; 1] = parse_one(parser, columns, data.to_vec())
+            .await
+            .try_into()
+            .unwrap();
 
         assert_eq!(op, Op::Delete);
 
@@ -571,8 +578,10 @@ mod tests {
         let columns = get_test1_columns();
 
         let parser = DebeziumJsonParser::new(columns.clone(), Default::default()).unwrap();
-        let [(op1, row1), (op2, row2)]: [_; 2] =
-            parse_one(parser, columns, data).await.try_into().unwrap();
+        let [(op1, row1), (op2, row2)]: [_; 2] = parse_one(parser, columns, data.to_vec())
+            .await
+            .try_into()
+            .unwrap();
 
         assert_eq!(op1, Op::UpdateDelete);
         assert_eq!(op2, Op::UpdateInsert);
@@ -605,7 +614,7 @@ mod tests {
 
         let mut builder = SourceStreamChunkBuilder::with_capacity(columns, 2);
         let writer = builder.row_writer();
-        if let Err(e) = parser.parse_inner(data, writer).await {
+        if let Err(e) = parser.parse_inner(data.to_vec(), writer).await {
             println!("{:?}", e.to_string());
         } else {
             panic!("the test case is expected to be failed");
diff --git a/src/connector/src/parser/json_parser.rs b/src/connector/src/parser/json_parser.rs
index 81e73cb49f03b..7dacc2ddd1e5e 100644
--- a/src/connector/src/parser/json_parser.rs
+++ b/src/connector/src/parser/json_parser.rs
@@ -69,21 +69,18 @@ impl JsonParser {
         writer: &mut SourceStreamChunkRowWriter<'_>,
     ) -> Result<WriteGuard> {
         writer.insert(|desc| {
-            simd_json_parse_value(
-                &desc.data_type,
-                value.get(desc.name.to_ascii_lowercase().as_str()),
-            )
-            .map_err(|e| {
-                tracing::error!("failed to process value ({}): {}", value, e);
-                e.into()
-            })
+            simd_json_parse_value(&desc.data_type, value.get(desc.name_in_lower_case.as_str()))
+                .map_err(|e| {
+                    tracing::error!("failed to process value ({}): {}", value, e);
+                    e.into()
+                })
         })
     }
 
     #[allow(clippy::unused_async)]
     pub async fn parse_inner(
         &self,
-        payload: &[u8],
+        payload: Vec<u8>,
         mut writer: SourceStreamChunkRowWriter<'_>,
     ) -> Result<WriteGuard> {
         enum Op {
@@ -91,20 +88,18 @@ impl JsonParser {
             Delete,
         }
 
-        let (_payload, op) = if self.enable_upsert {
-            let msg: UpsertMessage<'_> = bincode::deserialize(payload)
+        let (mut payload_mut, op) = if self.enable_upsert {
+            let msg: UpsertMessage<'_> = bincode::deserialize(&payload)
                 .map_err(|e| RwError::from(ProtocolError(e.to_string())))?;
             if !msg.record.is_empty() {
-                (msg.record, Op::Insert)
+                (msg.record.to_vec(), Op::Insert)
             } else {
-                (msg.primary_key, Op::Delete)
+                (msg.primary_key.to_vec(), Op::Delete)
             }
         } else {
-            (payload.into(), Op::Insert)
+            (payload, Op::Insert)
         };
 
-        let mut payload_mut = _payload.to_vec();
-
         let value: BorrowedValue<'_> = simd_json::to_borrowed_value(&mut payload_mut)
             .map_err(|e| RwError::from(ProtocolError(e.to_string())))?;
 
@@ -119,12 +114,11 @@ impl JsonParser {
             let fill_fn = |desc: &SourceColumnDesc| {
                 simd_json_parse_value(
                     &desc.data_type,
-                    value.get(desc.name.to_ascii_lowercase().as_str()),
+                    value.get(desc.name_in_lower_case.as_str()),
                 )
                 .map_err(|e| {
                     tracing::error!(
-                        "failed to process value ({}): {}",
-                        String::from_utf8_lossy(payload),
+                        "failed to process value: {}",
                         e
                     );
                     e.into()
@@ -154,20 +148,20 @@ mod tests {
     use crate::common::UpsertMessage;
     use crate::parser::{JsonParser, SourceColumnDesc, SourceStreamChunkBuilder};
 
-    fn get_payload() -> Vec<&'static [u8]> {
+    fn get_payload() -> Vec<Vec<u8>> {
         vec![
-            br#"{"i32":1,"bool":true,"i16":1,"i64":12345678,"f32":1.23,"f64":1.2345,"varchar":"varchar","date":"2021-01-01","timestamp":"2021-01-01 16:06:12.269","decimal":12345.67890}"#.as_slice(),
-            br#"{"i32":1,"f32":12345e+10,"f64":12345,"decimal":12345}"#.as_slice(),
+            br#"{"i32":1,"bool":true,"i16":1,"i64":12345678,"f32":1.23,"f64":1.2345,"varchar":"varchar","date":"2021-01-01","timestamp":"2021-01-01 16:06:12.269","decimal":12345.67890}"#.to_vec(),
+            br#"{"i32":1,"f32":12345e+10,"f64":12345,"decimal":12345}"#.to_vec(),
         ]
     }
 
-    fn get_array_top_level_payload() -> Vec<&'static [u8]> {
+    fn get_array_top_level_payload() -> Vec<Vec<u8>> {
         vec![
-            br#"[{"i32":1,"bool":true,"i16":1,"i64":12345678,"f32":1.23,"f64":1.2345,"varchar":"varchar","date":"2021-01-01","timestamp":"2021-01-01 16:06:12.269","decimal":12345.67890}, {"i32":1,"f32":12345e+10,"f64":12345,"decimal":12345}]"#.as_slice()
+            br#"[{"i32":1,"bool":true,"i16":1,"i64":12345678,"f32":1.23,"f64":1.2345,"varchar":"varchar","date":"2021-01-01","timestamp":"2021-01-01 16:06:12.269","decimal":12345.67890}, {"i32":1,"f32":12345e+10,"f64":12345,"decimal":12345}]"#.to_vec()
         ]
     }
 
-    async fn test_json_parser(get_payload: fn() -> Vec<&'static [u8]>) {
+    async fn test_json_parser(get_payload: fn() -> Vec<Vec<u8>>) {
         let descs = vec![
             SourceColumnDesc::simple("i32", DataType::Int32, 0.into()),
             SourceColumnDesc::simple("bool", DataType::Boolean, 2.into()),
@@ -224,11 +218,11 @@ mod tests {
             );
             assert_eq!(
                 row.datum_at(7).to_owned_datum(),
-                (Some(ScalarImpl::NaiveDate(str_to_date("2021-01-01").unwrap())))
+                (Some(ScalarImpl::Date(str_to_date("2021-01-01").unwrap())))
             );
             assert_eq!(
                 row.datum_at(8).to_owned_datum(),
-                (Some(ScalarImpl::NaiveDateTime(
+                (Some(ScalarImpl::Timestamp(
                     str_to_timestamp("2021-01-01 16:06:12.269").unwrap()
                 )))
             );
@@ -286,7 +280,7 @@ mod tests {
         // Parse a correct record.
         {
             let writer = builder.row_writer();
-            let payload = br#"{"v1": 1, "v2": 2, "v3": "3"}"#;
+            let payload = br#"{"v1": 1, "v2": 2, "v3": "3"}"#.to_vec();
             parser.parse_inner(payload, writer).await.unwrap();
         }
 
@@ -294,14 +288,14 @@ mod tests {
         {
             let writer = builder.row_writer();
             // `v2` overflowed.
-            let payload = br#"{"v1": 1, "v2": 65536, "v3": "3"}"#;
+            let payload = br#"{"v1": 1, "v2": 65536, "v3": "3"}"#.to_vec();
             parser.parse_inner(payload, writer).await.unwrap_err();
         }
 
         // Parse a correct record.
         {
             let writer = builder.row_writer();
-            let payload = br#"{"v1": 1, "v2": 2, "v3": "3"}"#;
+            let payload = br#"{"v1": 1, "v2": 2, "v3": "3"}"#.to_vec();
             parser.parse_inner(payload, writer).await.unwrap();
         }
 
@@ -357,7 +351,7 @@ mod tests {
                 "username": "Dooley5659"
             }
         }
-        "#;
+        "#.to_vec();
         let mut builder = SourceStreamChunkBuilder::with_capacity(descs, 1);
         {
             let writer = builder.row_writer();
@@ -370,7 +364,7 @@ mod tests {
 
         let expected = vec![
             Some(ScalarImpl::Struct(StructValue::new(vec![
-                Some(ScalarImpl::NaiveDateTime(
+                Some(ScalarImpl::Timestamp(
                     str_to_timestamp("2022-07-13 20:48:37.07").unwrap()
                 )),
                 Some(ScalarImpl::Utf8("1732524418112319151".into())),
@@ -378,7 +372,7 @@ mod tests {
                 Some(ScalarImpl::Utf8("English".into())),
             ]))),
             Some(ScalarImpl::Struct(StructValue::new(vec![
-                Some(ScalarImpl::NaiveDateTime(
+                Some(ScalarImpl::Timestamp(
                     str_to_timestamp("2018-01-29 12:19:11.07").unwrap()
                 )),
                 Some(ScalarImpl::Utf8("7772634297".into())),
@@ -390,7 +384,7 @@ mod tests {
     }
     #[tokio::test]
     async fn test_json_upsert_parser() {
-        let items = &[
+        let items = [
             (r#"{"a":1}"#, r#"{"a":1,"b":2}"#),
             (r#"{"a":1}"#, r#"{"a":1,"b":3}"#),
             (r#"{"a":2}"#, r#"{"a":2,"b":2}"#),
@@ -402,7 +396,8 @@ mod tests {
                 record: v.as_bytes().into(),
             })
             .unwrap()
-        });
+        })
+        .to_vec();
         let descs = vec![
             SourceColumnDesc::simple("a", DataType::Int32, 0.into()),
             SourceColumnDesc::simple("b", DataType::Int32, 1.into()),
diff --git a/src/connector/src/parser/maxwell/simd_json_parser.rs b/src/connector/src/parser/maxwell/simd_json_parser.rs
index 18c69a8ff3eea..c4b6ad0aded0b 100644
--- a/src/connector/src/parser/maxwell/simd_json_parser.rs
+++ b/src/connector/src/parser/maxwell/simd_json_parser.rs
@@ -48,11 +48,10 @@ impl MaxwellParser {
     #[allow(clippy::unused_async)]
     pub async fn parse_inner(
         &self,
-        payload: &[u8],
+        mut payload: Vec<u8>,
         mut writer: SourceStreamChunkRowWriter<'_>,
     ) -> Result<WriteGuard> {
-        let mut payload_mut = payload.to_vec();
-        let event: BorrowedValue<'_> = simd_json::to_borrowed_value(&mut payload_mut)
+        let event: BorrowedValue<'_> = simd_json::to_borrowed_value(&mut payload)
             .map_err(|e| RwError::from(ProtocolError(e.to_string())))?;
 
         let op = event.get(OP).and_then(|v| v.as_str()).ok_or_else(|| {
@@ -71,7 +70,7 @@ impl MaxwellParser {
                 writer.insert(|column| {
                     simd_json_parse_value(
                         &column.data_type,
-                        after.get(column.name.to_ascii_lowercase().as_str()),
+                        after.get(column.name_in_lower_case.as_str()),
                     )
                     .map_err(Into::into)
                 })
@@ -90,13 +89,10 @@ impl MaxwellParser {
 
                 writer.update(|column| {
                     // old only contains the changed columns but data contains all columns.
-                    let col_name_lc = column.name.to_ascii_lowercase();
-                    let before_value = before
-                        .get(col_name_lc.as_str())
-                        .or_else(|| after.get(col_name_lc.as_str()));
+                    let col_name_lc = column.name_in_lower_case.as_str();
+                    let before_value = before.get(col_name_lc).or_else(|| after.get(col_name_lc));
                     let before = simd_json_parse_value(&column.data_type, before_value)?;
-                    let after =
-                        simd_json_parse_value(&column.data_type, after.get(col_name_lc.as_str()))?;
+                    let after = simd_json_parse_value(&column.data_type, after.get(col_name_lc))?;
                     Ok((before, after))
                 })
             }
@@ -107,7 +103,7 @@ impl MaxwellParser {
                 writer.delete(|column| {
                     simd_json_parse_value(
                         &column.data_type,
-                        before.get(column.name.to_ascii_lowercase().as_str()),
+                        before.get(column.name_in_lower_case.as_str()),
                     )
                     .map_err(Into::into)
                 })
@@ -142,9 +138,9 @@ mod tests {
 
         let mut builder = SourceStreamChunkBuilder::with_capacity(descs, 4);
         let payloads = vec![
-            br#"{"database":"test","table":"t","type":"insert","ts":1666937996,"xid":1171,"commit":true,"data":{"id":1,"name":"tom","is_adult":0,"birthday":"2017-12-31 16:00:01"}}"#.as_slice(),
-            br#"{"database":"test","table":"t","type":"insert","ts":1666938023,"xid":1254,"commit":true,"data":{"id":2,"name":"alex","is_adult":1,"birthday":"1999-12-31 16:00:01"}}"#.as_slice(),
-            br#"{"database":"test","table":"t","type":"update","ts":1666938068,"xid":1373,"commit":true,"data":{"id":2,"name":"chi","is_adult":1,"birthday":"1999-12-31 16:00:01"},"old":{"name":"alex"}}"#.as_slice()
+            br#"{"database":"test","table":"t","type":"insert","ts":1666937996,"xid":1171,"commit":true,"data":{"id":1,"name":"tom","is_adult":0,"birthday":"2017-12-31 16:00:01"}}"#.to_vec(),
+            br#"{"database":"test","table":"t","type":"insert","ts":1666938023,"xid":1254,"commit":true,"data":{"id":2,"name":"alex","is_adult":1,"birthday":"1999-12-31 16:00:01"}}"#.to_vec(),
+            br#"{"database":"test","table":"t","type":"update","ts":1666938068,"xid":1373,"commit":true,"data":{"id":2,"name":"chi","is_adult":1,"birthday":"1999-12-31 16:00:01"},"old":{"name":"alex"}}"#.to_vec()
         ];
 
         for payload in payloads {
@@ -170,7 +166,7 @@ mod tests {
             );
             assert_eq!(
                 row.datum_at(3).to_owned_datum(),
-                (Some(ScalarImpl::NaiveDateTime(
+                (Some(ScalarImpl::Timestamp(
                     str_to_timestamp("2017-12-31 16:00:01").unwrap()
                 )))
             )
@@ -190,7 +186,7 @@ mod tests {
             );
             assert_eq!(
                 row.datum_at(3).to_owned_datum(),
-                (Some(ScalarImpl::NaiveDateTime(
+                (Some(ScalarImpl::Timestamp(
                     str_to_timestamp("1999-12-31 16:00:01").unwrap()
                 )))
             )
@@ -210,7 +206,7 @@ mod tests {
             );
             assert_eq!(
                 row.datum_at(3).to_owned_datum(),
-                (Some(ScalarImpl::NaiveDateTime(
+                (Some(ScalarImpl::Timestamp(
                     str_to_timestamp("1999-12-31 16:00:01").unwrap()
                 )))
             )
@@ -230,7 +226,7 @@ mod tests {
             );
             assert_eq!(
                 row.datum_at(3).to_owned_datum(),
-                (Some(ScalarImpl::NaiveDateTime(
+                (Some(ScalarImpl::Timestamp(
                     str_to_timestamp("1999-12-31 16:00:01").unwrap()
                 )))
             )
diff --git a/src/connector/src/parser/mod.rs b/src/connector/src/parser/mod.rs
index b995d511e9277..4238edb31ae3d 100644
--- a/src/connector/src/parser/mod.rs
+++ b/src/connector/src/parser/mod.rs
@@ -197,7 +197,7 @@ impl SourceStreamChunkRowWriter<'_> {
         &mut self,
         mut f: impl FnMut(&SourceColumnDesc) -> Result<A::Output>,
     ) -> Result<WriteGuard> {
-        let mut modify_col = vec![];
+        let mut modify_col = Vec::with_capacity(self.descs.len());
         self.descs
             .iter()
             .zip_eq(self.builders.iter_mut())
diff --git a/src/connector/src/parser/protobuf/parser.rs b/src/connector/src/parser/protobuf/parser.rs
index 0fa3ea870a3cf..7e7cdcae04674 100644
--- a/src/connector/src/parser/protobuf/parser.rs
+++ b/src/connector/src/parser/protobuf/parser.rs
@@ -24,7 +24,7 @@ use prost_reflect::{
 use risingwave_common::array::{ListValue, StructValue};
 use risingwave_common::error::ErrorCode::{InternalError, NotImplemented, ProtocolError};
 use risingwave_common::error::{Result, RwError};
-use risingwave_common::types::{DataType, Datum, Decimal, OrderedF32, OrderedF64, ScalarImpl};
+use risingwave_common::types::{DataType, Datum, Decimal, ScalarImpl, F32, F64};
 use risingwave_pb::plan_common::ColumnDesc;
 use url::Url;
 
@@ -154,6 +154,7 @@ impl ProtobufParserConfig {
                 column_type: Some(field_type.to_protobuf()),
                 field_descs,
                 type_name: m.full_name().to_string(),
+                generated_column: None,
             })
         } else {
             *index += 1;
@@ -188,13 +189,14 @@ impl ProtobufParser {
     #[allow(clippy::unused_async)]
     pub async fn parse_inner(
         &self,
-        mut payload: &[u8],
+        payload: Vec<u8>,
         mut writer: SourceStreamChunkRowWriter<'_>,
     ) -> Result<WriteGuard> {
-        if self.confluent_wire_type {
-            let raw_payload = resolve_pb_header(payload)?;
-            payload = raw_payload;
-        }
+        let payload = if self.confluent_wire_type {
+            resolve_pb_header(&payload)?
+        } else {
+            &payload
+        };
 
         let message = DynamicMessage::decode(self.message_descriptor.clone(), payload)
             .map_err(|e| ProtocolError(format!("parse message failed: {}", e)))?;
@@ -227,8 +229,8 @@ fn from_protobuf_value(field_desc: &FieldDescriptor, value: &Value) -> Result<Da
         Value::U32(i) => ScalarImpl::Int64(*i as i64),
         Value::I64(i) => ScalarImpl::Int64(*i),
         Value::U64(i) => ScalarImpl::Decimal(Decimal::from(*i)),
-        Value::F32(f) => ScalarImpl::Float32(OrderedF32::from(*f)),
-        Value::F64(f) => ScalarImpl::Float64(OrderedF64::from(*f)),
+        Value::F32(f) => ScalarImpl::Float32(F32::from(*f)),
+        Value::F64(f) => ScalarImpl::Float64(F64::from(*f)),
         Value::String(s) => ScalarImpl::Utf8(s.as_str().into()),
         Value::EnumNumber(idx) => {
             let kind = field_desc.kind();
@@ -341,7 +343,7 @@ mod test {
 
     use std::path::PathBuf;
 
-    use risingwave_pb::data::data_type::TypeName as ProstTypeName;
+    use risingwave_pb::data::data_type::PbTypeName;
 
     use super::*;
 
@@ -413,35 +415,29 @@ mod test {
         assert_eq!(columns[2].name, "timestamp".to_string());
 
         let data_type = columns[3].column_type.as_ref().unwrap();
-        assert_eq!(data_type.get_type_name().unwrap(), ProstTypeName::List);
+        assert_eq!(data_type.get_type_name().unwrap(), PbTypeName::List);
         let inner_field_type = data_type.field_type.clone();
         assert_eq!(
             inner_field_type[0].get_type_name().unwrap(),
-            ProstTypeName::Struct
+            PbTypeName::Struct
         );
         let struct_inner = inner_field_type[0].field_type.clone();
-        assert_eq!(
-            struct_inner[0].get_type_name().unwrap(),
-            ProstTypeName::Int32
-        );
-        assert_eq!(
-            struct_inner[1].get_type_name().unwrap(),
-            ProstTypeName::Int32
-        );
+        assert_eq!(struct_inner[0].get_type_name().unwrap(), PbTypeName::Int32);
+        assert_eq!(struct_inner[1].get_type_name().unwrap(), PbTypeName::Int32);
         assert_eq!(
             struct_inner[2].get_type_name().unwrap(),
-            ProstTypeName::Varchar
+            PbTypeName::Varchar
         );
 
         assert_eq!(columns[4].name, "contacts".to_string());
         let inner_field_type = columns[4].column_type.as_ref().unwrap().field_type.clone();
         assert_eq!(
             inner_field_type[0].get_type_name().unwrap(),
-            ProstTypeName::List
+            PbTypeName::List
         );
         assert_eq!(
             inner_field_type[1].get_type_name().unwrap(),
-            ProstTypeName::List
+            PbTypeName::List
         );
         Ok(())
     }
diff --git a/src/connector/src/sink/catalog/desc.rs b/src/connector/src/sink/catalog/desc.rs
index 7b975081c02a9..6f0cd2da6c355 100644
--- a/src/connector/src/sink/catalog/desc.rs
+++ b/src/connector/src/sink/catalog/desc.rs
@@ -17,8 +17,8 @@ use std::collections::BTreeMap;
 use itertools::Itertools;
 use risingwave_common::catalog::{ColumnCatalog, DatabaseId, SchemaId, TableId, UserId};
 use risingwave_common::util::sort_util::ColumnOrder;
-use risingwave_pb::plan_common::ColumnDesc as ProstColumnDesc;
-use risingwave_pb::stream_plan::SinkDesc as ProstSinkDesc;
+use risingwave_pb::plan_common::PbColumnDesc;
+use risingwave_pb::stream_plan::PbSinkDesc;
 
 use super::{SinkCatalog, SinkId, SinkType};
 
@@ -36,12 +36,11 @@ pub struct SinkDesc {
     /// All columns of the sink. Note that this is NOT sorted by columnId in the vector.
     pub columns: Vec<ColumnCatalog>,
 
-    /// Primiary keys of the sink (connector). Now the sink does not care about a field's
-    /// order (ASC/DESC).
-    pub pk: Vec<ColumnOrder>,
+    /// Primiary keys of the sink. Derived by the frontend.
+    pub plan_pk: Vec<ColumnOrder>,
 
-    /// Primary key indices of the corresponding sink operator's output.
-    pub stream_key: Vec<usize>,
+    /// User-defined primary key indices for upsert sink.
+    pub downstream_pk: Vec<usize>,
 
     /// Distribution key indices of the sink. For example, if `distribution_key = [1, 2]`, then the
     /// distribution keys will be `columns[1]` and `columns[2]`.
@@ -71,8 +70,8 @@ impl SinkDesc {
             name: self.name,
             definition: self.definition,
             columns: self.columns,
-            pk: self.pk,
-            stream_key: self.stream_key,
+            plan_pk: self.plan_pk,
+            downstream_pk: self.downstream_pk,
             distribution_key: self.distribution_key,
             owner,
             dependent_relations,
@@ -81,18 +80,18 @@ impl SinkDesc {
         }
     }
 
-    pub fn to_proto(&self) -> ProstSinkDesc {
-        ProstSinkDesc {
+    pub fn to_proto(&self) -> PbSinkDesc {
+        PbSinkDesc {
             id: self.id.sink_id,
             name: self.name.clone(),
             definition: self.definition.clone(),
             columns: self
                 .columns
                 .iter()
-                .map(|column| Into::<ProstColumnDesc>::into(&column.column_desc))
+                .map(|column| Into::<PbColumnDesc>::into(&column.column_desc))
                 .collect_vec(),
-            pk: self.pk.iter().map(|k| k.to_protobuf()).collect_vec(),
-            stream_key: self.stream_key.iter().map(|idx| *idx as _).collect_vec(),
+            plan_pk: self.plan_pk.iter().map(|k| k.to_protobuf()).collect_vec(),
+            downstream_pk: self.downstream_pk.iter().map(|idx| *idx as _).collect_vec(),
             distribution_key: self.distribution_key.iter().map(|k| *k as _).collect_vec(),
             properties: self.properties.clone().into_iter().collect(),
             sink_type: self.sink_type.to_proto() as i32,
diff --git a/src/connector/src/sink/catalog/mod.rs b/src/connector/src/sink/catalog/mod.rs
index dbcca4ca5a50f..e834a8747178b 100644
--- a/src/connector/src/sink/catalog/mod.rs
+++ b/src/connector/src/sink/catalog/mod.rs
@@ -21,7 +21,7 @@ use risingwave_common::catalog::{
     ColumnCatalog, DatabaseId, Field, Schema, SchemaId, TableId, UserId,
 };
 use risingwave_common::util::sort_util::ColumnOrder;
-use risingwave_pb::catalog::{Sink as ProstSink, SinkType as ProstSinkType};
+use risingwave_pb::catalog::{PbSink, PbSinkType};
 
 #[derive(Clone, Copy, Debug, Default, Hash, PartialOrd, PartialEq, Eq)]
 pub struct SinkId {
@@ -77,20 +77,20 @@ impl SinkType {
         self == &Self::Upsert
     }
 
-    pub fn to_proto(self) -> ProstSinkType {
+    pub fn to_proto(self) -> PbSinkType {
         match self {
-            SinkType::AppendOnly => ProstSinkType::AppendOnly,
-            SinkType::ForceAppendOnly => ProstSinkType::ForceAppendOnly,
-            SinkType::Upsert => ProstSinkType::Upsert,
+            SinkType::AppendOnly => PbSinkType::AppendOnly,
+            SinkType::ForceAppendOnly => PbSinkType::ForceAppendOnly,
+            SinkType::Upsert => PbSinkType::Upsert,
         }
     }
 
-    pub fn from_proto(pb: ProstSinkType) -> Self {
+    pub fn from_proto(pb: PbSinkType) -> Self {
         match pb {
-            ProstSinkType::AppendOnly => SinkType::AppendOnly,
-            ProstSinkType::ForceAppendOnly => SinkType::ForceAppendOnly,
-            ProstSinkType::Upsert => SinkType::Upsert,
-            ProstSinkType::Unspecified => unreachable!(),
+            PbSinkType::AppendOnly => SinkType::AppendOnly,
+            PbSinkType::ForceAppendOnly => SinkType::ForceAppendOnly,
+            PbSinkType::Upsert => SinkType::Upsert,
+            PbSinkType::Unspecified => unreachable!(),
         }
     }
 }
@@ -115,12 +115,11 @@ pub struct SinkCatalog {
     /// All columns of the sink. Note that this is NOT sorted by columnId in the vector.
     pub columns: Vec<ColumnCatalog>,
 
-    /// Primiary keys of the sink (connector). Now the sink does not care about a field's
-    /// order (ASC/DESC).
-    pub pk: Vec<ColumnOrder>,
+    /// Primiary keys of the sink. Derived by the frontend.
+    pub plan_pk: Vec<ColumnOrder>,
 
-    /// Primary key indices of the corresponding sink operator's output.
-    pub stream_key: Vec<usize>,
+    /// User-defined primary key indices for upsert sink.
+    pub downstream_pk: Vec<usize>,
 
     /// Distribution key indices of the sink. For example, if `distribution_key = [1, 2]`, then the
     /// distribution keys will be `columns[1]` and `columns[2]`.
@@ -142,16 +141,20 @@ pub struct SinkCatalog {
 }
 
 impl SinkCatalog {
-    pub fn to_proto(&self) -> ProstSink {
-        ProstSink {
+    pub fn to_proto(&self) -> PbSink {
+        PbSink {
             id: self.id.into(),
             schema_id: self.schema_id.schema_id,
             database_id: self.database_id.database_id,
             name: self.name.clone(),
             definition: self.definition.clone(),
             columns: self.columns.iter().map(|c| c.to_protobuf()).collect_vec(),
-            pk: self.pk.iter().map(|o| o.to_protobuf()).collect(),
-            stream_key: self.stream_key.iter().map(|idx| *idx as i32).collect_vec(),
+            plan_pk: self.plan_pk.iter().map(|o| o.to_protobuf()).collect(),
+            downstream_pk: self
+                .downstream_pk
+                .iter()
+                .map(|idx| *idx as i32)
+                .collect_vec(),
             dependent_relations: self
                 .dependent_relations
                 .iter()
@@ -177,13 +180,13 @@ impl SinkCatalog {
         Schema { fields }
     }
 
-    pub fn pk_indices(&self) -> Vec<usize> {
-        self.pk.iter().map(|k| k.column_index).collect_vec()
+    pub fn downstream_pk_indices(&self) -> Vec<usize> {
+        self.downstream_pk.clone()
     }
 }
 
-impl From<ProstSink> for SinkCatalog {
-    fn from(pb: ProstSink) -> Self {
+impl From<PbSink> for SinkCatalog {
+    fn from(pb: PbSink) -> Self {
         let sink_type = pb.get_sink_type().unwrap();
         SinkCatalog {
             id: pb.id.into(),
@@ -196,8 +199,12 @@ impl From<ProstSink> for SinkCatalog {
                 .into_iter()
                 .map(ColumnCatalog::from)
                 .collect_vec(),
-            pk: pb.pk.iter().map(ColumnOrder::from_protobuf).collect_vec(),
-            stream_key: pb.stream_key.iter().map(|k| *k as _).collect_vec(),
+            plan_pk: pb
+                .plan_pk
+                .iter()
+                .map(ColumnOrder::from_protobuf)
+                .collect_vec(),
+            downstream_pk: pb.downstream_pk.iter().map(|k| *k as _).collect_vec(),
             distribution_key: pb.distribution_key.iter().map(|k| *k as _).collect_vec(),
             properties: pb.properties.clone(),
             owner: pb.owner.into(),
@@ -211,8 +218,8 @@ impl From<ProstSink> for SinkCatalog {
     }
 }
 
-impl From<&ProstSink> for SinkCatalog {
-    fn from(pb: &ProstSink) -> Self {
+impl From<&PbSink> for SinkCatalog {
+    fn from(pb: &PbSink) -> Self {
         pb.clone().into()
     }
 }
diff --git a/src/connector/src/sink/console.rs b/src/connector/src/sink/console.rs
index 7d9b67297795e..a8985dbb83929 100644
--- a/src/connector/src/sink/console.rs
+++ b/src/connector/src/sink/console.rs
@@ -106,8 +106,8 @@ fn parse_datum(datum: DatumRef<'_>) -> String {
         Some(ScalarRefImpl::Decimal(v)) => format!("Decimal({})", v),
         Some(ScalarRefImpl::Utf8(v)) => format!("Utf8(\"{}\")", v),
         Some(ScalarRefImpl::Bool(v)) => format!("Bool({})", v),
-        Some(ScalarRefImpl::NaiveDate(v)) => format!("Date({})", v),
-        Some(ScalarRefImpl::NaiveTime(v)) => format!("Time({})", v),
+        Some(ScalarRefImpl::Date(v)) => format!("Date({})", v),
+        Some(ScalarRefImpl::Time(v)) => format!("Time({})", v),
         Some(ScalarRefImpl::Interval(v)) => format!("Interval({})", v),
         Some(ScalarRefImpl::Struct(v)) => {
             format!(
diff --git a/src/connector/src/sink/kafka.rs b/src/connector/src/sink/kafka.rs
index 0a429e4ce7bb8..32c38d8bed6f1 100644
--- a/src/connector/src/sink/kafka.rs
+++ b/src/connector/src/sink/kafka.rs
@@ -23,19 +23,18 @@ use rdkafka::message::ToBytes;
 use rdkafka::producer::{BaseRecord, DefaultProducerContext, Producer, ThreadedProducer};
 use rdkafka::types::RDKafkaErrorCode;
 use rdkafka::ClientConfig;
-use risingwave_common::array::{ArrayError, ArrayResult, Op, RowRef, StreamChunk};
+use risingwave_common::array::{Op, RowRef, StreamChunk};
 use risingwave_common::catalog::{Field, Schema};
 use risingwave_common::row::Row;
-use risingwave_common::types::to_text::ToText;
-use risingwave_common::types::{DataType, DatumRef, ScalarRefImpl};
-use risingwave_common::util::iter_util::ZipEqFast;
 use serde_derive::Deserialize;
 use serde_json::{json, Map, Value};
 use tracing::warn;
 
-use super::{Sink, SinkError, SINK_FORMAT_APPEND_ONLY, SINK_FORMAT_DEBEZIUM, SINK_FORMAT_UPSERT};
+use super::{
+    Sink, SinkError, SINK_TYPE_APPEND_ONLY, SINK_TYPE_DEBEZIUM, SINK_TYPE_OPTION, SINK_TYPE_UPSERT,
+};
 use crate::common::KafkaCommon;
-use crate::sink::Result;
+use crate::sink::{datum_to_json_object, record_to_json, Result};
 use crate::{deserialize_bool_from_string, deserialize_duration_from_string};
 
 pub const KAFKA_SINK: &str = "kafka";
@@ -61,7 +60,7 @@ pub struct KafkaConfig {
     #[serde(flatten)]
     pub common: KafkaCommon,
 
-    pub format: String, // accept "append_only", "debezium", or "upsert"
+    pub r#type: String, // accept "append-only", "debezium", or "upsert"
 
     pub identifier: String,
 
@@ -94,12 +93,16 @@ impl KafkaConfig {
         let config = serde_json::from_value::<KafkaConfig>(serde_json::to_value(values).unwrap())
             .map_err(|e| SinkError::Config(anyhow!(e)))?;
 
-        if config.format != SINK_FORMAT_APPEND_ONLY
-            && config.format != SINK_FORMAT_DEBEZIUM
-            && config.format != SINK_FORMAT_UPSERT
+        if config.r#type != SINK_TYPE_APPEND_ONLY
+            && config.r#type != SINK_TYPE_DEBEZIUM
+            && config.r#type != SINK_TYPE_UPSERT
         {
             return Err(SinkError::Config(anyhow!(
-                "format must be append_only, debezium, or upsert"
+                "`{}` must be {}, {}, or {}",
+                SINK_TYPE_OPTION,
+                SINK_TYPE_APPEND_ONLY,
+                SINK_TYPE_DEBEZIUM,
+                SINK_TYPE_UPSERT
             )));
         }
         Ok(config)
@@ -134,6 +137,21 @@ impl<const APPEND_ONLY: bool> KafkaSink<APPEND_ONLY> {
         })
     }
 
+    pub async fn validate(config: KafkaConfig, pk_indices: Vec<usize>) -> Result<()> {
+        // For upsert Kafka sink, the primary key must be defined.
+        if !APPEND_ONLY && pk_indices.is_empty() {
+            return Err(SinkError::Config(anyhow!(
+                "primary key not defined for upsert kafka sink (please define in `primary_key` field)"
+            )));
+        }
+
+        // Try Kafka connection.
+        // TODO: Reuse the conductor instance we create during validation.
+        KafkaTransactionConductor::new(config).await?;
+
+        Ok(())
+    }
+
     // any error should report to upper level and requires revert to previous epoch.
     pub async fn do_with_retry<'a, F, FutKR, T>(&'a self, f: F) -> KafkaResult<T>
     where
@@ -305,7 +323,7 @@ impl<const APPEND_ONLY: bool> Sink for KafkaSink<APPEND_ONLY> {
             self.append_only(chunk).await
         } else {
             // Debezium
-            if self.config.format == SINK_FORMAT_DEBEZIUM {
+            if self.config.r#type == SINK_TYPE_DEBEZIUM {
                 self.debezium_update(
                     chunk,
                     SystemTime::now()
@@ -365,96 +383,6 @@ impl<const APPEND_ONLY: bool> Debug for KafkaSink<APPEND_ONLY> {
     }
 }
 
-fn datum_to_json_object(field: &Field, datum: DatumRef<'_>) -> ArrayResult<Value> {
-    let scalar_ref = match datum {
-        None => return Ok(Value::Null),
-        Some(datum) => datum,
-    };
-
-    let data_type = field.data_type();
-
-    tracing::debug!("datum_to_json_object: {:?}, {:?}", data_type, scalar_ref);
-
-    let value = match (data_type, scalar_ref) {
-        (DataType::Boolean, ScalarRefImpl::Bool(v)) => {
-            json!(v)
-        }
-        (DataType::Int16, ScalarRefImpl::Int16(v)) => {
-            json!(v)
-        }
-        (DataType::Int32, ScalarRefImpl::Int32(v)) => {
-            json!(v)
-        }
-        (DataType::Int64, ScalarRefImpl::Int64(v)) => {
-            json!(v)
-        }
-        (DataType::Float32, ScalarRefImpl::Float32(v)) => {
-            json!(f32::from(v))
-        }
-        (DataType::Float64, ScalarRefImpl::Float64(v)) => {
-            json!(f64::from(v))
-        }
-        (DataType::Varchar, ScalarRefImpl::Utf8(v)) => {
-            json!(v)
-        }
-        (DataType::Decimal, ScalarRefImpl::Decimal(v)) => {
-            // fixme
-            json!(v.to_text())
-        }
-        (
-            dt @ DataType::Date
-            | dt @ DataType::Time
-            | dt @ DataType::Timestamp
-            | dt @ DataType::Timestamptz
-            | dt @ DataType::Interval
-            | dt @ DataType::Bytea,
-            scalar,
-        ) => {
-            json!(scalar.to_text_with_type(&dt))
-        }
-        (DataType::List { datatype }, ScalarRefImpl::List(list_ref)) => {
-            let mut vec = Vec::with_capacity(list_ref.values_ref().len());
-            let inner_field = Field::unnamed(Box::<DataType>::into_inner(datatype));
-            for sub_datum_ref in list_ref.values_ref() {
-                let value = datum_to_json_object(&inner_field, sub_datum_ref)?;
-                vec.push(value);
-            }
-            json!(vec)
-        }
-        (DataType::Struct(st), ScalarRefImpl::Struct(struct_ref)) => {
-            let mut map = Map::with_capacity(st.fields.len());
-            for (sub_datum_ref, sub_field) in struct_ref.fields_ref().into_iter().zip_eq_fast(
-                st.fields
-                    .iter()
-                    .zip_eq_fast(st.field_names.iter())
-                    .map(|(dt, name)| Field::with_name(dt.clone(), name)),
-            ) {
-                let value = datum_to_json_object(&sub_field, sub_datum_ref)?;
-                map.insert(sub_field.name.clone(), value);
-            }
-            json!(map)
-        }
-        _ => {
-            return Err(ArrayError::internal(
-                "datum_to_json_object: unsupported data type".to_string(),
-            ));
-        }
-    };
-
-    Ok(value)
-}
-
-fn record_to_json(row: RowRef<'_>, schema: &[Field]) -> Result<Map<String, Value>> {
-    let mut mappings = Map::with_capacity(schema.len());
-    for (field, datum_ref) in schema.iter().zip_eq_fast(row.iter()) {
-        let key = field.name.clone();
-        let value = datum_to_json_object(field, datum_ref)
-            .map_err(|e| SinkError::JsonParse(e.to_string()))?;
-        mappings.insert(key, value);
-    }
-    Ok(mappings)
-}
-
 fn pk_to_json(
     row: RowRef<'_>,
     schema: &[Field],
@@ -590,6 +518,7 @@ impl KafkaTransactionConductor {
 mod test {
     use maplit::hashmap;
     use risingwave_common::test_prelude::StreamChunkTestExt;
+    use risingwave_common::types::DataType;
 
     use super::*;
 
@@ -598,7 +527,7 @@ mod test {
         let properties: HashMap<String, String> = hashmap! {
             "properties.bootstrap.server".to_string() => "localhost:9092".to_string(),
             "topic".to_string() => "test".to_string(),
-            "format".to_string() => "append_only".to_string(),
+            "type".to_string() => "append-only".to_string(),
             "use_transaction".to_string() => "False".to_string(),
             "security_protocol".to_string() => "SASL".to_string(),
             "sasl_mechanism".to_string() => "SASL".to_string(),
@@ -618,7 +547,7 @@ mod test {
         let properties = hashmap! {
             "kafka.brokers".to_string() => "localhost:29092".to_string(),
             "identifier".to_string() => "test_sink_1".to_string(),
-            "sink.type".to_string() => "append_only".to_string(),
+            "type".to_string() => "append-only".to_string(),
             "kafka.topic".to_string() => "test_topic".to_string(),
         };
         let schema = Schema::new(vec![
diff --git a/src/connector/src/sink/mod.rs b/src/connector/src/sink/mod.rs
index 57fb456de880f..11ecb5b67ac71 100644
--- a/src/connector/src/sink/mod.rs
+++ b/src/connector/src/sink/mod.rs
@@ -23,11 +23,16 @@ use std::collections::HashMap;
 use anyhow::anyhow;
 use async_trait::async_trait;
 use enum_as_inner::EnumAsInner;
-use risingwave_common::array::StreamChunk;
-use risingwave_common::catalog::Schema;
+use risingwave_common::array::{ArrayError, ArrayResult, RowRef, StreamChunk};
+use risingwave_common::catalog::{Field, Schema};
 use risingwave_common::error::{ErrorCode, RwError};
+use risingwave_common::row::Row;
+use risingwave_common::types::to_text::ToText;
+use risingwave_common::types::{DataType, DatumRef, ScalarRefImpl};
+use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_rpc_client::error::RpcError;
 use serde::{Deserialize, Serialize};
+use serde_json::{json, Map, Value};
 use thiserror::Error;
 pub use tracing;
 
@@ -37,11 +42,10 @@ use crate::sink::kafka::{KafkaConfig, KafkaSink, KAFKA_SINK};
 use crate::sink::redis::{RedisConfig, RedisSink};
 use crate::sink::remote::{RemoteConfig, RemoteSink};
 use crate::ConnectorParams;
-
-pub const SINK_FORMAT_OPTION: &str = "format";
-pub const SINK_FORMAT_APPEND_ONLY: &str = "append_only";
-pub const SINK_FORMAT_DEBEZIUM: &str = "debezium";
-pub const SINK_FORMAT_UPSERT: &str = "upsert";
+pub const SINK_TYPE_OPTION: &str = "type";
+pub const SINK_TYPE_APPEND_ONLY: &str = "append-only";
+pub const SINK_TYPE_DEBEZIUM: &str = "debezium";
+pub const SINK_TYPE_UPSERT: &str = "upsert";
 pub const SINK_USER_FORCE_APPEND_ONLY_OPTION: &str = "force_append_only";
 
 #[async_trait]
@@ -82,10 +86,10 @@ pub const BLACKHOLE_SINK: &str = "blackhole";
 
 impl SinkConfig {
     pub fn from_hashmap(properties: HashMap<String, String>) -> Result<Self> {
-        const SINK_TYPE_KEY: &str = "connector";
+        const CONNECTOR_TYPE_KEY: &str = "connector";
         let sink_type = properties
-            .get(SINK_TYPE_KEY)
-            .ok_or_else(|| SinkError::Config(anyhow!("missing config: {}", SINK_TYPE_KEY)))?;
+            .get(CONNECTOR_TYPE_KEY)
+            .ok_or_else(|| SinkError::Config(anyhow!("missing config: {}", CONNECTOR_TYPE_KEY)))?;
         match sink_type.to_lowercase().as_str() {
             KAFKA_SINK => Ok(SinkConfig::Kafka(Box::new(KafkaConfig::from_hashmap(
                 properties,
@@ -169,15 +173,10 @@ impl SinkImpl {
         match cfg {
             SinkConfig::Redis(cfg) => RedisSink::new(cfg, sink_catalog.schema()).map(|_| ()),
             SinkConfig::Kafka(cfg) => {
-                // We simply call `KafkaSink::new` here to validate a Kafka sink.
                 if sink_catalog.sink_type.is_append_only() {
-                    KafkaSink::<true>::new(*cfg, sink_catalog.schema(), sink_catalog.pk_indices())
-                        .await
-                        .map(|_| ())
+                    KafkaSink::<true>::validate(*cfg, sink_catalog.downstream_pk_indices()).await
                 } else {
-                    KafkaSink::<false>::new(*cfg, sink_catalog.schema(), sink_catalog.pk_indices())
-                        .await
-                        .map(|_| ())
+                    KafkaSink::<false>::validate(*cfg, sink_catalog.downstream_pk_indices()).await
                 }
             }
             SinkConfig::Remote(cfg) => {
@@ -262,3 +261,93 @@ impl From<SinkError> for RwError {
         ErrorCode::SinkError(Box::new(e)).into()
     }
 }
+
+pub fn record_to_json(row: RowRef<'_>, schema: &[Field]) -> Result<Map<String, Value>> {
+    let mut mappings = Map::with_capacity(schema.len());
+    for (field, datum_ref) in schema.iter().zip_eq_fast(row.iter()) {
+        let key = field.name.clone();
+        let value = datum_to_json_object(field, datum_ref)
+            .map_err(|e| SinkError::JsonParse(e.to_string()))?;
+        mappings.insert(key, value);
+    }
+    Ok(mappings)
+}
+
+fn datum_to_json_object(field: &Field, datum: DatumRef<'_>) -> ArrayResult<Value> {
+    let scalar_ref = match datum {
+        None => return Ok(Value::Null),
+        Some(datum) => datum,
+    };
+
+    let data_type = field.data_type();
+
+    tracing::debug!("datum_to_json_object: {:?}, {:?}", data_type, scalar_ref);
+
+    let value = match (data_type, scalar_ref) {
+        (DataType::Boolean, ScalarRefImpl::Bool(v)) => {
+            json!(v)
+        }
+        (DataType::Int16, ScalarRefImpl::Int16(v)) => {
+            json!(v)
+        }
+        (DataType::Int32, ScalarRefImpl::Int32(v)) => {
+            json!(v)
+        }
+        (DataType::Int64, ScalarRefImpl::Int64(v)) => {
+            json!(v)
+        }
+        (DataType::Float32, ScalarRefImpl::Float32(v)) => {
+            json!(f32::from(v))
+        }
+        (DataType::Float64, ScalarRefImpl::Float64(v)) => {
+            json!(f64::from(v))
+        }
+        (DataType::Varchar, ScalarRefImpl::Utf8(v)) => {
+            json!(v)
+        }
+        (DataType::Decimal, ScalarRefImpl::Decimal(v)) => {
+            // fixme
+            json!(v.to_text())
+        }
+        (
+            dt @ DataType::Date
+            | dt @ DataType::Time
+            | dt @ DataType::Timestamp
+            | dt @ DataType::Timestamptz
+            | dt @ DataType::Interval
+            | dt @ DataType::Bytea,
+            scalar,
+        ) => {
+            json!(scalar.to_text_with_type(&dt))
+        }
+        (DataType::List { datatype }, ScalarRefImpl::List(list_ref)) => {
+            let mut vec = Vec::with_capacity(list_ref.values_ref().len());
+            let inner_field = Field::unnamed(Box::<DataType>::into_inner(datatype));
+            for sub_datum_ref in list_ref.values_ref() {
+                let value = datum_to_json_object(&inner_field, sub_datum_ref)?;
+                vec.push(value);
+            }
+            json!(vec)
+        }
+        (DataType::Struct(st), ScalarRefImpl::Struct(struct_ref)) => {
+            let mut map = Map::with_capacity(st.fields.len());
+            for (sub_datum_ref, sub_field) in struct_ref.fields_ref().into_iter().zip_eq_fast(
+                st.fields
+                    .iter()
+                    .zip_eq_fast(st.field_names.iter())
+                    .map(|(dt, name)| Field::with_name(dt.clone(), name)),
+            ) {
+                let value = datum_to_json_object(&sub_field, sub_datum_ref)?;
+                map.insert(sub_field.name.clone(), value);
+            }
+            json!(map)
+        }
+        _ => {
+            return Err(ArrayError::internal(
+                "datum_to_json_object: unsupported data type".to_string(),
+            ));
+        }
+    };
+
+    Ok(value)
+}
diff --git a/src/connector/src/sink/remote.rs b/src/connector/src/sink/remote.rs
index 4f37cfec9d251..b69700a539156 100644
--- a/src/connector/src/sink/remote.rs
+++ b/src/connector/src/sink/remote.rs
@@ -17,32 +17,32 @@ use std::collections::HashMap;
 use anyhow::anyhow;
 use async_trait::async_trait;
 use itertools::Itertools;
+use prost::Message;
 use risingwave_common::array::StreamChunk;
 #[cfg(test)]
 use risingwave_common::catalog::Field;
 use risingwave_common::catalog::Schema;
-use risingwave_common::row::Row;
 #[cfg(test)]
 use risingwave_common::types::DataType;
-use risingwave_common::types::{DatumRef, ScalarRefImpl};
 use risingwave_common::util::addr::HostAddr;
-use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_pb::connector_service::sink_stream_request::write_batch::json_payload::RowOp;
-use risingwave_pb::connector_service::sink_stream_request::write_batch::{JsonPayload, Payload};
+use risingwave_pb::connector_service::sink_stream_request::write_batch::{
+    JsonPayload, Payload, StreamChunkPayload,
+};
 use risingwave_pb::connector_service::sink_stream_request::{
     Request as SinkRequest, StartEpoch, SyncBatch, WriteBatch,
 };
 use risingwave_pb::connector_service::table_schema::Column;
-use risingwave_pb::connector_service::{SinkResponse, SinkStreamRequest, TableSchema};
+use risingwave_pb::connector_service::{
+    SinkPayloadFormat, SinkResponse, SinkStreamRequest, TableSchema,
+};
 use risingwave_rpc_client::ConnectorClient;
-use serde_json::Value;
-use serde_json::Value::Number;
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
 use tokio_stream::StreamExt;
 use tonic::{Status, Streaming};
 
 use super::catalog::SinkCatalog;
-use crate::sink::{Result, Sink, SinkError};
+use crate::sink::{record_to_json, Result, Sink, SinkError};
 use crate::ConnectorParams;
 
 pub const VALID_REMOTE_SINKS: [&str; 3] = ["jdbc", "file", "iceberg"];
@@ -110,6 +110,7 @@ pub struct RemoteSink<const APPEND_ONLY: bool> {
     _client: Option<ConnectorClient>,
     request_sender: Option<UnboundedSender<SinkStreamRequest>>,
     response_stream: ResponseStreamImpl,
+    payload_format: SinkPayloadFormat,
 }
 
 impl<const APPEND_ONLY: bool> RemoteSink<APPEND_ONLY> {
@@ -124,10 +125,12 @@ impl<const APPEND_ONLY: bool> RemoteSink<APPEND_ONLY> {
         })?;
         let host_addr = HostAddr::try_from(&address).map_err(SinkError::from)?;
         let client = ConnectorClient::new(host_addr).await.map_err(|err| {
-            SinkError::Remote(format!(
+            let msg = format!(
                 "failed to connect to connector endpoint `{}`: {:?}",
                 &address, err
-            ))
+            );
+            tracing::warn!(msg);
+            SinkError::Remote(msg)
         })?;
 
         let table_schema = Some(TableSchema {
@@ -146,10 +149,25 @@ impl<const APPEND_ONLY: bool> RemoteSink<APPEND_ONLY> {
                 config.connector_type.clone(),
                 config.properties.clone(),
                 table_schema,
+                connector_params.sink_payload_format,
             )
             .await
             .map_err(SinkError::from)?;
-        let _ = response.next().await.unwrap();
+        response.next().await.unwrap().map_err(|e| {
+            let msg = format!(
+                "failed to start sink stream for connector `{}` with error code: {}, message: {:?}",
+                &config.connector_type,
+                e.code(),
+                e.message()
+            );
+            tracing::warn!(msg);
+            SinkError::Remote(msg)
+        })?;
+        tracing::info!(
+            "{:?} sink stream started with properties: {:?}",
+            &config.connector_type,
+            &config.properties
+        );
 
         Ok(RemoteSink {
             connector_type: config.connector_type,
@@ -160,6 +178,7 @@ impl<const APPEND_ONLY: bool> RemoteSink<APPEND_ONLY> {
             _client: Some(client),
             request_sender: Some(request_sender),
             response_stream: ResponseStreamImpl::Grpc(response),
+            payload_format: connector_params.sink_payload_format,
         })
     }
 
@@ -190,7 +209,7 @@ impl<const APPEND_ONLY: bool> RemoteSink<APPEND_ONLY> {
         let table_schema = TableSchema {
             columns,
             pk_indices: sink_catalog
-                .pk_indices()
+                .downstream_pk_indices()
                 .iter()
                 .map(|i| *i as _)
                 .collect_vec(),
@@ -245,6 +264,7 @@ impl<const APPEND_ONLY: bool> RemoteSink<APPEND_ONLY> {
             _client: None,
             request_sender: Some(request_sender),
             response_stream: ResponseStreamImpl::Receiver(response_receiver),
+            payload_format: SinkPayloadFormat::Json,
         }
     }
 }
@@ -252,23 +272,30 @@ impl<const APPEND_ONLY: bool> RemoteSink<APPEND_ONLY> {
 #[async_trait]
 impl<const APPEND_ONLY: bool> Sink for RemoteSink<APPEND_ONLY> {
     async fn write_batch(&mut self, chunk: StreamChunk) -> Result<()> {
-        let mut row_ops = vec![];
-        for (op, row_ref) in chunk.rows() {
-            let mut map = serde_json::Map::new();
-            row_ref
-                .iter()
-                .zip_eq_fast(self.schema.fields.iter())
-                .for_each(|(v, f)| {
-                    map.insert(f.name.clone(), parse_datum(v));
-                });
-            let row_op = RowOp {
-                op_type: op.to_protobuf() as i32,
-                line: serde_json::to_string(&map)
-                    .map_err(|e| SinkError::Remote(format!("{:?}", e)))?,
-            };
-
-            row_ops.push(row_op);
-        }
+        let payload = match self.payload_format {
+            SinkPayloadFormat::Json => {
+                let mut row_ops = vec![];
+                for (op, row_ref) in chunk.rows() {
+                    let map = record_to_json(row_ref, &self.schema.fields)?;
+                    let row_op = RowOp {
+                        op_type: op.to_protobuf() as i32,
+                        line: serde_json::to_string(&map)
+                            .map_err(|e| SinkError::Remote(format!("{:?}", e)))?,
+                    };
+
+                    row_ops.push(row_op);
+                }
+                Payload::JsonPayload(JsonPayload { row_ops })
+            }
+            SinkPayloadFormat::StreamChunk => {
+                let prost_stream_chunk = chunk.to_protobuf();
+                let binary_data = Message::encode_to_vec(&prost_stream_chunk);
+                Payload::StreamChunkPayload(StreamChunkPayload { binary_data })
+            }
+            SinkPayloadFormat::FormatUnspecified => {
+                unreachable!("should specify sink payload format")
+            }
+        };
 
         let epoch = self.epoch.ok_or_else(|| {
             SinkError::Remote("epoch has not been initialize, call `begin_epoch`".to_string())
@@ -279,7 +306,7 @@ impl<const APPEND_ONLY: bool> Sink for RemoteSink<APPEND_ONLY> {
                 request: Some(SinkRequest::Write(WriteBatch {
                     epoch,
                     batch_id,
-                    payload: Some(Payload::JsonPayload(JsonPayload { row_ops })),
+                    payload: Some(payload),
                 })),
             })
             .map_err(|e| SinkError::Remote(e.to_string()))?;
@@ -319,35 +346,6 @@ impl<const APPEND_ONLY: bool> Sink for RemoteSink<APPEND_ONLY> {
     }
 }
 
-fn parse_datum(datum: DatumRef<'_>) -> Value {
-    match datum {
-        None => Value::Null,
-        Some(ScalarRefImpl::Int32(v)) => Value::from(v),
-        Some(ScalarRefImpl::Int64(v)) => Value::from(v),
-        Some(ScalarRefImpl::Float32(v)) => Value::from(v.into_inner()),
-        Some(ScalarRefImpl::Float64(v)) => Value::from(v.into_inner()),
-        Some(ScalarRefImpl::Decimal(v)) => Number(v.to_string().parse().unwrap()),
-        Some(ScalarRefImpl::Utf8(v)) => Value::from(v),
-        Some(ScalarRefImpl::Bool(v)) => Value::from(v),
-        Some(ScalarRefImpl::NaiveDate(v)) => Value::from(v.to_string()),
-        Some(ScalarRefImpl::NaiveTime(v)) => Value::from(v.to_string()),
-        Some(ScalarRefImpl::Interval(v)) => Value::from(v.to_string()),
-        Some(ScalarRefImpl::Struct(v)) => Value::from(
-            v.fields_ref()
-                .iter()
-                .map(|v| parse_datum(*v))
-                .collect::<Vec<_>>(),
-        ),
-        Some(ScalarRefImpl::List(v)) => Value::from(
-            v.values_ref()
-                .iter()
-                .map(|v| parse_datum(*v))
-                .collect::<Vec<_>>(),
-        ),
-        _ => unimplemented!(),
-    }
-}
-
 #[cfg(test)]
 mod test {
     use std::sync::Arc;
@@ -491,6 +489,7 @@ mod test {
                         assert_eq!(row_2.line, "{\"id\":3,\"name\":\"Clare\"}");
                         assert_eq!(row_2.op_type, data::Op::Insert as i32);
                     }
+                    _ => unreachable!("should be json payload"),
                 }
             }
             _ => panic!("test failed: failed to construct write request"),
@@ -552,6 +551,7 @@ mod test {
                         assert_eq!(row_2.line, "{\"id\":6,\"name\":\"Frank\"}");
                         assert_eq!(row_2.op_type, data::Op::Insert as i32);
                     }
+                    _ => unreachable!("should be json payload"),
                 }
             }
             _ => panic!("test failed: failed to construct write request"),
diff --git a/src/connector/src/source/base.rs b/src/connector/src/source/base.rs
index 01dd331ad4315..43e318f6bb746 100644
--- a/src/connector/src/source/base.rs
+++ b/src/connector/src/source/base.rs
@@ -376,7 +376,7 @@ pub type SplitId = Arc<str>;
 /// The third-party message structs will eventually be transformed into this struct.
 #[derive(Debug, Clone)]
 pub struct SourceMessage {
-    pub payload: Option<Bytes>,
+    pub payload: Option<Vec<u8>>,
     pub offset: String,
     pub split_id: SplitId,
 
diff --git a/src/connector/src/source/cdc/source/message.rs b/src/connector/src/source/cdc/source/message.rs
index cbc8fc929a2d1..a14653bdff8ff 100644
--- a/src/connector/src/source/cdc/source/message.rs
+++ b/src/connector/src/source/cdc/source/message.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use bytes::Bytes;
 use risingwave_pb::connector_service::CdcMessage;
 
 use crate::source::base::SourceMessage;
@@ -21,7 +20,7 @@ use crate::source::SourceMeta;
 impl From<CdcMessage> for SourceMessage {
     fn from(message: CdcMessage) -> Self {
         SourceMessage {
-            payload: Some(Bytes::from(message.payload)),
+            payload: Some(message.payload.as_bytes().to_vec()),
             offset: message.offset,
             split_id: message.partition.into(),
             meta: SourceMeta::Empty,
diff --git a/src/connector/src/source/datagen/source/generator.rs b/src/connector/src/source/datagen/source/generator.rs
index 8c4bf59a7cd05..544205911711a 100644
--- a/src/connector/src/source/datagen/source/generator.rs
+++ b/src/connector/src/source/datagen/source/generator.rs
@@ -14,7 +14,6 @@
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use anyhow::Result;
-use bytes::Bytes;
 use futures_async_stream::try_stream;
 use maplit::hashmap;
 use risingwave_common::array::{Op, StreamChunk};
@@ -121,7 +120,7 @@ impl DatagenEventGenerator {
 
                                 map.insert(name.clone(), value);
                             }
-                            Bytes::from(serde_json::Value::from(map).to_string())
+                            serde_json::Value::from(map).to_string().as_bytes().to_vec()
                         }
                         _ => {
                             unimplemented!("only json format is supported for now")
@@ -242,6 +241,7 @@ mod tests {
                     Some(end.to_string()),
                     split_index,
                     split_num,
+                    0,
                 )
                 .unwrap(),
             ),
@@ -252,6 +252,7 @@ mod tests {
                     Some(end.to_string()),
                     split_index,
                     split_num,
+                    0,
                 )
                 .unwrap(),
             ),
diff --git a/src/connector/src/source/datagen/source/reader.rs b/src/connector/src/source/datagen/source/reader.rs
index a3f17c1ca4b35..0cd54491fced1 100644
--- a/src/connector/src/source/datagen/source/reader.rs
+++ b/src/connector/src/source/datagen/source/reader.rs
@@ -14,7 +14,7 @@
 
 use std::collections::HashMap;
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use futures::{StreamExt, TryStreamExt};
 use futures_async_stream::try_stream;
@@ -59,7 +59,7 @@ impl SplitReader for DatagenSplitReader {
         let mut events_so_far = u64::default();
         tracing::debug!("Splits for datagen found! {:?}", splits);
 
-        assert!(splits.len() == 1);
+        debug_assert!(splits.len() == 1);
         let split = splits.into_iter().next().unwrap();
         // TODO: currently, assume there's only on split in one reader
         let split_id = split.id();
@@ -114,6 +114,7 @@ impl SplitReader for DatagenSplitReader {
                     &column.name,
                     split_index,
                     split_num,
+                    events_so_far,
                 )?)
             } else {
                 FieldDesc::Invisible
@@ -172,6 +173,7 @@ fn generator_from_data_type(
     name: &String,
     split_index: u64,
     split_num: u64,
+    offset: u64,
 ) -> Result<FieldGeneratorImpl> {
     let random_seed_key = format!("fields.{}.seed", name);
     let random_seed: u64 = match fields_option_map
@@ -204,8 +206,22 @@ fn generator_from_data_type(
             let max_past_mode_value = fields_option_map
                 .get(&max_past_mode_key)
                 .map(|s| s.to_lowercase());
+            let basetime = match fields_option_map.get(format!("fields.{}.basetime", name).as_str())
+            {
+                Some(base) => {
+                    Some(chrono::DateTime::parse_from_rfc3339(base).map_err(|e| {
+                        anyhow!("cannot parse {:?} to rfc3339 due to {:?}", base, e)
+                    })?)
+                }
+                None => None,
+            };
 
-            FieldGeneratorImpl::with_timestamp(max_past_value, max_past_mode_value, random_seed)
+            FieldGeneratorImpl::with_timestamp(
+                basetime,
+                max_past_value,
+                max_past_mode_value,
+                random_seed,
+            )
         }
         DataType::Varchar => {
             let length_key = format!("fields.{}.length", name);
@@ -222,6 +238,7 @@ fn generator_from_data_type(
                             &format!("{}.{}", name, field_name),
                             split_index,
                             split_num,
+                            offset,
                         )?;
                         Ok((field_name, gen))
                     })
@@ -237,6 +254,7 @@ fn generator_from_data_type(
                 &format!("{}._", name),
                 split_index,
                 split_num,
+                offset,
             )?;
             FieldGeneratorImpl::with_list(generator, length_value)
         }
@@ -253,7 +271,8 @@ fn generator_from_data_type(
                     start_value,
                     end_value,
                     split_index,
-                    split_num
+                    split_num,
+                    offset,
                 )
             } else {
                 let min_key = format!("fields.{}.min", name);
diff --git a/src/connector/src/source/filesystem/nd_streaming.rs b/src/connector/src/source/filesystem/nd_streaming.rs
index 0cbc496be18e4..9d3e50222561a 100644
--- a/src/connector/src/source/filesystem/nd_streaming.rs
+++ b/src/connector/src/source/filesystem/nd_streaming.rs
@@ -84,7 +84,7 @@ impl<T> NdByteStreamWrapper<T> {
                     let msg: SourceMessage = std::mem::take(&mut last_message).unwrap();
                     let last_payload = msg.payload.unwrap();
                     offset -= last_payload.len();
-                    line = String::from_utf8(last_payload.into()).unwrap() + &line;
+                    line = String::from_utf8(last_payload).unwrap() + &line;
                 }
                 let len = line.as_bytes().len();
 
@@ -148,7 +148,7 @@ mod tests {
                 Ok(e.chunks(N3)
                     .enumerate()
                     .map(|(j, buf)| SourceMessage {
-                        payload: Some(buf.to_owned().into()),
+                        payload: Some(buf.to_owned()),
                         offset: (i * N2 + j * N3).to_string(),
                         split_id: split_id.clone(),
                         meta: crate::source::SourceMeta::Empty,
@@ -164,7 +164,7 @@ mod tests {
         let items = msg_stream
             .into_iter()
             .flatten()
-            .map(|e| String::from_utf8(e.payload.unwrap().into()).unwrap())
+            .map(|e| String::from_utf8(e.payload.unwrap()).unwrap())
             .collect::<Vec<_>>();
         assert_eq!(items.len(), N1);
         let text = items.join("");
diff --git a/src/connector/src/source/filesystem/s3/source/reader.rs b/src/connector/src/source/filesystem/s3/source/reader.rs
index 26694ed929901..319f262b0cf6a 100644
--- a/src/connector/src/source/filesystem/s3/source/reader.rs
+++ b/src/connector/src/source/filesystem/s3/source/reader.rs
@@ -81,7 +81,7 @@ impl S3FileReader {
             let bytes = read?;
             let len = bytes.len();
             let msg = SourceMessage {
-                payload: Some(bytes),
+                payload: Some(bytes.as_ref().to_vec()),
                 offset: offset.to_string(),
                 split_id: split.id(),
                 meta: SourceMeta::Empty,
diff --git a/src/connector/src/source/google_pubsub/source/message.rs b/src/connector/src/source/google_pubsub/source/message.rs
index dfdd2f2e3f535..93c1e1ed0daf1 100644
--- a/src/connector/src/source/google_pubsub/source/message.rs
+++ b/src/connector/src/source/google_pubsub/source/message.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use bytes::Bytes;
 use chrono::{TimeZone, Utc};
 use google_cloud_pubsub::subscriber::ReceivedMessage;
 
@@ -47,7 +46,7 @@ impl From<TaggedReceivedMessage> for SourceMessage {
                 let payload = message.message.data;
                 match payload.len() {
                     0 => None,
-                    _ => Some(Bytes::from(payload)),
+                    _ => Some(payload),
                 }
             },
             offset: timestamp.timestamp_nanos().to_string(),
diff --git a/src/connector/src/source/kafka/source/message.rs b/src/connector/src/source/kafka/source/message.rs
index 6c56add580d3e..6af7ea00e32bb 100644
--- a/src/connector/src/source/kafka/source/message.rs
+++ b/src/connector/src/source/kafka/source/message.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use bytes::Bytes;
 use rdkafka::message::BorrowedMessage;
 use rdkafka::Message;
 
@@ -35,7 +34,7 @@ impl SourceMessage {
         .unwrap();
         SourceMessage {
             // TODO(TaoWu): Possible performance improvement: avoid memory copying here.
-            payload: Some(encoded.into()),
+            payload: Some(encoded),
             offset: message.offset().to_string(),
             split_id: message.partition().to_string().into(),
             meta: SourceMeta::Kafka(KafkaMeta {
@@ -49,7 +48,7 @@ impl<'a> From<BorrowedMessage<'a>> for SourceMessage {
     fn from(message: BorrowedMessage<'a>) -> Self {
         SourceMessage {
             // TODO(TaoWu): Possible performance improvement: avoid memory copying here.
-            payload: message.payload().map(Bytes::copy_from_slice),
+            payload: message.payload().map(|p| p.to_vec()),
             offset: message.offset().to_string(),
             split_id: message.partition().to_string().into(),
             meta: SourceMeta::Kafka(KafkaMeta {
diff --git a/src/connector/src/source/kinesis/source/message.rs b/src/connector/src/source/kinesis/source/message.rs
index f29a83c4afc72..698110bce37f8 100644
--- a/src/connector/src/source/kinesis/source/message.rs
+++ b/src/connector/src/source/kinesis/source/message.rs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 use aws_sdk_kinesis::model::Record;
-use bytes::Bytes;
 
 use crate::source::{SourceMessage, SourceMeta, SplitId};
 
@@ -22,7 +21,7 @@ pub struct KinesisMessage {
     pub shard_id: SplitId,
     pub sequence_number: String,
     pub partition_key: String,
-    pub payload: Bytes,
+    pub payload: Vec<u8>,
 }
 
 impl From<KinesisMessage> for SourceMessage {
@@ -42,7 +41,7 @@ impl KinesisMessage {
             shard_id,
             sequence_number: message.sequence_number.unwrap(),
             partition_key: message.partition_key.unwrap(),
-            payload: message.data.unwrap().into_inner().into(),
+            payload: message.data.unwrap().into_inner(),
         }
     }
 }
diff --git a/src/connector/src/source/manager.rs b/src/connector/src/source/manager.rs
index 79df615980a4e..ab9cdc2ef9b15 100644
--- a/src/connector/src/source/manager.rs
+++ b/src/connector/src/source/manager.rs
@@ -22,6 +22,7 @@ use risingwave_common::types::DataType;
 #[derive(Clone, Debug)]
 pub struct SourceColumnDesc {
     pub name: String,
+    pub name_in_lower_case: String,
     pub data_type: DataType,
     pub column_id: ColumnId,
     pub fields: Vec<ColumnDesc>,
@@ -39,8 +40,11 @@ impl SourceColumnDesc {
             !matches!(data_type, DataType::List { .. } | DataType::Struct(..)),
             "called `SourceColumnDesc::simple` with a composite type."
         );
+        let name = name.into();
+        let name_in_lower_case = name.to_ascii_lowercase();
         Self {
-            name: name.into(),
+            name,
+            name_in_lower_case,
             data_type,
             column_id,
             fields: vec![],
@@ -60,6 +64,7 @@ impl From<&ColumnDesc> for SourceColumnDesc {
         let is_meta = c.name.starts_with("_rw_kafka_timestamp");
         Self {
             name: c.name.clone(),
+            name_in_lower_case: c.name.to_ascii_lowercase(),
             data_type: c.data_type.clone(),
             column_id: c.column_id,
             fields: c.field_descs.clone(),
@@ -77,6 +82,7 @@ impl From<&SourceColumnDesc> for ColumnDesc {
             name: s.name.clone(),
             field_descs: s.fields.clone(),
             type_name: "".to_string(),
+            generated_column: None,
         }
     }
 }
diff --git a/src/connector/src/source/nexmark/source/combined_event.rs b/src/connector/src/source/nexmark/source/combined_event.rs
index 99100e523f5ad..e932b584b52c7 100644
--- a/src/connector/src/source/nexmark/source/combined_event.rs
+++ b/src/connector/src/source/nexmark/source/combined_event.rs
@@ -16,7 +16,7 @@ use nexmark::event::{Auction, Bid, Event, EventType, Person};
 use risingwave_common::array::StructValue;
 use risingwave_common::row::OwnedRow;
 use risingwave_common::types::struct_type::StructType;
-use risingwave_common::types::{DataType, Datum, NaiveDateTimeWrapper, ScalarImpl};
+use risingwave_common::types::{DataType, Datum, ScalarImpl, Timestamp};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
@@ -86,7 +86,7 @@ pub(crate) fn get_event_data_types(
 
     if let Some(row_id_index) = row_id_index {
         // _row_id
-        fields.insert(row_id_index, DataType::Int64);
+        fields.insert(row_id_index, DataType::Serial);
     }
 
     fields
@@ -229,8 +229,8 @@ fn person_to_datum(p: Person) -> Vec<Datum> {
         Some(ScalarImpl::Utf8(p.credit_card.into())),
         Some(ScalarImpl::Utf8(p.city.into())),
         Some(ScalarImpl::Utf8(p.state.into())),
-        Some(ScalarImpl::NaiveDateTime(
-            NaiveDateTimeWrapper::with_secs_nsecs(
+        Some(ScalarImpl::Timestamp(
+            Timestamp::with_secs_nsecs(
                 (p.date_time / 1_000) as i64,
                 (p.date_time % 1_000) as u32 * 1_000_000,
             )
@@ -248,15 +248,15 @@ fn auction_to_datum(a: Auction) -> Vec<Datum> {
         Some(ScalarImpl::Utf8(a.description.into())),
         Some(ScalarImpl::Int64(a.initial_bid as i64)),
         Some(ScalarImpl::Int64(a.reserve as i64)),
-        Some(ScalarImpl::NaiveDateTime(
-            NaiveDateTimeWrapper::with_secs_nsecs(
+        Some(ScalarImpl::Timestamp(
+            Timestamp::with_secs_nsecs(
                 (a.date_time / 1_000) as i64,
                 (a.date_time % 1_000) as u32 * 1_000_000,
             )
             .unwrap(),
         )),
-        Some(ScalarImpl::NaiveDateTime(
-            NaiveDateTimeWrapper::with_secs_nsecs(
+        Some(ScalarImpl::Timestamp(
+            Timestamp::with_secs_nsecs(
                 (a.expires / 1_000) as i64,
                 (a.expires % 1_000) as u32 * 1_000_000,
             )
@@ -277,8 +277,8 @@ fn bid_to_datum(b: Bid) -> Vec<Datum> {
         Some(ScalarImpl::Int64(b.price as i64)),
         Some(ScalarImpl::Utf8(b.channel.into())),
         Some(ScalarImpl::Utf8(b.url.into())),
-        Some(ScalarImpl::NaiveDateTime(
-            NaiveDateTimeWrapper::with_secs_nsecs(
+        Some(ScalarImpl::Timestamp(
+            Timestamp::with_secs_nsecs(
                 (b.date_time / 1_000) as i64,
                 (b.date_time % 1_000) as u32 * 1_000_000,
             )
diff --git a/src/connector/src/source/nexmark/source/message.rs b/src/connector/src/source/nexmark/source/message.rs
index ab96bcdee312d..d6af93862731d 100644
--- a/src/connector/src/source/nexmark/source/message.rs
+++ b/src/connector/src/source/nexmark/source/message.rs
@@ -13,7 +13,6 @@
 // limitations under the License.
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use bytes::Bytes;
 use nexmark::event::Event;
 
 use crate::source::nexmark::source::combined_event::CombinedEvent;
@@ -26,7 +25,7 @@ pub struct NexmarkMeta {
 pub struct NexmarkMessage {
     pub split_id: SplitId,
     pub sequence_number: String,
-    pub payload: Bytes,
+    pub payload: Vec<u8>,
 }
 
 impl From<NexmarkMessage> for SourceMessage {
@@ -53,12 +52,11 @@ impl NexmarkMessage {
             split_id,
             sequence_number: offset.to_string(),
             payload: match &event {
-                Event::Person(p) => serde_json::to_string(p),
-                Event::Auction(a) => serde_json::to_string(a),
-                Event::Bid(b) => serde_json::to_string(b),
+                Event::Person(p) => serde_json::to_vec(p),
+                Event::Auction(a) => serde_json::to_vec(a),
+                Event::Bid(b) => serde_json::to_vec(b),
             }
-            .unwrap()
-            .into(),
+            .unwrap(),
         }
     }
 
diff --git a/src/connector/src/source/pulsar/source/message.rs b/src/connector/src/source/pulsar/source/message.rs
index 91c4b0f4ed78c..10ffb75f0c40e 100644
--- a/src/connector/src/source/pulsar/source/message.rs
+++ b/src/connector/src/source/pulsar/source/message.rs
@@ -21,7 +21,7 @@ impl From<Message<Vec<u8>>> for SourceMessage {
         let message_id = msg.message_id.id;
 
         SourceMessage {
-            payload: Some(msg.payload.data.into()),
+            payload: Some(msg.payload.data),
             offset: format!(
                 "{}:{}:{}:{}",
                 message_id.ledger_id,
diff --git a/src/ctl/Cargo.toml b/src/ctl/Cargo.toml
index 3ce05c32fe538..fa6854ad1adb1 100644
--- a/src/ctl/Cargo.toml
+++ b/src/ctl/Cargo.toml
@@ -23,6 +23,7 @@ futures = { version = "0.3", default-features = false, features = ["alloc"] }
 itertools = "0.10"
 regex = "1.6.0"
 risingwave_common = { path = "../common" }
+risingwave_connector = { path = "../connector" }
 risingwave_frontend = { path = "../frontend" }
 risingwave_hummock_sdk = { path = "../storage/hummock_sdk" }
 risingwave_object_store = { path = "../object_store" }
diff --git a/src/ctl/src/cmd_impl/bench.rs b/src/ctl/src/cmd_impl/bench.rs
index b960171d5f9a9..3a0c6d5347a26 100644
--- a/src/ctl/src/cmd_impl/bench.rs
+++ b/src/ctl/src/cmd_impl/bench.rs
@@ -26,6 +26,7 @@ use size::Size;
 use tokio::task::JoinHandle;
 
 use super::table::{get_table_catalog, make_state_table};
+use crate::common::HummockServiceOpts;
 use crate::CtlContext;
 
 #[derive(Subcommand)]
@@ -37,6 +38,7 @@ pub enum BenchCommands {
         /// number of futures doing scan
         #[clap(long, default_value_t = 1)]
         threads: usize,
+        data_dir: Option<String>,
     },
 }
 
@@ -74,11 +76,17 @@ impl InterestedMetrics {
 
 pub async fn do_bench(context: &CtlContext, cmd: BenchCommands) -> Result<()> {
     let meta = context.meta_client().await?;
-    let (hummock, metrics) = context.hummock_store_with_metrics().await?;
     let next_cnt = Arc::new(AtomicU64::new(0));
     let iter_cnt = Arc::new(AtomicU64::new(0));
     match cmd {
-        BenchCommands::Scan { mv_name, threads } => {
+        BenchCommands::Scan {
+            mv_name,
+            threads,
+            data_dir,
+        } => {
+            let (hummock, metrics) = context
+                .hummock_store_with_metrics(HummockServiceOpts::from_env(data_dir)?)
+                .await?;
             let table = get_table_catalog(meta.clone(), mv_name).await?;
             let mut handlers = vec![];
             for i in 0..threads {
diff --git a/src/ctl/src/cmd_impl/hummock/list_kv.rs b/src/ctl/src/cmd_impl/hummock/list_kv.rs
index a287564a56dee..84a6f5a921810 100644
--- a/src/ctl/src/cmd_impl/hummock/list_kv.rs
+++ b/src/ctl/src/cmd_impl/hummock/list_kv.rs
@@ -15,12 +15,21 @@
 use core::ops::Bound::Unbounded;
 
 use risingwave_common::catalog::TableId;
+use risingwave_storage::hummock::CachePolicy;
 use risingwave_storage::store::{PrefetchOptions, ReadOptions, StateStoreReadExt};
 
+use crate::common::HummockServiceOpts;
 use crate::CtlContext;
 
-pub async fn list_kv(context: &CtlContext, epoch: u64, table_id: u32) -> anyhow::Result<()> {
-    let hummock = context.hummock_store().await?;
+pub async fn list_kv(
+    context: &CtlContext,
+    epoch: u64,
+    table_id: u32,
+    data_dir: Option<String>,
+) -> anyhow::Result<()> {
+    let hummock = context
+        .hummock_store(HummockServiceOpts::from_env(data_dir)?)
+        .await?;
     if epoch == u64::MAX {
         tracing::info!("using u64::MAX as epoch");
     }
@@ -38,6 +47,7 @@ pub async fn list_kv(context: &CtlContext, epoch: u64, table_id: u32) -> anyhow:
                     retention_seconds: None,
                     read_version_from_backup: false,
                     prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                    cache_policy: CachePolicy::NotFill,
                 },
             )
             .await?
diff --git a/src/ctl/src/cmd_impl/hummock/sst_dump.rs b/src/ctl/src/cmd_impl/hummock/sst_dump.rs
index 61a97305ddb30..ccf372bcbb383 100644
--- a/src/ctl/src/cmd_impl/hummock/sst_dump.rs
+++ b/src/ctl/src/cmd_impl/hummock/sst_dump.rs
@@ -13,21 +13,25 @@
 // limitations under the License.
 
 use std::collections::HashMap;
+use std::sync::Arc;
 
 use bytes::{Buf, Bytes};
 use chrono::offset::Utc;
 use chrono::DateTime;
 use clap::Args;
 use itertools::Itertools;
-use risingwave_common::row::{Row, RowDeserializer};
 use risingwave_common::types::to_text::ToText;
 use risingwave_common::util::epoch::Epoch;
 use risingwave_common::util::iter_util::ZipEqFast;
+use risingwave_common::util::value_encoding::column_aware_row_encoding::ColumnAwareSerde;
+use risingwave_common::util::value_encoding::{
+    BasicSerde, EitherSerde, ValueRowDeserializer, ValueRowSerdeNew,
+};
 use risingwave_frontend::TableCatalog;
 use risingwave_hummock_sdk::compaction_group::hummock_version_ext::HummockVersionExt;
 use risingwave_hummock_sdk::key::FullKey;
 use risingwave_hummock_sdk::HummockSstableObjectId;
-use risingwave_object_store::object::BlockLocation;
+use risingwave_object_store::object::{BlockLocation, ObjectMetadata, ObjectStoreImpl};
 use risingwave_pb::hummock::{Level, SstableInfo};
 use risingwave_rpc_client::MetaClient;
 use risingwave_storage::hummock::value::HummockValue;
@@ -36,6 +40,7 @@ use risingwave_storage::hummock::{
 };
 use risingwave_storage::monitor::StoreLocalStatistic;
 
+use crate::common::HummockServiceOpts;
 use crate::CtlContext;
 
 type TableData = HashMap<u32, TableCatalog>;
@@ -46,41 +51,51 @@ pub struct SstDumpArgs {
     object_id: Option<u64>,
     #[clap(short, long = "block-id")]
     block_id: Option<u64>,
-    #[clap(short = 'p', long = "print-entries")]
-    print_entries: bool,
-    #[clap(short = 'l', long = "print-level-info")]
+    #[clap(short = 'p', long = "print-entry")]
+    print_entry: bool,
+    #[clap(short = 'l', long = "print-level")]
     print_level: bool,
-}
-
-fn print_level(level: &Level) {
-    println!("Level Type: {}", level.level_type);
-    println!("Level Idx: {}", level.level_idx);
-    if level.level_idx == 0 {
-        println!("L0 Sub-Level Idx: {}", level.sub_level_id);
-    }
+    #[clap(short = 't', long = "print-table")]
+    print_table: bool,
+    #[clap(short = 'd')]
+    data_dir: Option<String>,
 }
 
 pub async fn sst_dump(context: &CtlContext, args: SstDumpArgs) -> anyhow::Result<()> {
     println!("Start sst dump with args: {:?}", args);
-    // Retrieves the Sstable store so we can access the SstableMeta
-    let meta_client = context.meta_client().await?;
-    let hummock = context.hummock_store().await?;
-    let version = hummock.inner().get_pinned_version().version();
-
-    let table_data = load_table_schemas(&meta_client).await?;
-    let sstable_store = &*hummock.sstable_store();
-
-    // TODO: We can avoid reading meta if `print_level` is false with the new block format.
-    for level in version.get_combined_levels() {
-        for sstable_info in &level.table_infos {
-            if let Some(object_id) = &args.object_id {
-                if *object_id == sstable_info.get_object_id() {
-                    if args.print_level {
-                        print_level(level);
+    let table_data = if args.print_entry && args.print_table {
+        let meta_client = context.meta_client().await?;
+        load_table_schemas(&meta_client).await?
+    } else {
+        TableData::default()
+    };
+    if args.print_level {
+        // Level information is retrieved from meta service
+        let hummock = context
+            .hummock_store(HummockServiceOpts::from_env(args.data_dir.clone())?)
+            .await?;
+        let version = hummock.inner().get_pinned_version().version();
+        let sstable_store = hummock.sstable_store();
+        for level in version.get_combined_levels() {
+            for sstable_info in &level.table_infos {
+                if let Some(object_id) = &args.object_id {
+                    if *object_id == sstable_info.get_object_id() {
+                        print_level(level, sstable_info);
+                        sst_dump_via_sstable_store(
+                            &sstable_store,
+                            sstable_info.get_object_id(),
+                            sstable_info.meta_offset,
+                            sstable_info.file_size,
+                            &table_data,
+                            &args,
+                        )
+                        .await?;
+                        return Ok(());
                     }
-
+                } else {
+                    print_level(level, sstable_info);
                     sst_dump_via_sstable_store(
-                        sstable_store,
+                        &sstable_store,
                         sstable_info.get_object_id(),
                         sstable_info.meta_offset,
                         sstable_info.file_size,
@@ -88,18 +103,41 @@ pub async fn sst_dump(context: &CtlContext, args: SstDumpArgs) -> anyhow::Result
                         &args,
                     )
                     .await?;
-                    return Ok(());
-                }
-            } else {
-                if args.print_level {
-                    print_level(level);
                 }
-
+            }
+        }
+    } else {
+        // Object information is retrieved from object store. Meta service is not required.
+        let hummock_service_opts = HummockServiceOpts::from_env(args.data_dir.clone())?;
+        let sstable_store = hummock_service_opts.create_sstable_store().await?;
+        if let Some(obj_id) = &args.object_id {
+            let obj_store = sstable_store.store();
+            let obj_path = sstable_store.get_sst_data_path(*obj_id);
+            let obj = &obj_store.list(&obj_path).await?[0];
+            print_object(obj);
+            let meta_offset = get_meta_offset_from_object(obj, obj_store.as_ref()).await?;
+            let obj_id = sstable_store.get_object_id_from_path(&obj.key);
+            sst_dump_via_sstable_store(
+                &sstable_store,
+                obj_id,
+                meta_offset,
+                obj.total_size as u64,
+                &table_data,
+                &args,
+            )
+            .await?;
+        } else {
+            let objects = sstable_store.list_ssts_from_object_store().await?;
+            for obj in objects {
+                print_object(&obj);
+                let meta_offset =
+                    get_meta_offset_from_object(&obj, sstable_store.store().as_ref()).await?;
+                let obj_id = sstable_store.get_object_id_from_path(&obj.key);
                 sst_dump_via_sstable_store(
-                    sstable_store,
-                    sstable_info.get_object_id(),
-                    sstable_info.meta_offset,
-                    sstable_info.file_size,
+                    &sstable_store,
+                    obj_id,
+                    meta_offset,
+                    obj.total_size as u64,
                     &table_data,
                     &args,
                 )
@@ -107,9 +145,46 @@ pub async fn sst_dump(context: &CtlContext, args: SstDumpArgs) -> anyhow::Result
             }
         }
     }
+
     Ok(())
 }
 
+fn print_level(level: &Level, sst_info: &SstableInfo) {
+    println!("Level Type: {}", level.level_type);
+    println!("Level Idx: {}", level.level_idx);
+    if level.level_idx == 0 {
+        println!("L0 Sub-Level Idx: {}", level.sub_level_id);
+    }
+    println!("SST id: {}", sst_info.sst_id);
+    println!("SST table_ids: {:?}", sst_info.table_ids);
+}
+
+fn print_object(obj: &ObjectMetadata) {
+    println!("Object Key: {}", obj.key);
+    println!("Object Size: {}", obj.total_size);
+    println!("Object Last Modified: {}", obj.last_modified);
+}
+
+async fn get_meta_offset_from_object(
+    obj: &ObjectMetadata,
+    obj_store: &ObjectStoreImpl,
+) -> anyhow::Result<u64> {
+    let meta_offset_loc = BlockLocation {
+        offset: obj.total_size
+            - (
+                // version, magic
+                2 * std::mem::size_of::<u32>() +
+                // footer, checksum
+                2 * std::mem::size_of::<u64>()
+            ),
+        size: std::mem::size_of::<u64>(),
+    };
+    Ok(obj_store
+        .read(&obj.key, Some(meta_offset_loc))
+        .await?
+        .get_u64_le())
+}
+
 pub async fn sst_dump_via_sstable_store(
     sstable_store: &SstableStore,
     object_id: HummockSstableObjectId,
@@ -129,6 +204,8 @@ pub async fn sst_dump_via_sstable_store(
         .await?;
     let sstable = sstable_cache.value().as_ref();
     let sstable_meta = &sstable.meta;
+    let smallest_key = FullKey::decode(&sstable_meta.smallest_key);
+    let largest_key = FullKey::decode(&sstable_meta.largest_key);
 
     println!("SST object id: {}", object_id);
     println!("-------------------------------------");
@@ -137,15 +214,24 @@ pub async fn sst_dump_via_sstable_store(
     println!("Key Range:");
     println!(
         "\tleft:\t{:?}\n\tright:\t{:?}\n\t",
-        sstable_meta.smallest_key, sstable_meta.largest_key,
+        smallest_key, largest_key,
     );
 
     println!("Estimated Table Size: {}", sstable_meta.estimated_size);
     println!("Bloom Filter Size: {}", sstable_meta.bloom_filter.len());
     println!("Key Count: {}", sstable_meta.key_count);
     println!("Version: {}", sstable_meta.version);
+    println!(
+        "Range Tomestone Count: {}",
+        sstable_meta.range_tombstone_list.len()
+    );
+    for range_tomstone in &sstable_meta.range_tombstone_list {
+        println!("\tstart: {:?}", range_tomstone.start_user_key);
+        println!("\tend: {:?}", range_tomstone.end_user_key);
+        println!("\tepoch: {:?}", range_tomstone.sequence);
+    }
 
-    println!("SST Block Count: {}", sstable.block_count());
+    println!("Block Count: {}", sstable.block_count());
     for i in 0..sstable.block_count() {
         if let Some(block_id) = &args.block_id {
             if *block_id == i as u64 {
@@ -184,6 +270,7 @@ async fn print_block(
     println!("\t-----------");
 
     let block_meta = &sst.meta.block_metas[block_idx];
+    let smallest_key = FullKey::decode(&block_meta.smallest_key);
     let data_path = sstable_store.get_sst_data_path(sst.id);
 
     // Retrieve encoded block data in bytes
@@ -200,15 +287,16 @@ async fn print_block(
     let compression = CompressionAlgorithm::decode(&mut &block_data[len - 9..len - 8])?;
 
     println!(
-        "\tOffset: {}, Size: {}, Checksum: {}, Compression Algorithm: {:?}",
-        block_meta.offset, block_meta.len, checksum, compression
+        "\tOffset: {}, Size: {}, Checksum: {}, Compression Algorithm: {:?}, Smallest Key: {:?}",
+        block_meta.offset, block_meta.len, checksum, compression, smallest_key
     );
 
-    if args.print_entries {
+    if args.print_entry {
         print_kv_pairs(
             block_data,
             table_data,
             block_meta.uncompressed_size as usize,
+            args,
         )?;
     }
 
@@ -220,6 +308,7 @@ fn print_kv_pairs(
     block_data: Bytes,
     table_data: &TableData,
     uncompressed_capacity: usize,
+    args: &SstDumpArgs,
 ) -> anyhow::Result<()> {
     println!("\tKV-Pairs:");
 
@@ -229,32 +318,20 @@ fn print_kv_pairs(
     block_iter.seek_to_first();
 
     while block_iter.is_valid() {
-        let raw_full_key = block_iter.key();
         let full_key = block_iter.key();
-        let raw_user_key = full_key.user_key.encode();
-
         let full_val = block_iter.value();
-        let humm_val = HummockValue::from_slice(block_iter.value())?;
-        let (is_put, user_val) = match humm_val {
-            HummockValue::Put(uval) => (true, uval),
-            HummockValue::Delete => (false, &[] as &[u8]),
-        };
+        let humm_val = HummockValue::from_slice(full_val)?;
 
         let epoch = Epoch::from(full_key.epoch);
         let date_time = DateTime::<Utc>::from(epoch.as_system_time());
 
-        println!(
-            "\t\t  full key: {:02x?}, len={}",
-            raw_full_key,
-            raw_full_key.encoded_len()
-        );
-        println!("\t\tfull value: {:02x?}, len={}", full_val, full_val.len());
-        println!("\t\t  user key: {:02x?}", raw_user_key);
-        println!("\t\tuser value: {:02x?}", user_val);
-        println!("\t\t     epoch: {} ({})", epoch, date_time);
-        println!("\t\t      type: {}", if is_put { "Put" } else { "Delete" });
+        println!("\t\t   key: {:?}, len={}", full_key, full_key.encoded_len());
+        println!("\t\t value: {:?}, len={}", humm_val, humm_val.encoded_len());
+        println!("\t\t epoch: {} ({})", epoch, date_time);
 
-        print_table_column(full_key, user_val, table_data, is_put)?;
+        if args.print_table {
+            print_table_column(full_key, humm_val, table_data)?;
+        }
 
         println!();
 
@@ -267,13 +344,12 @@ fn print_kv_pairs(
 /// If possible, prints information about the table, column, and stored value.
 fn print_table_column(
     full_key: FullKey<&[u8]>,
-    user_val: &[u8],
+    humm_val: HummockValue<&[u8]>,
     table_data: &TableData,
-    is_put: bool,
 ) -> anyhow::Result<()> {
     let table_id = full_key.user_key.table_id.table_id();
 
-    print!("\t\t     table: {} - ", table_id);
+    print!("\t\t table: id={}, ", table_id);
     let table_catalog = match table_data.get(&table_id) {
         None => {
             // Table may have been dropped.
@@ -282,25 +358,42 @@ fn print_table_column(
         }
         Some(table) => table,
     };
-    println!("{}", table_catalog.name);
-    if !is_put {
-        return Ok(());
-    }
+    println!(
+        "name={}, version={:?}",
+        table_catalog.name,
+        table_catalog.version()
+    );
 
-    let column_desc = table_catalog
-        .value_indices
-        .iter()
-        .map(|idx| table_catalog.columns[*idx].column_desc.name.clone())
-        .collect_vec();
-    let data_types = table_catalog
-        .value_indices
-        .iter()
-        .map(|idx| table_catalog.columns[*idx].data_type().clone())
-        .collect_vec();
-    let row_deserializer = RowDeserializer::new(data_types);
-    let row = row_deserializer.deserialize(user_val)?;
-    for (c, v) in column_desc.iter().zip_eq_fast(row.iter()) {
-        println!("\t\t    column: {} {}", c, v.to_text());
+    if let Some(user_val) = humm_val.into_user_value() {
+        let column_desc = table_catalog
+            .value_indices
+            .iter()
+            .map(|idx| table_catalog.columns[*idx].column_desc.name.clone())
+            .collect_vec();
+        let data_types = table_catalog
+            .value_indices
+            .iter()
+            .map(|idx| table_catalog.columns[*idx].data_type().clone())
+            .collect_vec();
+        let column_ids = table_catalog
+            .value_indices
+            .iter()
+            .map(|idx| table_catalog.columns[*idx].column_id())
+            .collect_vec();
+        let schema = Arc::from(data_types.into_boxed_slice());
+        let row_deserializer: EitherSerde = if table_catalog.version().is_some() {
+            ColumnAwareSerde::new(&column_ids, schema).into()
+        } else {
+            BasicSerde::new(&column_ids, schema).into()
+        };
+        let row = row_deserializer.deserialize(user_val)?;
+        for (c, v) in column_desc.iter().zip_eq_fast(row.iter()) {
+            println!(
+                "\t\tcolumn: {} {:?}",
+                c,
+                v.as_ref().map(|v| v.as_scalar_ref_impl().to_text())
+            );
+        }
     }
 
     Ok(())
diff --git a/src/ctl/src/cmd_impl/meta/cluster_info.rs b/src/ctl/src/cmd_impl/meta/cluster_info.rs
index 1226e39f2bbd4..d2c7303467533 100644
--- a/src/ctl/src/cmd_impl/meta/cluster_info.rs
+++ b/src/ctl/src/cmd_impl/meta/cluster_info.rs
@@ -15,9 +15,13 @@
 use std::collections::{BTreeMap, HashMap};
 
 use comfy_table::{Attribute, Cell, Row, Table};
+use itertools::Itertools;
 use risingwave_common::util::addr::HostAddr;
+use risingwave_connector::source::{SplitImpl, SplitMetaData};
 use risingwave_pb::meta::table_fragments::State;
 use risingwave_pb::meta::GetClusterInfoResponse;
+use risingwave_pb::source::ConnectorSplits;
+use risingwave_pb::stream_plan::FragmentTypeFlag;
 
 use crate::CtlContext;
 
@@ -27,6 +31,48 @@ pub async fn get_cluster_info(context: &CtlContext) -> anyhow::Result<GetCluster
     Ok(response)
 }
 
+pub async fn source_split_info(context: &CtlContext) -> anyhow::Result<()> {
+    let GetClusterInfoResponse {
+        worker_nodes: _,
+        source_infos: _,
+        table_fragments,
+        mut actor_splits,
+    } = get_cluster_info(context).await?;
+
+    for table_fragment in &table_fragments {
+        if table_fragment.actor_splits.is_empty() {
+            continue;
+        }
+
+        println!("Table #{}", table_fragment.table_id);
+
+        for fragment in table_fragment.fragments.values() {
+            if fragment.fragment_type_mask & FragmentTypeFlag::Source as u32 == 0 {
+                continue;
+            }
+
+            println!("\tFragment #{}", fragment.fragment_id);
+            for actor in &fragment.actors {
+                let ConnectorSplits { splits } = actor_splits.remove(&actor.actor_id).unwrap();
+                let splits = splits
+                    .iter()
+                    .map(|split| SplitImpl::try_from(split).unwrap())
+                    .map(|split| split.id())
+                    .collect_vec();
+
+                println!(
+                    "\t\tActor #{} ({}): [{}]",
+                    actor.actor_id,
+                    splits.len(),
+                    splits.join(",")
+                );
+            }
+        }
+    }
+
+    Ok(())
+}
+
 pub async fn cluster_info(context: &CtlContext) -> anyhow::Result<()> {
     let GetClusterInfoResponse {
         worker_nodes,
diff --git a/src/ctl/src/cmd_impl/table/scan.rs b/src/ctl/src/cmd_impl/table/scan.rs
index 5a77b942ebacb..d110d024e467c 100644
--- a/src/ctl/src/cmd_impl/table/scan.rs
+++ b/src/ctl/src/cmd_impl/table/scan.rs
@@ -28,6 +28,7 @@ use risingwave_storage::table::Distribution;
 use risingwave_storage::StateStore;
 use risingwave_stream::common::table::state_table::StateTable;
 
+use crate::common::HummockServiceOpts;
 use crate::CtlContext;
 
 pub async fn get_table_catalog(meta: MetaClient, mv_name: String) -> Result<TableCatalog> {
@@ -95,16 +96,20 @@ pub fn make_storage_table<S: StateStore>(hummock: S, table: &TableCatalog) -> St
     )
 }
 
-pub async fn scan(context: &CtlContext, mv_name: String) -> Result<()> {
+pub async fn scan(context: &CtlContext, mv_name: String, data_dir: Option<String>) -> Result<()> {
     let meta_client = context.meta_client().await?;
-    let hummock = context.hummock_store().await?;
+    let hummock = context
+        .hummock_store(HummockServiceOpts::from_env(data_dir)?)
+        .await?;
     let table = get_table_catalog(meta_client, mv_name).await?;
     do_scan(table, hummock).await
 }
 
-pub async fn scan_id(context: &CtlContext, table_id: u32) -> Result<()> {
+pub async fn scan_id(context: &CtlContext, table_id: u32, data_dir: Option<String>) -> Result<()> {
     let meta_client = context.meta_client().await?;
-    let hummock = context.hummock_store().await?;
+    let hummock = context
+        .hummock_store(HummockServiceOpts::from_env(data_dir)?)
+        .await?;
     let table = get_table_catalog_by_id(meta_client, table_id).await?;
     do_scan(table, hummock).await
 }
diff --git a/src/ctl/src/common.rs b/src/ctl/src/common.rs
index e914961f86eff..383e87ebf9e11 100644
--- a/src/ctl/src/common.rs
+++ b/src/ctl/src/common.rs
@@ -16,3 +16,4 @@ mod context;
 mod hummock_service;
 mod meta_service;
 pub use context::*;
+pub use hummock_service::HummockServiceOpts;
diff --git a/src/ctl/src/common/context.rs b/src/ctl/src/common/context.rs
index e47917052d87f..c63da48907190 100644
--- a/src/ctl/src/common/context.rs
+++ b/src/ctl/src/common/context.rs
@@ -37,18 +37,21 @@ impl CtlContext {
             .cloned()
     }
 
-    pub async fn hummock_store(&self) -> anyhow::Result<MonitoredStateStore<HummockStorage>> {
-        let (hummock, _) = self.hummock_store_with_metrics().await?;
+    pub async fn hummock_store(
+        &self,
+        hummock_opts: HummockServiceOpts,
+    ) -> anyhow::Result<MonitoredStateStore<HummockStorage>> {
+        let (hummock, _) = self.hummock_store_with_metrics(hummock_opts).await?;
         Ok(hummock)
     }
 
     pub async fn hummock_store_with_metrics(
         &self,
+        mut hummock_opts: HummockServiceOpts,
     ) -> anyhow::Result<(MonitoredStateStore<HummockStorage>, Metrics)> {
         let meta_client = self.meta_client().await?;
         self.hummock
             .get_or_try_init(|| async {
-                let mut hummock_opts = HummockServiceOpts::from_env()?;
                 hummock_opts
                     .create_hummock_store_with_metrics(&meta_client)
                     .await
diff --git a/src/ctl/src/common/hummock_service.rs b/src/ctl/src/common/hummock_service.rs
index 763892e4b89af..596cb7df2c7cd 100644
--- a/src/ctl/src/common/hummock_service.rs
+++ b/src/ctl/src/common/hummock_service.rs
@@ -17,9 +17,12 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::{anyhow, bail, Result};
+use risingwave_object_store::object::parse_remote_object_store;
 use risingwave_rpc_client::MetaClient;
 use risingwave_storage::hummock::hummock_meta_client::MonitoredHummockMetaClient;
-use risingwave_storage::hummock::{HummockStorage, TieredCacheMetricsBuilder};
+use risingwave_storage::hummock::{
+    HummockStorage, SstableStore, TieredCache, TieredCacheMetricsBuilder,
+};
 use risingwave_storage::monitor::{
     CompactorMetrics, HummockMetrics, HummockStateStoreMetrics, MonitoredStateStore,
     MonitoredStorageMetrics, ObjectStoreMetrics,
@@ -31,6 +34,7 @@ use tokio::task::JoinHandle;
 
 pub struct HummockServiceOpts {
     pub hummock_url: String,
+    pub data_dir: Option<String>,
 
     heartbeat_handle: Option<JoinHandle<()>>,
     heartbeat_shutdown_sender: Option<Sender<()>>,
@@ -51,9 +55,14 @@ impl HummockServiceOpts {
     /// Currently, we will read these variables for meta:
     ///
     /// * `RW_HUMMOCK_URL`: hummock store address
-    pub fn from_env() -> Result<Self> {
+    pub fn from_env(data_dir: Option<String>) -> Result<Self> {
         let hummock_url = match env::var("RW_HUMMOCK_URL") {
             Ok(url) => {
+                if !url.starts_with("hummock+") {
+                    return Err(anyhow!(
+                        "only url starting with 'hummock+' is supported in risectl"
+                    ));
+                }
                 tracing::info!("using Hummock URL from `RW_HUMMOCK_URL`: {}", url);
                 url
             }
@@ -74,11 +83,25 @@ For `./risedev apply-compose-deploy` users,
         };
         Ok(Self {
             hummock_url,
+            data_dir,
             heartbeat_handle: None,
             heartbeat_shutdown_sender: None,
         })
     }
 
+    fn get_storage_opts(&self) -> StorageOpts {
+        let mut opts = StorageOpts {
+            share_buffer_compaction_worker_threads_number: 0,
+            ..Default::default()
+        };
+
+        if let Some(dir) = &self.data_dir {
+            opts.data_directory = dir.clone();
+        }
+
+        opts
+    }
+
     pub async fn create_hummock_store_with_metrics(
         &mut self,
         meta_client: &MetaClient,
@@ -93,10 +116,7 @@ For `./risedev apply-compose-deploy` users,
         self.heartbeat_shutdown_sender = Some(heartbeat_shutdown_sender);
 
         // FIXME: allow specify custom config
-        let opts = StorageOpts {
-            share_buffer_compaction_worker_threads_number: 0,
-            ..Default::default()
-        };
+        let opts = self.get_storage_opts();
 
         tracing::info!("using StorageOpts: {:#?}", opts);
 
@@ -135,4 +155,24 @@ For `./risedev apply-compose-deploy` users,
             Err(anyhow!("only Hummock state store is supported in risectl"))
         }
     }
+
+    pub async fn create_sstable_store(&self) -> Result<Arc<SstableStore>> {
+        let object_store = parse_remote_object_store(
+            self.hummock_url.strip_prefix("hummock+").unwrap(),
+            Arc::new(ObjectStoreMetrics::unused()),
+            "Hummock",
+        )
+        .await;
+
+        let opts = self.get_storage_opts();
+
+        Ok(Arc::new(SstableStore::new(
+            Arc::new(object_store),
+            opts.data_directory,
+            opts.block_cache_capacity_mb * (1 << 20),
+            opts.meta_cache_capacity_mb * (1 << 20),
+            0,
+            TieredCache::none(),
+        )))
+    }
 }
diff --git a/src/ctl/src/lib.rs b/src/ctl/src/lib.rs
index 6d41574fd7a89..5c6b57f888bf7 100644
--- a/src/ctl/src/lib.rs
+++ b/src/ctl/src/lib.rs
@@ -95,6 +95,9 @@ enum HummockCommands {
 
         #[clap(short, long = "table-id")]
         table_id: u32,
+
+        // data directory for hummock state store. None: use default
+        data_dir: Option<String>,
     },
     SstDump(SstDumpArgs),
     /// trigger a targeted compaction through compaction_group_id
@@ -158,11 +161,15 @@ enum TableCommands {
     Scan {
         /// name of the materialized view to operate on
         mv_name: String,
+        // data directory for hummock state store. None: use default
+        data_dir: Option<String>,
     },
     /// scan a state table using Id
     ScanById {
         /// id of the state table to operate on
         table_id: u32,
+        // data directory for hummock state store. None: use default
+        data_dir: Option<String>,
     },
     /// list all state tables
     List,
@@ -176,6 +183,8 @@ enum MetaCommands {
     Resume,
     /// get cluster info
     ClusterInfo,
+    /// get source split info
+    SourceSplitInfo,
     /// Reschedule the parallel unit in the stream graph
     ///
     /// The format is `fragment_id-[removed]+[added]`
@@ -248,8 +257,12 @@ pub async fn start_impl(opts: CliOpts, context: &CtlContext) -> Result<()> {
         }) => {
             cmd_impl::hummock::list_version_deltas(context, start_id, num_epochs).await?;
         }
-        Commands::Hummock(HummockCommands::ListKv { epoch, table_id }) => {
-            cmd_impl::hummock::list_kv(context, epoch, table_id).await?;
+        Commands::Hummock(HummockCommands::ListKv {
+            epoch,
+            table_id,
+            data_dir,
+        }) => {
+            cmd_impl::hummock::list_kv(context, epoch, table_id, data_dir).await?;
         }
         Commands::Hummock(HummockCommands::SstDump(args)) => {
             cmd_impl::hummock::sst_dump(context, args).await.unwrap()
@@ -315,17 +328,20 @@ pub async fn start_impl(opts: CliOpts, context: &CtlContext) -> Result<()> {
             cmd_impl::hummock::split_compaction_group(context, compaction_group_id, &table_ids)
                 .await?;
         }
-        Commands::Table(TableCommands::Scan { mv_name }) => {
-            cmd_impl::table::scan(context, mv_name).await?
+        Commands::Table(TableCommands::Scan { mv_name, data_dir }) => {
+            cmd_impl::table::scan(context, mv_name, data_dir).await?
         }
-        Commands::Table(TableCommands::ScanById { table_id }) => {
-            cmd_impl::table::scan_id(context, table_id).await?
+        Commands::Table(TableCommands::ScanById { table_id, data_dir }) => {
+            cmd_impl::table::scan_id(context, table_id, data_dir).await?
         }
         Commands::Table(TableCommands::List) => cmd_impl::table::list(context).await?,
         Commands::Bench(cmd) => cmd_impl::bench::do_bench(context, cmd).await?,
         Commands::Meta(MetaCommands::Pause) => cmd_impl::meta::pause(context).await?,
         Commands::Meta(MetaCommands::Resume) => cmd_impl::meta::resume(context).await?,
         Commands::Meta(MetaCommands::ClusterInfo) => cmd_impl::meta::cluster_info(context).await?,
+        Commands::Meta(MetaCommands::SourceSplitInfo) => {
+            cmd_impl::meta::source_split_info(context).await?
+        }
         Commands::Meta(MetaCommands::Reschedule { plan, dry_run }) => {
             cmd_impl::meta::reschedule(context, plan, dry_run).await?
         }
diff --git a/src/expr/Cargo.toml b/src/expr/Cargo.toml
index c17dde73e7100..c1e8c66846ecf 100644
--- a/src/expr/Cargo.toml
+++ b/src/expr/Cargo.toml
@@ -22,6 +22,7 @@ arrow-schema = "34"
 async-trait = "0.1"
 chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
 chrono-tz = { version = "0.7", features = ["case-insensitive"] }
+ctor = "0.1"
 dyn-clone = "1"
 either = "1"
 futures-util = "0.3"
@@ -33,18 +34,21 @@ parse-display = "0.6"
 paste = "1"
 regex = "1"
 risingwave_common = { path = "../common" }
+risingwave_expr_macro = { path = "macro" }
 risingwave_pb = { path = "../prost" }
 risingwave_udf = { path = "../udf" }
 speedate = "0.7.0"
 static_assertions = "1"
 thiserror = "1"
 tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] }
+tracing = "0.1"
 
 [target.'cfg(not(madsim))'.dependencies]
 workspace-hack = { path = "../workspace-hack" }
 
 [dev-dependencies]
 criterion = "0.4"
+serde_json = "1"
 
 [[bench]]
 name = "expr"
diff --git a/src/expr/benches/expr.rs b/src/expr/benches/expr.rs
index eacbb54436616..e32b568f84be9 100644
--- a/src/expr/benches/expr.rs
+++ b/src/expr/benches/expr.rs
@@ -24,19 +24,16 @@ use std::cell::RefCell;
 use criterion::async_executor::FuturesExecutor;
 use criterion::{criterion_group, criterion_main, Criterion};
 use risingwave_common::array::*;
-use risingwave_common::types::test_utils::IntervalUnitTestExt;
+use risingwave_common::types::test_utils::IntervalTestExt;
 use risingwave_common::types::{
-    DataType, DataTypeName, Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper,
-    NaiveTimeWrapper, OrderedF32, OrderedF64,
+    DataType, DataTypeName, Date, Decimal, Interval, Time, Timestamp, F32, F64,
 };
-use risingwave_expr::expr::test_utils::{make_expression, make_string_literal};
 use risingwave_expr::expr::*;
 use risingwave_expr::sig::agg::agg_func_sigs;
-use risingwave_expr::sig::cast::cast_sigs;
 use risingwave_expr::sig::func::func_sigs;
 use risingwave_expr::vector_op::agg::create_agg_state_unary;
 use risingwave_expr::ExprError;
-use risingwave_pb::expr::expr_node::{RexNode, Type as ExprType};
+use risingwave_pb::expr::expr_node::PbType;
 
 criterion_group!(benches, bench_expr, bench_raw);
 criterion_main!(benches);
@@ -52,18 +49,14 @@ fn bench_expr(c: &mut Criterion) {
             I16Array::from_iter((1..=CHUNK_SIZE).map(|_| 1)).into(),
             I32Array::from_iter((1..=CHUNK_SIZE).map(|_| 1)).into(),
             I64Array::from_iter((1..=CHUNK_SIZE).map(|_| 1)).into(),
-            F32Array::from_iter((1..=CHUNK_SIZE).map(|i| OrderedF32::from(i as f32))).into(),
-            F64Array::from_iter((1..=CHUNK_SIZE).map(|i| OrderedF64::from(i as f64))).into(),
+            F32Array::from_iter((1..=CHUNK_SIZE).map(|i| F32::from(i as f32))).into(),
+            F64Array::from_iter((1..=CHUNK_SIZE).map(|i| F64::from(i as f64))).into(),
             DecimalArray::from_iter((1..=CHUNK_SIZE).map(Decimal::from)).into(),
-            NaiveDateArray::from_iter((1..=CHUNK_SIZE).map(|_| NaiveDateWrapper::default())).into(),
-            NaiveTimeArray::from_iter((1..=CHUNK_SIZE).map(|_| NaiveTimeWrapper::default())).into(),
-            NaiveDateTimeArray::from_iter(
-                (1..=CHUNK_SIZE).map(|_| NaiveDateTimeWrapper::default()),
-            )
-            .into(),
+            DateArray::from_iter((1..=CHUNK_SIZE).map(|_| Date::default())).into(),
+            TimeArray::from_iter((1..=CHUNK_SIZE).map(|_| Time::default())).into(),
+            TimestampArray::from_iter((1..=CHUNK_SIZE).map(|_| Timestamp::default())).into(),
             I64Array::from_iter(1..=CHUNK_SIZE as i64).into(),
-            IntervalArray::from_iter((1..=CHUNK_SIZE).map(|i| IntervalUnit::from_days(i as _)))
-                .into(),
+            IntervalArray::from_iter((1..=CHUNK_SIZE).map(|i| Interval::from_days(i as _))).into(),
             Utf8Array::from_iter_display((1..=CHUNK_SIZE).map(Some)).into(),
             Utf8Array::from_iter_display((1..=CHUNK_SIZE).map(Some))
                 .into_bytes_array()
@@ -119,23 +112,17 @@ fn bench_expr(c: &mut Criterion) {
             Utf8Array::from_iter_display([Some(true)].into_iter().cycle().take(CHUNK_SIZE)).into(),
             // 20: date string
             Utf8Array::from_iter_display(
-                [Some(NaiveDateWrapper::default())]
-                    .into_iter()
-                    .cycle()
-                    .take(CHUNK_SIZE),
+                [Some(Date::default())].into_iter().cycle().take(CHUNK_SIZE),
             )
             .into(),
             // 21: time string
             Utf8Array::from_iter_display(
-                [Some(NaiveTimeWrapper::default())]
-                    .into_iter()
-                    .cycle()
-                    .take(CHUNK_SIZE),
+                [Some(Time::default())].into_iter().cycle().take(CHUNK_SIZE),
             )
             .into(),
             // 22: timestamp string
             Utf8Array::from_iter_display(
-                [Some(NaiveDateTimeWrapper::default())]
+                [Some(Timestamp::default())]
                     .into_iter()
                     .cycle()
                     .take(CHUNK_SIZE),
@@ -151,12 +138,19 @@ fn bench_expr(c: &mut Criterion) {
             .into(),
             // 24: interval string
             Utf8Array::from_iter_display(
-                [Some(IntervalUnit::default())]
+                [Some(Interval::default())]
                     .into_iter()
                     .cycle()
                     .take(CHUNK_SIZE),
             )
             .into(),
+            // 25: serial array
+            SerialArray::from_iter((1..=CHUNK_SIZE).map(|i| Serial::from(i as i64))).into(),
+            // 26: jsonb array
+            JsonbArray::from_iter(
+                (1..=CHUNK_SIZE).map(|i| JsonbVal::from_serde(serde_json::Value::Number(i.into()))),
+            )
+            .into(),
         ],
         CHUNK_SIZE,
     );
@@ -165,6 +159,7 @@ fn bench_expr(c: &mut Criterion) {
         InputRefExpression::new(DataType::Int16, 1),
         InputRefExpression::new(DataType::Int32, 2),
         InputRefExpression::new(DataType::Int64, 3),
+        InputRefExpression::new(DataType::Serial, 25),
         InputRefExpression::new(DataType::Float32, 4),
         InputRefExpression::new(DataType::Float64, 5),
         InputRefExpression::new(DataType::Decimal, 6),
@@ -175,12 +170,14 @@ fn bench_expr(c: &mut Criterion) {
         InputRefExpression::new(DataType::Interval, 11),
         InputRefExpression::new(DataType::Varchar, 12),
         InputRefExpression::new(DataType::Bytea, 13),
+        InputRefExpression::new(DataType::Jsonb, 26),
     ];
-    let inputref_for_type = |ty: DataType| {
+    let input_index_for_type = |ty: DataType| {
         inputrefs
             .iter()
             .find(|r| r.return_type() == ty)
-            .expect("expression not found")
+            .unwrap_or_else(|| panic!("expression not found for {ty:?}"))
+            .index()
     };
     const TIMEZONE: usize = 14;
     const TIME_FIELD: usize = 15;
@@ -210,66 +207,74 @@ fn bench_expr(c: &mut Criterion) {
     });
 
     let sigs = func_sigs();
-    let sigs = sigs.sorted_by_cached_key(|sig| sig.to_string_no_return());
-    for sig in sigs {
+    let sigs = sigs.sorted_by_cached_key(|sig| format!("{sig:?}"));
+    'sig: for sig in sigs {
         if sig
             .inputs_type
             .iter()
             .any(|t| matches!(t, DataTypeName::Struct | DataTypeName::List))
         {
             // TODO: support struct and list
-            println!("todo: {}", sig.to_string_no_return());
+            println!("todo: {sig:?}");
             continue;
         }
 
-        let mut prost = make_expression(
-            sig.func,
-            &sig.inputs_type
-                .iter()
-                .map(|t| DataType::from(*t).prost_type_name())
-                .collect_vec(),
-            &sig.inputs_type
-                .iter()
-                .enumerate()
-                .map(|(idx, t)| match (sig.func, idx) {
-                    (ExprType::AtTimeZone, 1) => TIMEZONE,
-                    (ExprType::DateTrunc, 0) => TIME_FIELD,
-                    (ExprType::DateTrunc, 2) => TIMEZONE,
-                    (ExprType::Extract, 0) => match sig.inputs_type[1] {
-                        DataTypeName::Date => EXTRACT_FIELD_DATE,
-                        DataTypeName::Time => EXTRACT_FIELD_TIME,
-                        DataTypeName::Timestamp => EXTRACT_FIELD_TIMESTAMP,
-                        DataTypeName::Timestamptz => EXTRACT_FIELD_TIMESTAMPTZ,
-                        t => panic!("unexpected type: {t:?}"),
-                    },
-                    _ => inputref_for_type((*t).into()).index(),
-                })
-                .collect_vec(),
-        );
-        if sig.func == ExprType::ToChar {
-            let RexNode::FuncCall(f) = prost.rex_node.as_mut().unwrap() else { unreachable!() };
-            f.children[1] = make_string_literal("YYYY/MM/DD HH:MM:SS");
+        let mut children = vec![];
+        for (i, t) in sig.inputs_type.iter().enumerate() {
+            use DataTypeName::*;
+            let idx = match (sig.func, i) {
+                (PbType::ToChar, 1) => {
+                    children.push(
+                        LiteralExpression::new(
+                            DataType::Varchar,
+                            Some("YYYY/MM/DD HH:MM:SS".into()),
+                        )
+                        .boxed(),
+                    );
+                    continue;
+                }
+                (PbType::Cast, 0) if *t == DataTypeName::Varchar => match sig.ret_type {
+                    Boolean => BOOL_STRING,
+                    Int16 | Int32 | Int64 | Float32 | Float64 | Decimal => NUMBER_STRING,
+                    Date => DATE_STRING,
+                    Time => TIME_STRING,
+                    Timestamp => TIMESTAMP_STRING,
+                    Timestamptz => TIMESTAMPTZ_STRING,
+                    Interval => INTERVAL_STRING,
+                    Bytea => NUMBER_STRING, // any
+                    _ => {
+                        println!("todo: {sig:?}");
+                        continue 'sig;
+                    }
+                },
+                (PbType::AtTimeZone, 1) => TIMEZONE,
+                (PbType::DateTrunc, 0) => TIME_FIELD,
+                (PbType::DateTrunc, 2) => TIMEZONE,
+                (PbType::Extract, 0) => match sig.inputs_type[1] {
+                    Date => EXTRACT_FIELD_DATE,
+                    Time => EXTRACT_FIELD_TIME,
+                    Timestamp => EXTRACT_FIELD_TIMESTAMP,
+                    Timestamptz => EXTRACT_FIELD_TIMESTAMPTZ,
+                    t => panic!("unexpected type: {t:?}"),
+                },
+                _ => input_index_for_type((*t).into()),
+            };
+            children.push(InputRefExpression::new(DataType::from(*t), idx).boxed());
         }
-        let expr = match build_from_prost(&prost) {
-            Ok(expr) => expr,
-            Err(e) => {
-                println!("error: {e}");
-                continue;
-            }
-        };
-        c.bench_function(&sig.to_string_no_return(), |bencher| {
+        let expr = build(sig.func, sig.ret_type.into(), children).unwrap();
+        c.bench_function(&format!("{sig:?}"), |bencher| {
             bencher.to_async(FuturesExecutor).iter(|| expr.eval(&input))
         });
     }
 
     for sig in agg_func_sigs() {
         if sig.inputs_type.len() != 1 {
-            println!("todo: {}", sig.to_string_no_return());
+            println!("todo: {sig:?}");
             continue;
         }
         let agg = match create_agg_state_unary(
             sig.inputs_type[0].into(),
-            inputref_for_type(sig.inputs_type[0].into()).index(),
+            input_index_for_type(sig.inputs_type[0].into()),
             sig.func,
             sig.ret_type.into(),
             false,
@@ -292,65 +297,6 @@ fn bench_expr(c: &mut Criterion) {
             })
         });
     }
-
-    for sig in cast_sigs() {
-        let expr = match new_unary_expr(
-            ExprType::Cast,
-            sig.to_type.into(),
-            if matches!(sig.from_type, DataTypeName::Varchar) {
-                use DataTypeName::*;
-                let idx = match sig.to_type {
-                    Boolean => BOOL_STRING,
-                    Int16 | Int32 | Int64 | Float32 | Float64 | Decimal => NUMBER_STRING,
-                    Date => DATE_STRING,
-                    Time => TIME_STRING,
-                    Timestamp => TIMESTAMP_STRING,
-                    Timestamptz => TIMESTAMPTZ_STRING,
-                    Interval => INTERVAL_STRING,
-                    Bytea => NUMBER_STRING, // any
-                    _ => {
-                        println!("todo: {}", sig.to_string_no_return());
-                        continue;
-                    }
-                };
-                InputRefExpression::new(DataType::Varchar, idx).boxed()
-            } else {
-                inputref_for_type(sig.from_type.into()).clone().boxed()
-            },
-        ) {
-            Ok(expr) => expr,
-            Err(e) => {
-                println!("error: {e}");
-                continue;
-            }
-        };
-        c.bench_function(&sig.to_string_no_return(), |bencher| {
-            bencher.to_async(FuturesExecutor).iter(|| expr.eval(&input))
-        });
-    }
-
-    // ~360ns
-    // This should be the optimization goal for our add expression.
-    c.bench_function("TBD/add(int32,int32)", |bencher| {
-        bencher.iter(|| {
-            let a = input.column_at(2).array_ref().as_int32();
-            let b = input.column_at(2).array_ref().as_int32();
-            assert_eq!(a.len(), b.len());
-            let mut c = (a.raw_iter())
-                .zip(b.raw_iter())
-                .map(|(a, b)| a + b)
-                .collect::<I32Array>();
-            let mut overflow = false;
-            for ((a, b), c) in a.raw_iter().zip(b.raw_iter()).zip(c.raw_iter()) {
-                overflow |= (c ^ a) & (c ^ b) < 0;
-            }
-            if overflow {
-                return Err(ExprError::NumericOverflow);
-            }
-            c.set_bitmap(a.null_bitmap() & b.null_bitmap());
-            Ok(c)
-        })
-    });
 }
 
 /// Evaluate on raw Rust array.
@@ -457,4 +403,27 @@ fn bench_raw(c: &mut Criterion) {
             })
         },
     );
+
+    // ~360ns
+    // This should be the optimization goal for our add expression.
+    c.bench_function("TBD/add(int32,int32)", |bencher| {
+        bencher.iter(|| {
+            let a = (0..CHUNK_SIZE as i32).collect::<I32Array>();
+            let b = (0..CHUNK_SIZE as i32).collect::<I32Array>();
+            assert_eq!(a.len(), b.len());
+            let mut c = (a.raw_iter())
+                .zip(b.raw_iter())
+                .map(|(a, b)| a + b)
+                .collect::<I32Array>();
+            let mut overflow = false;
+            for ((a, b), c) in a.raw_iter().zip(b.raw_iter()).zip(c.raw_iter()) {
+                overflow |= (c ^ a) & (c ^ b) < 0;
+            }
+            if overflow {
+                return Err(ExprError::NumericOverflow);
+            }
+            c.set_bitmap(a.null_bitmap() & b.null_bitmap());
+            Ok(c)
+        })
+    });
 }
diff --git a/src/expr/macro/Cargo.toml b/src/expr/macro/Cargo.toml
new file mode 100644
index 0000000000000..524f144053930
--- /dev/null
+++ b/src/expr/macro/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "risingwave_expr_macro"
+version = "0.1.0"
+edition = "2021"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+proc-macro = true
+
+[dependencies]
+itertools = "0.10"
+proc-macro-error = "1"
+proc-macro2 = "1"
+quote = "1"
+syn = "1"
diff --git a/src/expr/macro/src/gen.rs b/src/expr/macro/src/gen.rs
new file mode 100644
index 0000000000000..09c4d3ba753c8
--- /dev/null
+++ b/src/expr/macro/src/gen.rs
@@ -0,0 +1,286 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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.
+
+//! Generate code for the functions.
+
+use itertools::Itertools;
+use proc_macro2::Span;
+use quote::{format_ident, quote};
+
+use super::*;
+
+impl FunctionAttr {
+    /// Generate descriptors of the function.
+    ///
+    /// If the function arguments or return type contains wildcard, it will generate descriptors for
+    /// each of them.
+    pub fn generate_descriptors(&self, build_fn: bool) -> Result<TokenStream2> {
+        let args = self.args.iter().map(|ty| types::expand_type_wildcard(ty));
+        let ret = types::expand_type_wildcard(&self.ret);
+        let mut tokens = TokenStream2::new();
+        // multi_cartesian_product should emit an empty set if the input is empty.
+        let args_cartesian_product =
+            args.multi_cartesian_product()
+                .chain(match self.args.is_empty() {
+                    true => vec![vec![]],
+                    false => vec![],
+                });
+        for (args, mut ret) in args_cartesian_product.cartesian_product(ret) {
+            if ret == "auto" {
+                ret = types::min_compatible_type(&args);
+            }
+            let attr = FunctionAttr {
+                name: self.name.clone(),
+                args: args.iter().map(|s| s.to_string()).collect(),
+                ret: ret.to_string(),
+                batch: self.batch.clone(),
+                user_fn: self.user_fn.clone(),
+            };
+            tokens.extend(attr.generate_descriptor_one(build_fn)?);
+        }
+        Ok(tokens)
+    }
+
+    /// Generate a descriptor of the function.
+    ///
+    /// The types of arguments and return value should not contain wildcard.
+    fn generate_descriptor_one(&self, build_fn: bool) -> Result<TokenStream2> {
+        let name = self.name.clone();
+
+        fn to_data_type_name(ty: &str) -> Result<TokenStream2> {
+            let variant = format_ident!(
+                "{}",
+                types::to_data_type_name(ty).ok_or_else(|| Error::new(
+                    Span::call_site(),
+                    format!("unknown type: {}", ty),
+                ))?
+            );
+            Ok(quote! { risingwave_common::types::DataTypeName::#variant })
+        }
+        let mut args = Vec::with_capacity(self.args.len());
+        for ty in &self.args {
+            args.push(to_data_type_name(ty)?);
+        }
+        let ret = to_data_type_name(&self.ret)?;
+
+        let pb_type = format_ident!("{}", utils::to_camel_case(&name));
+        let ctor_name = format_ident!("{}_{}_{}", self.name, self.args.join("_"), self.ret);
+        let descriptor_type = quote! { crate::sig::func::FuncSign };
+        let build_fn = if build_fn {
+            let name = format_ident!("{}", self.user_fn.name);
+            quote! { #name }
+        } else {
+            self.generate_build_fn()?
+        };
+        Ok(quote! {
+            #[ctor::ctor]
+            fn #ctor_name() {
+                unsafe { crate::sig::func::_register(#descriptor_type {
+                    name: #name,
+                    func: risingwave_pb::expr::expr_node::Type::#pb_type,
+                    inputs_type: &[#(#args),*],
+                    ret_type: #ret,
+                    build: #build_fn,
+                }) };
+            }
+        })
+    }
+
+    fn generate_build_fn(&self) -> Result<TokenStream2> {
+        let num_args = self.args.len();
+        let fn_name = format_ident!("{}", self.user_fn.name);
+        let arg_arrays = self
+            .args
+            .iter()
+            .map(|t| format_ident!("{}", types::to_array_type(t)));
+        let ret_array = format_ident!("{}", types::to_array_type(&self.ret));
+        let arg_types = self
+            .args
+            .iter()
+            .map(|t| types::to_data_type(t).parse::<TokenStream2>().unwrap());
+        let ret_type = types::to_data_type(&self.ret)
+            .parse::<TokenStream2>()
+            .unwrap();
+        let exprs = (0..num_args)
+            .map(|i| format_ident!("e{i}"))
+            .collect::<Vec<_>>();
+        let exprs0 = exprs.clone();
+
+        let build_expr = if self.ret == "varchar" && self.user_fn.is_writer_style() {
+            let template_struct = match num_args {
+                1 => format_ident!("UnaryBytesExpression"),
+                2 => format_ident!("BinaryBytesExpression"),
+                3 => format_ident!("TernaryBytesExpression"),
+                4 => format_ident!("QuaternaryBytesExpression"),
+                _ => return Err(Error::new(Span::call_site(), "unsupported arguments")),
+            };
+            let args = (0..=num_args).map(|i| format_ident!("x{i}"));
+            let args1 = args.clone();
+            let func = match self.user_fn.return_type {
+                ReturnType::T => quote! { Ok(#fn_name(#(#args1),*)) },
+                ReturnType::Result => quote! { #fn_name(#(#args1),*) },
+                _ => todo!("returning Option is not supported yet"),
+            };
+            quote! {
+                Ok(Box::new(crate::expr::template::#template_struct::<#(#arg_arrays),*, _>::new(
+                    #(#exprs),*,
+                    return_type,
+                    |#(#args),*| #func,
+                )))
+            }
+        } else if self.args.iter().all(|t| t == "boolean")
+            && self.ret == "boolean"
+            && !self.user_fn.return_type.contains_result()
+            && self.batch.is_some()
+        {
+            let template_struct = match num_args {
+                1 => format_ident!("BooleanUnaryExpression"),
+                2 => format_ident!("BooleanBinaryExpression"),
+                _ => return Err(Error::new(Span::call_site(), "unsupported arguments")),
+            };
+            let batch = format_ident!("{}", self.batch.as_ref().unwrap());
+            let args = (0..num_args).map(|i| format_ident!("x{i}"));
+            let args1 = args.clone();
+            let func = if self.user_fn.arg_option && self.user_fn.return_type == ReturnType::Option
+            {
+                quote! { #fn_name(#(#args1),*) }
+            } else if self.user_fn.arg_option {
+                quote! { Some(#fn_name(#(#args1),*)) }
+            } else {
+                let args2 = args.clone();
+                let args3 = args.clone();
+                quote! {
+                    match (#(#args1),*) {
+                        (#(Some(#args2)),*) => Some(#fn_name(#(#args3),*)),
+                        _ => None,
+                    }
+                }
+            };
+            quote! {
+                Ok(Box::new(crate::expr::template_fast::#template_struct::new(
+                    #(#exprs),*,
+                    #batch,
+                    |#(#args),*| #func,
+                )))
+            }
+        } else if self.args.len() == 2 && self.ret == "boolean" && self.user_fn.is_pure() {
+            let compatible_type = types::to_data_type(types::min_compatible_type(&self.args))
+                .parse::<TokenStream2>()
+                .unwrap();
+            let args = (0..num_args).map(|i| format_ident!("x{i}"));
+            let args1 = args.clone();
+            let generic = if self.user_fn.generic == 3 {
+                // XXX: for generic compare functions, we need to specify the compatible type
+                quote! { ::<_, _, #compatible_type> }
+            } else {
+                quote! {}
+            };
+            quote! {
+                Ok(Box::new(crate::expr::template_fast::CompareExpression::<_, #(#arg_arrays),*>::new(
+                    #(#exprs),*,
+                    |#(#args),*| #fn_name #generic(#(#args1),*),
+                )))
+            }
+        } else if self.args.iter().all(|t| types::is_primitive(t)) && self.user_fn.is_pure() {
+            let template_struct = match num_args {
+                1 => format_ident!("UnaryExpression"),
+                2 => format_ident!("BinaryExpression"),
+                _ => return Err(Error::new(Span::call_site(), "unsupported arguments")),
+            };
+            quote! {
+                Ok(Box::new(crate::expr::template_fast::#template_struct::<_, #(#arg_types),*, #ret_type>::new(
+                    #(#exprs),*,
+                    return_type,
+                    #fn_name,
+                )))
+            }
+        } else if self.user_fn.arg_option || self.user_fn.return_type.contains_option() {
+            let template_struct = match num_args {
+                1 => format_ident!("UnaryNullableExpression"),
+                2 => format_ident!("BinaryNullableExpression"),
+                3 => format_ident!("TernaryNullableExpression"),
+                _ => return Err(Error::new(Span::call_site(), "unsupported arguments")),
+            };
+            let args = (0..num_args).map(|i| format_ident!("x{i}"));
+            let args1 = args.clone();
+            let generic = if self.user_fn.generic == 3 {
+                // XXX: for generic compare functions, we need to specify the compatible type
+                let compatible_type = types::to_data_type(types::min_compatible_type(&self.args))
+                    .parse::<TokenStream2>()
+                    .unwrap();
+                quote! { ::<_, _, #compatible_type> }
+            } else {
+                quote! {}
+            };
+            let mut func = quote! { #fn_name #generic(#(#args1),*) };
+            func = match self.user_fn.return_type {
+                ReturnType::T => quote! { Ok(Some(#func)) },
+                ReturnType::Option => quote! { Ok(#func) },
+                ReturnType::Result => quote! { #func.map(Some) },
+                ReturnType::ResultOption => quote! { #func },
+            };
+            if !self.user_fn.arg_option {
+                let args2 = args.clone();
+                let args3 = args.clone();
+                func = quote! {
+                    match (#(#args2),*) {
+                        (#(Some(#args3)),*) => #func,
+                        _ => Ok(None),
+                    }
+                };
+            };
+            quote! {
+                Ok(Box::new(crate::expr::template::#template_struct::<#(#arg_arrays),*, #ret_array, _>::new(
+                    #(#exprs),*,
+                    return_type,
+                    |#(#args),*| #func,
+                )))
+            }
+        } else {
+            let template_struct = match num_args {
+                1 => format_ident!("UnaryExpression"),
+                2 => format_ident!("BinaryExpression"),
+                3 => format_ident!("TernaryExpression"),
+                _ => return Err(Error::new(Span::call_site(), "unsupported arguments")),
+            };
+            let args = (0..num_args).map(|i| format_ident!("x{i}"));
+            let args1 = args.clone();
+            let func = match self.user_fn.return_type {
+                ReturnType::T => quote! { Ok(#fn_name(#(#args1),*)) },
+                ReturnType::Result => quote! { #fn_name(#(#args1),*) },
+                _ => panic!("return type should not contain Option"),
+            };
+            quote! {
+                Ok(Box::new(crate::expr::template::#template_struct::<#(#arg_arrays),*, #ret_array, _>::new(
+                    #(#exprs),*,
+                    return_type,
+                    |#(#args),*| #func,
+                )))
+            }
+        };
+        Ok(quote! {
+            |return_type, children| {
+                use risingwave_common::array::*;
+                use risingwave_common::types::*;
+                use risingwave_pb::expr::expr_node::RexNode;
+
+                crate::ensure!(children.len() == #num_args);
+                let mut iter = children.into_iter();
+                #(let #exprs0 = iter.next().unwrap();)*
+
+                #build_expr
+            }
+        })
+    }
+}
diff --git a/src/expr/macro/src/lib.rs b/src/expr/macro/src/lib.rs
new file mode 100644
index 0000000000000..9e00e6edb6505
--- /dev/null
+++ b/src/expr/macro/src/lib.rs
@@ -0,0 +1,114 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 proc_macro::TokenStream;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::ToTokens;
+use syn::{parse_macro_input, Error, Result};
+
+mod gen;
+mod parse;
+mod types;
+mod utils;
+
+#[proc_macro_attribute]
+pub fn function(attr: TokenStream, item: TokenStream) -> TokenStream {
+    let attr = parse_macro_input!(attr as syn::AttributeArgs);
+    let item = parse_macro_input!(item as syn::ItemFn);
+
+    fn inner(attr: syn::AttributeArgs, mut item: syn::ItemFn) -> Result<TokenStream2> {
+        let fn_attr = FunctionAttr::parse(&attr, &mut item)?;
+
+        let mut tokens = item.into_token_stream();
+        tokens.extend(fn_attr.generate_descriptors(false)?);
+        Ok(tokens)
+    }
+    match inner(attr, item) {
+        Ok(tokens) => tokens.into(),
+        Err(e) => e.to_compile_error().into(),
+    }
+}
+
+#[proc_macro_attribute]
+pub fn build_function(attr: TokenStream, item: TokenStream) -> TokenStream {
+    let attr = parse_macro_input!(attr as syn::AttributeArgs);
+    let item = parse_macro_input!(item as syn::ItemFn);
+
+    fn inner(attr: syn::AttributeArgs, mut item: syn::ItemFn) -> Result<TokenStream2> {
+        let fn_attr = FunctionAttr::parse(&attr, &mut item)?;
+
+        let mut tokens = item.into_token_stream();
+        tokens.extend(fn_attr.generate_descriptors(true)?);
+        Ok(tokens)
+    }
+    match inner(attr, item) {
+        Ok(tokens) => tokens.into(),
+        Err(e) => e.to_compile_error().into(),
+    }
+}
+
+#[derive(Debug)]
+struct FunctionAttr {
+    name: String,
+    args: Vec<String>,
+    ret: String,
+    batch: Option<String>,
+    user_fn: UserFunctionAttr,
+}
+
+#[derive(Debug, Clone)]
+struct UserFunctionAttr {
+    /// Function name
+    name: String,
+    /// The last argument type is `&mut dyn Write`.
+    write: bool,
+    /// The argument type are `Option`s.
+    arg_option: bool,
+    /// The return type.
+    return_type: ReturnType,
+    /// The number of generic types.
+    generic: usize,
+    // /// `#[list(0)]` in arguments.
+    // list: Vec<(usize, usize)>,
+    // /// `#[struct(0)]` in arguments.
+    // struct_: Vec<(usize, usize)>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+enum ReturnType {
+    T,
+    Option,
+    Result,
+    ResultOption,
+}
+
+impl ReturnType {
+    fn contains_result(&self) -> bool {
+        matches!(self, ReturnType::Result | ReturnType::ResultOption)
+    }
+
+    fn contains_option(&self) -> bool {
+        matches!(self, ReturnType::Option | ReturnType::ResultOption)
+    }
+}
+
+impl UserFunctionAttr {
+    fn is_writer_style(&self) -> bool {
+        self.write && !self.arg_option
+    }
+
+    fn is_pure(&self) -> bool {
+        !self.write && !self.arg_option && self.return_type == ReturnType::T
+    }
+}
diff --git a/src/expr/macro/src/parse.rs b/src/expr/macro/src/parse.rs
new file mode 100644
index 0000000000000..50a577328e27e
--- /dev/null
+++ b/src/expr/macro/src/parse.rs
@@ -0,0 +1,160 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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.
+
+//! Parse the tokens of the macro.
+
+use proc_macro2::Span;
+
+use super::*;
+
+impl FunctionAttr {
+    /// Parse the attribute of the function macro.
+    pub fn parse(attr: &syn::AttributeArgs, item: &mut syn::ItemFn) -> Result<Self> {
+        let sig = attr.get(0).ok_or_else(|| {
+            Error::new(
+                Span::call_site(),
+                "expected #[function(\"name(arg1, arg2) -> ret\")]",
+            )
+        })?;
+
+        let sig_str = match sig {
+            syn::NestedMeta::Lit(syn::Lit::Str(lit_str)) => lit_str.value(),
+            _ => return Err(Error::new_spanned(sig, "expected string literal")),
+        };
+
+        let (name_args, ret) = sig_str
+            .split_once("->")
+            .ok_or_else(|| Error::new_spanned(sig, "expected '->'"))?;
+        let (name, args) = name_args
+            .split_once('(')
+            .ok_or_else(|| Error::new_spanned(sig, "expected '('"))?;
+        let args = args.trim_start().trim_end_matches([')', ' ']);
+
+        let batch = attr.iter().find_map(|n| {
+            let syn::NestedMeta::Meta(syn::Meta::NameValue(nv)) = n else { return None };
+            if !nv.path.is_ident("batch") {
+                return None;
+            };
+            let syn::Lit::Str(ref lit_str) = nv.lit else { return None };
+            Some(lit_str.value())
+        });
+
+        let user_fn = UserFunctionAttr::parse(item)?;
+
+        Ok(FunctionAttr {
+            name: name.trim().to_string(),
+            args: if args.is_empty() {
+                vec![]
+            } else {
+                args.split(',').map(|s| s.trim().to_string()).collect()
+            },
+            ret: ret.trim().to_string(),
+            batch,
+            user_fn,
+        })
+    }
+}
+
+impl UserFunctionAttr {
+    fn parse(item: &mut syn::ItemFn) -> Result<Self> {
+        Ok(UserFunctionAttr {
+            name: item.sig.ident.to_string(),
+            write: last_arg_is_write(item),
+            arg_option: args_are_all_option(item),
+            return_type: return_type(item),
+            generic: item.sig.generics.params.len(),
+            // prebuild: extract_prebuild_arg(item),
+        })
+    }
+}
+
+/// Check if the last argument is `&mut dyn Write`.
+fn last_arg_is_write(item: &syn::ItemFn) -> bool {
+    let Some(syn::FnArg::Typed(arg)) = item.sig.inputs.last() else { return false };
+    let syn::Type::Reference(syn::TypeReference { elem, .. }) = arg.ty.as_ref() else { return false };
+    let syn::Type::TraitObject(syn::TypeTraitObject { bounds, .. }) = elem.as_ref() else { return false };
+    let Some(syn::TypeParamBound::Trait(syn::TraitBound { path, .. })) = bounds.first() else { return false };
+    path.segments.last().map_or(false, |s| s.ident == "Write")
+}
+
+/// Check if all arguments are `Option`s.
+fn args_are_all_option(item: &syn::ItemFn) -> bool {
+    if item.sig.inputs.is_empty() {
+        return false;
+    }
+    for arg in &item.sig.inputs {
+        let syn::FnArg::Typed(arg) = arg else { return false };
+        let syn::Type::Path(path) = arg.ty.as_ref() else { return false };
+        let Some(seg) = path.path.segments.last() else { return false };
+        if seg.ident != "Option" {
+            return false;
+        }
+    }
+    true
+}
+
+/// Check the return type.
+fn return_type(item: &syn::ItemFn) -> ReturnType {
+    if return_value_is_result_option(item) {
+        ReturnType::ResultOption
+    } else if return_value_is(item, "Result") {
+        ReturnType::Result
+    } else if return_value_is(item, "Option") {
+        ReturnType::Option
+    } else {
+        ReturnType::T
+    }
+}
+
+/// Check if the return value is `type_`.
+fn return_value_is(item: &syn::ItemFn, type_: &str) -> bool {
+    let syn::ReturnType::Type(_, ty) = &item.sig.output else { return false };
+    let syn::Type::Path(path) = ty.as_ref() else { return false };
+    let Some(seg) = path.path.segments.last() else { return false };
+    seg.ident == type_
+}
+
+/// Check if the return value is `Result<Option<T>>`.
+fn return_value_is_result_option(item: &syn::ItemFn) -> bool {
+    let syn::ReturnType::Type(_, ty) = &item.sig.output else { return false };
+    let syn::Type::Path(path) = ty.as_ref() else { return false };
+    let Some(seg) = path.path.segments.last() else { return false };
+    if seg.ident != "Result" {
+        return false;
+    }
+    let syn::PathArguments::AngleBracketed(args) = &seg.arguments else { return false };
+    let Some(syn::GenericArgument::Type(ty)) = args.args.first() else { return false };
+    let syn::Type::Path(path) = ty else { return false };
+    let Some(seg) = path.path.segments.last() else { return false };
+    seg.ident == "Option"
+}
+
+/// Extract `#[prebuild("function_name")]` from arguments.
+fn _extract_prebuild_arg(item: &mut syn::ItemFn) -> Option<(usize, String)> {
+    for (i, arg) in item.sig.inputs.iter_mut().enumerate() {
+        let syn::FnArg::Typed(arg) = arg else { continue };
+        if let Some(idx) = arg
+            .attrs
+            .iter_mut()
+            .position(|att| att.path.is_ident("prebuild"))
+        {
+            let attr = arg.attrs.remove(idx);
+            // XXX: this is a hack to parse a string literal from token stream
+            let s = attr.tokens.to_string();
+            let s = s.trim_start_matches("(\"").trim_end_matches("\")");
+            return Some((i, s.to_string()));
+        }
+    }
+    None
+}
diff --git a/src/expr/macro/src/types.rs b/src/expr/macro/src/types.rs
new file mode 100644
index 0000000000000..10e9d2466d039
--- /dev/null
+++ b/src/expr/macro/src/types.rs
@@ -0,0 +1,189 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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.
+
+//! This module provides utility functions for SQL data type conversion and manipulation.
+
+/// Expands a type wildcard string into a list of concrete types.
+pub fn expand_type_wildcard(ty: &str) -> Vec<&str> {
+    match ty {
+        "*" => vec![
+            "boolean",
+            "int16",
+            "int32",
+            "int64",
+            "float32",
+            "float64",
+            "decimal",
+            "serial",
+            "date",
+            "time",
+            "timestamp",
+            "timestamptz",
+            "interval",
+            "varchar",
+            "bytea",
+            "jsonb",
+            "struct",
+            "list",
+        ],
+        "*int" => vec!["int16", "int32", "int64"],
+        "*number" => vec!["int16", "int32", "int64", "float32", "float64", "decimal"],
+        _ => vec![ty],
+    }
+}
+
+/// Maps a data type to its corresponding type name.
+pub fn to_data_type_name(ty: &str) -> Option<&str> {
+    Some(match ty {
+        "boolean" => "Boolean",
+        "int16" => "Int16",
+        "int32" => "Int32",
+        "int64" => "Int64",
+        "float32" => "Float32",
+        "float64" => "Float64",
+        "decimal" => "Decimal",
+        "serial" => "Serial",
+        "date" => "Date",
+        "time" => "Time",
+        "timestamp" => "Timestamp",
+        "timestamptz" => "Timestamptz",
+        "interval" => "Interval",
+        "varchar" => "Varchar",
+        "bytea" => "Bytea",
+        "jsonb" => "Jsonb",
+        "struct" => "Struct",
+        "list" => "List",
+        _ => return None,
+    })
+}
+
+/// Computes the minimal compatible type between a pair of data types.
+pub fn min_compatible_type(types: &[impl AsRef<str>]) -> &str {
+    if types.len() == 1 {
+        return types[0].as_ref();
+    }
+    assert_eq!(types.len(), 2);
+    match (types[0].as_ref(), types[1].as_ref()) {
+        (a, b) if a == b => a,
+
+        ("int16", "int16") => "int16",
+        ("int16", "int32") => "int32",
+        ("int16", "int64") => "int64",
+        ("int16", "float32") => "float64",
+        ("int16", "float64") => "float64",
+        ("int16", "decimal") => "decimal",
+
+        ("int32", "int16") => "int32",
+        ("int32", "int32") => "int32",
+        ("int32", "int64") => "int64",
+        ("int32", "float32") => "float64",
+        ("int32", "float64") => "float64",
+        ("int32", "decimal") => "decimal",
+
+        ("int64", "int16") => "int64",
+        ("int64", "int32") => "int64",
+        ("int64", "int64") => "int64",
+        ("int64", "float32") => "float64",
+        ("int64", "float64") => "float64",
+        ("int64", "decimal") => "decimal",
+
+        ("float32", "int16") => "float64",
+        ("float32", "int32") => "float64",
+        ("float32", "int64") => "float64",
+        ("float32", "float32") => "float32",
+        ("float32", "float64") => "float64",
+        ("float32", "decimal") => "float64",
+
+        ("float64", "int16") => "float64",
+        ("float64", "int32") => "float64",
+        ("float64", "int64") => "float64",
+        ("float64", "float32") => "float64",
+        ("float64", "float64") => "float64",
+        ("float64", "decimal") => "float64",
+
+        ("decimal", "int16") => "decimal",
+        ("decimal", "int32") => "decimal",
+        ("decimal", "int64") => "decimal",
+        ("decimal", "float32") => "float64",
+        ("decimal", "float64") => "float64",
+        ("decimal", "decimal") => "decimal",
+
+        ("date", "timestamp") => "timestamp",
+        ("timestamp", "date") => "timestamp",
+        ("time", "interval") => "interval",
+        ("interval", "time") => "interval",
+
+        (a, b) => panic!("unknown minimal compatible type for {a:?} and {b:?}"),
+    }
+}
+
+/// Maps a data type to its corresponding array type name.
+pub fn to_array_type(ty: &str) -> &str {
+    match ty {
+        "boolean" => "BoolArray",
+        "int16" => "I16Array",
+        "int32" => "I32Array",
+        "int64" => "I64Array",
+        "float32" => "F32Array",
+        "float64" => "F64Array",
+        "decimal" => "DecimalArray",
+        "serial" => "SerialArray",
+        "date" => "DateArray",
+        "time" => "TimeArray",
+        "timestamp" => "TimestampArray",
+        "timestamptz" => "I64Array",
+        "interval" => "IntervalArray",
+        "varchar" => "Utf8Array",
+        "bytea" => "BytesArray",
+        "jsonb" => "JsonbArray",
+        "struct" => "StructArray",
+        "list" => "ListArray",
+        _ => panic!("unknown type: {ty:?}"),
+    }
+}
+
+/// Maps a data type to its corresponding `ScalarRef` type name.
+pub fn to_data_type(ty: &str) -> &str {
+    match ty {
+        "boolean" => "bool",
+        "int16" => "i16",
+        "int32" => "i32",
+        "int64" => "i64",
+        "float32" => "F32",
+        "float64" => "F64",
+        "decimal" => "Decimal",
+        "serial" => "Serial",
+        "date" => "Date",
+        "time" => "Time",
+        "timestamp" => "Timestamp",
+        "timestamptz" => "i64",
+        "interval" => "Interval",
+        "varchar" => "&str",
+        "bytea" => "&[u8]",
+        "jsonb" => "JsonbRef<'_>",
+        "struct" => "StructRef<'_>",
+        "list" => "ListRef<'_>",
+        _ => panic!("unknown type: {ty:?}"),
+    }
+}
+
+/// Checks if a data type is primitive.
+pub fn is_primitive(ty: &str) -> bool {
+    match ty {
+        "int16" | "int32" | "int64" | "float32" | "float64" | "decimal" | "date" | "time"
+        | "timestamp" | "timestamptz" | "interval" | "serial" => true,
+        "boolean" | "varchar" | "bytea" | "jsonb" | "struct" | "list" => false,
+        _ => panic!("unknown type: {ty:?}"),
+    }
+}
diff --git a/src/expr/macro/src/utils.rs b/src/expr/macro/src/utils.rs
new file mode 100644
index 0000000000000..788d09857cc93
--- /dev/null
+++ b/src/expr/macro/src/utils.rs
@@ -0,0 +1,29 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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.
+
+/// Convert a string from `snake_case` to `CamelCase`.
+pub fn to_camel_case(input: &str) -> String {
+    input
+        .split('_')
+        .map(|word| {
+            let mut chars = word.chars();
+            match chars.next() {
+                None => String::new(),
+                Some(first_char) => {
+                    format!("{}{}", first_char.to_uppercase(), chars.as_str())
+                }
+            }
+        })
+        .collect()
+}
diff --git a/src/expr/src/error.rs b/src/expr/src/error.rs
index d5eeddb11c649..fe48467fe18a9 100644
--- a/src/expr/src/error.rs
+++ b/src/expr/src/error.rs
@@ -17,7 +17,7 @@ use std::borrow::Cow;
 use risingwave_common::array::ArrayError;
 use risingwave_common::error::{ErrorCode, RwError};
 use risingwave_common::types::DataType;
-use risingwave_pb::ProstFieldNotFound;
+use risingwave_pb::PbFieldNotFound;
 use thiserror::Error;
 
 /// A specialized Result type for expression operations.
@@ -66,6 +66,9 @@ pub enum ExprError {
 
     #[error("UDF error: {0}")]
     Udf(#[from] risingwave_udf::Error),
+
+    #[error("not a constant")]
+    NotConstant,
 }
 
 impl From<ExprError> for RwError {
@@ -89,8 +92,8 @@ impl From<chrono::ParseError> for ExprError {
     }
 }
 
-impl From<ProstFieldNotFound> for ExprError {
-    fn from(err: ProstFieldNotFound) -> Self {
+impl From<PbFieldNotFound> for ExprError {
+    fn from(err: PbFieldNotFound) -> Self {
         Self::Internal(anyhow::anyhow!(
             "Failed to decode prost: field not found `{}`",
             err.0
diff --git a/src/expr/src/expr/build.rs b/src/expr/src/expr/build.rs
new file mode 100644
index 0000000000000..273f8a060c403
--- /dev/null
+++ b/src/expr/src/expr/build.rs
@@ -0,0 +1,274 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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::iter::Peekable;
+
+use itertools::Itertools;
+use risingwave_common::types::{DataType, ScalarImpl};
+use risingwave_pb::expr::expr_node::{PbType, RexNode};
+use risingwave_pb::expr::ExprNode;
+
+use super::expr_array_concat::ArrayConcatExpression;
+use super::expr_case::CaseExpression;
+use super::expr_coalesce::CoalesceExpression;
+use super::expr_concat_ws::ConcatWsExpression;
+use super::expr_field::FieldExpression;
+use super::expr_in::InExpression;
+use super::expr_nested_construct::NestedConstructExpression;
+use super::expr_regexp::RegexpMatchExpression;
+use super::expr_some_all::SomeAllExpression;
+use super::expr_udf::UdfExpression;
+use super::expr_vnode::VnodeExpression;
+use crate::expr::{BoxedExpression, Expression, InputRefExpression, LiteralExpression};
+use crate::sig::func::FUNC_SIG_MAP;
+use crate::{bail, ExprError, Result};
+
+/// Build an expression from protobuf.
+pub fn build_from_prost(prost: &ExprNode) -> Result<BoxedExpression> {
+    use PbType as E;
+
+    if let Some(RexNode::FuncCall(call)) = &prost.rex_node {
+        let args = call
+            .children
+            .iter()
+            .map(|c| DataType::from(c.get_return_type().unwrap()).into())
+            .collect_vec();
+        let return_type = DataType::from(prost.get_return_type().unwrap());
+
+        if let Some(desc) = FUNC_SIG_MAP.get(prost.expr_type(), &args, (&return_type).into()) {
+            let RexNode::FuncCall(func_call) = prost.get_rex_node().unwrap() else {
+                bail!("Expected RexNode::FuncCall");
+            };
+
+            let children = func_call
+                .get_children()
+                .iter()
+                .map(build_from_prost)
+                .try_collect()?;
+            return (desc.build)(return_type, children);
+        }
+    }
+
+    match prost.expr_type() {
+        // Dedicated types
+        E::All | E::Some => SomeAllExpression::try_from(prost).map(Expression::boxed),
+        E::In => InExpression::try_from(prost).map(Expression::boxed),
+        E::Case => CaseExpression::try_from(prost).map(Expression::boxed),
+        E::Coalesce => CoalesceExpression::try_from(prost).map(Expression::boxed),
+        E::ConcatWs => ConcatWsExpression::try_from(prost).map(Expression::boxed),
+        E::ConstantValue => LiteralExpression::try_from(prost).map(Expression::boxed),
+        E::InputRef => InputRefExpression::try_from(prost).map(Expression::boxed),
+        E::Field => FieldExpression::try_from(prost).map(Expression::boxed),
+        E::Array => NestedConstructExpression::try_from(prost).map(Expression::boxed),
+        E::Row => NestedConstructExpression::try_from(prost).map(Expression::boxed),
+        E::RegexpMatch => RegexpMatchExpression::try_from(prost).map(Expression::boxed),
+        E::ArrayCat | E::ArrayAppend | E::ArrayPrepend => {
+            // Now we implement these three functions as a single expression for the
+            // sake of simplicity. If performance matters at some time, we can split
+            // the implementation to improve performance.
+            ArrayConcatExpression::try_from(prost).map(Expression::boxed)
+        }
+        E::Vnode => VnodeExpression::try_from(prost).map(Expression::boxed),
+        E::Udf => UdfExpression::try_from(prost).map(Expression::boxed),
+        _ => Err(ExprError::UnsupportedFunction(format!(
+            "{:?}",
+            prost.get_expr_type()
+        ))),
+    }
+}
+
+/// Build an expression.
+pub fn build(
+    func: PbType,
+    ret_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let args = children
+        .iter()
+        .map(|c| c.return_type().into())
+        .collect_vec();
+    let desc = FUNC_SIG_MAP
+        .get(func, &args, (&ret_type).into())
+        .ok_or_else(|| {
+            ExprError::UnsupportedFunction(format!(
+                "{:?}({}) -> {:?}",
+                func,
+                args.iter().map(|t| format!("{:?}", t)).join(", "),
+                ret_type
+            ))
+        })?;
+    (desc.build)(ret_type, children)
+}
+
+pub(super) fn get_children_and_return_type(prost: &ExprNode) -> Result<(&[ExprNode], DataType)> {
+    let ret_type = DataType::from(prost.get_return_type().unwrap());
+    if let RexNode::FuncCall(func_call) = prost.get_rex_node().unwrap() {
+        Ok((func_call.get_children(), ret_type))
+    } else {
+        bail!("Expected RexNode::FuncCall");
+    }
+}
+
+/// Build an expression from a string.
+///
+/// # Example
+/// ```
+/// # use risingwave_expr::expr::build_from_pretty;
+/// build_from_pretty("42:int2"); // literal
+/// build_from_pretty("$0:int8"); // inputref
+/// build_from_pretty("(add:int8 42:int2 $1:int8)"); // function
+/// build_from_pretty("(add:int8 42:int2 (add:int8 42:int2 $1:int8))");
+/// ```
+///
+/// # Syntax
+///
+/// ```text
+/// <expr>      ::= <literal> | <input_ref> | <function>
+/// <literal>   ::= <value>:<type>
+/// <input_ref> ::= <index>:<type>
+/// <function>  ::= (<name>:<type> <expr>...)
+/// <name>      ::= [a-zA-Z_][a-zA-Z0-9_]*
+/// <index>     ::= $[0-9]+
+/// ```
+pub fn build_from_pretty(s: impl AsRef<str>) -> BoxedExpression {
+    let tokens = lexer(s.as_ref());
+    Parser::new(tokens.into_iter()).parse_expression()
+}
+
+struct Parser<Iter: Iterator> {
+    tokens: Peekable<Iter>,
+}
+
+impl<Iter: Iterator<Item = Token>> Parser<Iter> {
+    fn new(tokens: Iter) -> Self {
+        Self {
+            tokens: tokens.peekable(),
+        }
+    }
+
+    fn parse_expression(&mut self) -> BoxedExpression {
+        match self.tokens.next().expect("Unexpected end of input") {
+            Token::Index(index) => {
+                assert_eq!(self.tokens.next(), Some(Token::Colon), "Expected a Colon");
+                let ty = self.parse_type();
+                InputRefExpression::new(ty, index).boxed()
+            }
+            Token::LParen => {
+                let func = self.parse_function();
+                assert_eq!(self.tokens.next(), Some(Token::Colon), "Expected a Colon");
+                let ty = self.parse_type();
+
+                let mut children = Vec::new();
+                while self.tokens.peek() != Some(&Token::RParen) {
+                    children.push(self.parse_expression());
+                }
+                self.tokens.next(); // Consume the RParen
+
+                build(func, ty, children).expect("Failed to build")
+            }
+            Token::Literal(value) => {
+                assert_eq!(self.tokens.next(), Some(Token::Colon), "Expected a Colon");
+                let ty = self.parse_type();
+                let value = match value.as_str() {
+                    "null" => None,
+                    _ => Some(
+                        ScalarImpl::from_text(value.as_bytes(), &ty).expect_str("value", &value),
+                    ),
+                };
+                LiteralExpression::new(ty, value).boxed()
+            }
+            _ => panic!("Unexpected token"),
+        }
+    }
+
+    fn parse_type(&mut self) -> DataType {
+        match self.tokens.next().expect("Unexpected end of input") {
+            Token::Literal(name) => name.parse::<DataType>().expect_str("type", &name),
+            t => panic!("Expected a Literal, got {t:?}"),
+        }
+    }
+
+    fn parse_function(&mut self) -> PbType {
+        match self.tokens.next().expect("Unexpected end of input") {
+            Token::Literal(name) => {
+                PbType::from_str_name(&name.to_uppercase()).expect_str("function", &name)
+            }
+            t => panic!("Expected a Literal, got {t:?}"),
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Clone)]
+enum Token {
+    LParen,
+    RParen,
+    Colon,
+    Index(usize),
+    Literal(String),
+}
+
+fn lexer(input: &str) -> Vec<Token> {
+    let mut tokens = Vec::new();
+    let mut chars = input.chars().peekable();
+    while let Some(c) = chars.next() {
+        let token = match c {
+            '(' => Token::LParen,
+            ')' => Token::RParen,
+            ':' => Token::Colon,
+            '$' => {
+                let mut number = String::new();
+                while let Some(c) = chars.peek() && c.is_ascii_digit() {
+                    number.push(chars.next().unwrap());
+                }
+                let index = number.parse::<usize>().expect("Invalid number");
+                Token::Index(index)
+            }
+            ' ' | '\t' | '\r' | '\n' => continue,
+            _ => {
+                let mut literal = String::new();
+                literal.push(c);
+                while let Some(&c) = chars.peek() && !matches!(c, '(' | ')' | ':' | ' ' | '\t' | '\r' | '\n') {
+                    literal.push(chars.next().unwrap());
+                }
+                Token::Literal(literal)
+            }
+        };
+        tokens.push(token);
+    }
+    tokens
+}
+
+trait ExpectExt<T> {
+    fn expect_str(self, what: &str, s: &str) -> T;
+}
+
+impl<T> ExpectExt<T> for Option<T> {
+    #[track_caller]
+    fn expect_str(self, what: &str, s: &str) -> T {
+        match self {
+            Some(x) => x,
+            None => panic!("expect {what} in {s:?}"),
+        }
+    }
+}
+
+impl<T, E> ExpectExt<T> for std::result::Result<T, E> {
+    #[track_caller]
+    fn expect_str(self, what: &str, s: &str) -> T {
+        match self {
+            Ok(x) => x,
+            Err(_) => panic!("expect {what} in {s:?}"),
+        }
+    }
+}
diff --git a/src/expr/src/expr/build_expr_from_prost.rs b/src/expr/src/expr/build_expr_from_prost.rs
deleted file mode 100644
index eadc170431e15..0000000000000
--- a/src/expr/src/expr/build_expr_from_prost.rs
+++ /dev/null
@@ -1,584 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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 risingwave_common::try_match_expand;
-use risingwave_common::types::DataType;
-use risingwave_common::util::value_encoding::deserialize_datum;
-use risingwave_pb::expr::expr_node::{RexNode, Type};
-use risingwave_pb::expr::{ExprNode, FunctionCall};
-
-use super::expr_array_concat::ArrayConcatExpression;
-use super::expr_binary_bytes::{
-    new_ltrim_characters, new_repeat, new_rtrim_characters, new_substr_start, new_to_char,
-    new_trim_characters,
-};
-use super::expr_binary_nonnull::{
-    new_binary_expr, new_date_trunc_expr, new_like_default, new_to_timestamp,
-};
-use super::expr_binary_nullable::new_nullable_binary_expr;
-use super::expr_case::CaseExpression;
-use super::expr_coalesce::CoalesceExpression;
-use super::expr_concat_ws::ConcatWsExpression;
-use super::expr_field::FieldExpression;
-use super::expr_in::InExpression;
-use super::expr_nested_construct::NestedConstructExpression;
-use super::expr_quaternary_bytes::new_overlay_for_exp;
-use super::expr_regexp::RegexpMatchExpression;
-use super::expr_some_all::SomeAllExpression;
-use super::expr_ternary_bytes::{
-    new_overlay_exp, new_replace_expr, new_split_part_expr, new_substr_start_end,
-    new_translate_expr,
-};
-use super::expr_to_char_const_tmpl::{ExprToCharConstTmpl, ExprToCharConstTmplContext};
-use super::expr_to_timestamp_const_tmpl::{
-    ExprToTimestampConstTmpl, ExprToTimestampConstTmplContext,
-};
-use super::expr_udf::UdfExpression;
-use super::expr_unary::{
-    new_length_default, new_ltrim_expr, new_rtrim_expr, new_trim_expr, new_unary_expr,
-};
-use super::expr_vnode::VnodeExpression;
-use crate::expr::expr_array_distinct::ArrayDistinctExpression;
-use crate::expr::expr_array_to_string::ArrayToStringExpression;
-use crate::expr::expr_binary_nonnull::new_tumble_start;
-use crate::expr::expr_ternary::new_tumble_start_offset;
-use crate::expr::{
-    build_from_prost as expr_build_from_prost, BoxedExpression, Expression, InputRefExpression,
-    LiteralExpression,
-};
-use crate::vector_op::to_char::compile_pattern_to_chrono;
-use crate::{bail, ensure, ExprError, Result};
-
-pub fn build_from_prost(prost: &ExprNode) -> Result<BoxedExpression> {
-    use risingwave_pb::expr::expr_node::Type::*;
-
-    match prost.get_expr_type().unwrap() {
-        // Fixed number of arguments and based on `Unary/Binary/Ternary/...Expression`
-        Cast | Upper | Lower | Md5 | Not | IsTrue | IsNotTrue | IsFalse | IsNotFalse | IsNull
-        | IsNotNull | Neg | Ascii | Abs | Ceil | Floor | Round | Exp | BitwiseNot | CharLength
-        | BoolOut | OctetLength | BitLength | ToTimestamp | JsonbTypeof | JsonbArrayLength => {
-            build_unary_expr_prost(prost)
-        }
-        Equal | NotEqual | LessThan | LessThanOrEqual | GreaterThan | GreaterThanOrEqual | Add
-        | Subtract | Multiply | Divide | Modulus | Extract | RoundDigit | Pow | Position
-        | BitwiseShiftLeft | BitwiseShiftRight | BitwiseAnd | BitwiseOr | BitwiseXor | ConcatOp
-        | AtTimeZone | CastWithTimeZone | JsonbAccessInner | JsonbAccessStr => {
-            build_binary_expr_prost(prost)
-        }
-        And | Or | IsDistinctFrom | IsNotDistinctFrom | ArrayAccess | FormatType => {
-            build_nullable_binary_expr_prost(prost)
-        }
-        ToChar => build_to_char_expr(prost),
-        ToTimestamp1 => build_to_timestamp_expr(prost),
-        Length => build_length_expr(prost),
-        Replace => build_replace_expr(prost),
-        Like => build_like_expr(prost),
-        Repeat => build_repeat_expr(prost),
-        SplitPart => build_split_part_expr(prost),
-        Translate => build_translate_expr(prost),
-
-        // Variable number of arguments and based on `Unary/Binary/Ternary/...Expression`
-        TumbleStart => build_tumble_start_expr(prost),
-        Substr => build_substr_expr(prost),
-        Overlay => build_overlay_expr(prost),
-        Trim => build_trim_expr(prost),
-        Ltrim => build_ltrim_expr(prost),
-        Rtrim => build_rtrim_expr(prost),
-        DateTrunc => build_date_trunc_expr(prost),
-
-        // Dedicated types
-        All | Some => build_some_all_expr_prost(prost),
-        In => InExpression::try_from(prost).map(Expression::boxed),
-        Case => CaseExpression::try_from(prost).map(Expression::boxed),
-        Coalesce => CoalesceExpression::try_from(prost).map(Expression::boxed),
-        ConcatWs => ConcatWsExpression::try_from(prost).map(Expression::boxed),
-        ConstantValue => LiteralExpression::try_from(prost).map(Expression::boxed),
-        InputRef => InputRefExpression::try_from(prost).map(Expression::boxed),
-        Field => FieldExpression::try_from(prost).map(Expression::boxed),
-        Array => NestedConstructExpression::try_from(prost).map(Expression::boxed),
-        Row => NestedConstructExpression::try_from(prost).map(Expression::boxed),
-        RegexpMatch => RegexpMatchExpression::try_from(prost).map(Expression::boxed),
-        ArrayCat | ArrayAppend | ArrayPrepend => {
-            // Now we implement these three functions as a single expression for the
-            // sake of simplicity. If performance matters at some time, we can split
-            // the implementation to improve performance.
-            ArrayConcatExpression::try_from(prost).map(Expression::boxed)
-        }
-        ArrayToString => ArrayToStringExpression::try_from(prost).map(Expression::boxed),
-        ArrayDistinct => ArrayDistinctExpression::try_from(prost).map(Expression::boxed),
-        Vnode => VnodeExpression::try_from(prost).map(Expression::boxed),
-        Now => build_now_expr(prost),
-        Udf => UdfExpression::try_from(prost).map(Expression::boxed),
-        _ => Err(ExprError::UnsupportedFunction(format!(
-            "{:?}",
-            prost.get_expr_type()
-        ))),
-    }
-}
-
-fn get_children_and_return_type(prost: &ExprNode) -> Result<(Vec<ExprNode>, DataType)> {
-    let ret_type = DataType::from(prost.get_return_type().unwrap());
-    if let RexNode::FuncCall(func_call) = prost.get_rex_node().unwrap() {
-        Ok((func_call.get_children().to_vec(), ret_type))
-    } else {
-        bail!("Expected RexNode::FuncCall");
-    }
-}
-
-fn build_unary_expr_prost(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    let [child]: [_; 1] = children.try_into().unwrap();
-    let child_expr = expr_build_from_prost(&child)?;
-    new_unary_expr(prost.get_expr_type().unwrap(), ret_type, child_expr)
-}
-
-fn build_binary_expr_prost(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    let [left_child, right_child]: [_; 2] = children.try_into().unwrap();
-    let left_expr = expr_build_from_prost(&left_child)?;
-    let right_expr = expr_build_from_prost(&right_child)?;
-    new_binary_expr(
-        prost.get_expr_type().unwrap(),
-        ret_type,
-        left_expr,
-        right_expr,
-    )
-}
-
-fn build_nullable_binary_expr_prost(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    let [left_child, right_child]: [_; 2] = children.try_into().unwrap();
-    let left_expr = expr_build_from_prost(&left_child)?;
-    let right_expr = expr_build_from_prost(&right_child)?;
-    new_nullable_binary_expr(
-        prost.get_expr_type().unwrap(),
-        ret_type,
-        left_expr,
-        right_expr,
-    )
-}
-
-fn build_overlay_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(children.len() == 3 || children.len() == 4);
-
-    let s = expr_build_from_prost(&children[0])?;
-    let new_sub_str = expr_build_from_prost(&children[1])?;
-    let start = expr_build_from_prost(&children[2])?;
-
-    if children.len() == 3 {
-        Ok(new_overlay_exp(s, new_sub_str, start, ret_type))
-    } else if children.len() == 4 {
-        let count = expr_build_from_prost(&children[3])?;
-        Ok(new_overlay_for_exp(s, new_sub_str, start, count, ret_type))
-    } else {
-        unreachable!()
-    }
-}
-
-fn build_repeat_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    let [left_child, right_child]: [_; 2] = children.try_into().unwrap();
-    let left_expr = expr_build_from_prost(&left_child)?;
-    let right_expr = expr_build_from_prost(&right_child)?;
-    Ok(new_repeat(left_expr, right_expr, ret_type))
-}
-
-fn build_substr_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    let child = expr_build_from_prost(&children[0])?;
-    ensure!(children.len() == 2 || children.len() == 3);
-    if children.len() == 2 {
-        let off = expr_build_from_prost(&children[1])?;
-        Ok(new_substr_start(child, off, ret_type))
-    } else if children.len() == 3 {
-        let off = expr_build_from_prost(&children[1])?;
-        let len = expr_build_from_prost(&children[2])?;
-        Ok(new_substr_start_end(child, off, len, ret_type))
-    } else {
-        unreachable!()
-    }
-}
-
-fn build_trim_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(!children.is_empty() && children.len() <= 2);
-    let original = expr_build_from_prost(&children[0])?;
-    match children.len() {
-        1 => Ok(new_trim_expr(original, ret_type)),
-        2 => {
-            let characters = expr_build_from_prost(&children[1])?;
-            Ok(new_trim_characters(original, characters, ret_type))
-        }
-        _ => unreachable!(),
-    }
-}
-
-fn build_ltrim_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(!children.is_empty() && children.len() <= 2);
-    let original = expr_build_from_prost(&children[0])?;
-    match children.len() {
-        1 => Ok(new_ltrim_expr(original, ret_type)),
-        2 => {
-            let characters = expr_build_from_prost(&children[1])?;
-            Ok(new_ltrim_characters(original, characters, ret_type))
-        }
-        _ => unreachable!(),
-    }
-}
-
-fn build_rtrim_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(!children.is_empty() && children.len() <= 2);
-    let original = expr_build_from_prost(&children[0])?;
-    match children.len() {
-        1 => Ok(new_rtrim_expr(original, ret_type)),
-        2 => {
-            let characters = expr_build_from_prost(&children[1])?;
-            Ok(new_rtrim_characters(original, characters, ret_type))
-        }
-        _ => unreachable!(),
-    }
-}
-
-fn build_replace_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(children.len() == 3);
-    let s = expr_build_from_prost(&children[0])?;
-    let from_str = expr_build_from_prost(&children[1])?;
-    let to_str = expr_build_from_prost(&children[2])?;
-    Ok(new_replace_expr(s, from_str, to_str, ret_type))
-}
-
-fn build_date_trunc_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(children.len() == 2 || children.len() == 3);
-    let field = expr_build_from_prost(&children[0])?;
-    let source = expr_build_from_prost(&children[1])?;
-    let time_zone = if let Some(child) = children.get(2) {
-        Some((expr_build_from_prost(child)?, expr_build_from_prost(child)?))
-    } else {
-        None
-    };
-    Ok(new_date_trunc_expr(ret_type, field, source, time_zone))
-}
-
-fn build_tumble_start_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(children.len() == 2 || children.len() == 3);
-    let time = expr_build_from_prost(&children[0])?;
-    let window_size = expr_build_from_prost(&children[1])?;
-    if children.len() == 2 {
-        new_tumble_start(time, window_size, ret_type)
-    } else if children.len() == 3 {
-        let offset = expr_build_from_prost(&children[2])?;
-        new_tumble_start_offset(time, window_size, offset, ret_type)
-    } else {
-        unreachable!()
-    }
-}
-
-fn build_length_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    // TODO: add encoding length expr
-    let [child]: [_; 1] = children.try_into().unwrap();
-    let child = expr_build_from_prost(&child)?;
-    Ok(new_length_default(child, ret_type))
-}
-
-fn build_like_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(children.len() == 2);
-    let expr_ia1 = expr_build_from_prost(&children[0])?;
-    let expr_ia2 = expr_build_from_prost(&children[1])?;
-    Ok(new_like_default(expr_ia1, expr_ia2, ret_type))
-}
-
-fn build_translate_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(children.len() == 3);
-    let s = expr_build_from_prost(&children[0])?;
-    let match_str = expr_build_from_prost(&children[1])?;
-    let replace_str = expr_build_from_prost(&children[2])?;
-    Ok(new_translate_expr(s, match_str, replace_str, ret_type))
-}
-
-fn build_split_part_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(children.len() == 3);
-    let string_expr = expr_build_from_prost(&children[0])?;
-    let delimiter_expr = expr_build_from_prost(&children[1])?;
-    let nth_expr = expr_build_from_prost(&children[2])?;
-    Ok(new_split_part_expr(
-        string_expr,
-        delimiter_expr,
-        nth_expr,
-        ret_type,
-    ))
-}
-
-fn build_to_char_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(children.len() == 2);
-    let data_expr = expr_build_from_prost(&children[0])?;
-    let tmpl_node = &children[1];
-    if let RexNode::Constant(tmpl_value) = tmpl_node.get_rex_node().unwrap()
-        && let Ok(Some(tmpl)) = deserialize_datum(tmpl_value.get_body().as_slice(), &DataType::from(tmpl_node.get_return_type().unwrap()))
-    {
-        let tmpl = tmpl.as_utf8();
-        let pattern = compile_pattern_to_chrono(tmpl);
-
-        Ok(ExprToCharConstTmpl {
-            ctx: ExprToCharConstTmplContext {
-                chrono_pattern: pattern,
-            },
-            child: data_expr,
-        }.boxed())
-    } else {
-        let tmpl_expr = expr_build_from_prost(&children[1])?;
-        Ok(new_to_char(data_expr, tmpl_expr, ret_type))
-    }
-}
-
-pub fn build_now_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let rex_node = try_match_expand!(prost.get_rex_node(), Ok)?;
-    let RexNode::FuncCall(func_call_node) = rex_node else {
-        bail!("Expected RexNode::FuncCall in Now");
-    };
-    let Some(bind_timestamp) = func_call_node.children.first() else {
-        bail!("Expected epoch timestamp bound into Now");
-    };
-    LiteralExpression::try_from(bind_timestamp).map(Expression::boxed)
-}
-
-pub fn build_to_timestamp_expr(prost: &ExprNode) -> Result<BoxedExpression> {
-    let (children, ret_type) = get_children_and_return_type(prost)?;
-    ensure!(children.len() == 2);
-    let data_expr = expr_build_from_prost(&children[0])?;
-    let tmpl_node = &children[1];
-    if let RexNode::Constant(tmpl_value) = tmpl_node.get_rex_node().unwrap()
-        && let Ok(Some(tmpl)) = deserialize_datum(tmpl_value.get_body().as_slice(), &DataType::from(tmpl_node.get_return_type().unwrap()))
-    {
-        let tmpl = tmpl.as_utf8();
-        let pattern = compile_pattern_to_chrono(tmpl);
-
-        Ok(ExprToTimestampConstTmpl {
-            ctx: ExprToTimestampConstTmplContext {
-                chrono_pattern: pattern,
-            },
-            child: data_expr,
-        }.boxed())
-    } else {
-        let tmpl_expr = expr_build_from_prost(&children[1])?;
-        Ok(new_to_timestamp(data_expr, tmpl_expr, ret_type))
-    }
-}
-
-pub fn build_some_all_expr_prost(prost: &ExprNode) -> Result<BoxedExpression> {
-    let outer_expr_type = prost.get_expr_type().unwrap();
-    let (outer_children, outer_return_type) = get_children_and_return_type(prost)?;
-    ensure!(matches!(outer_return_type, DataType::Boolean));
-
-    let mut inner_expr_type = outer_children[0].get_expr_type().unwrap();
-    let (mut inner_children, mut inner_return_type) =
-        get_children_and_return_type(&outer_children[0])?;
-    let mut stack = vec![];
-    while inner_children.len() != 2 {
-        stack.push((inner_expr_type, inner_return_type));
-        inner_expr_type = inner_children[0].get_expr_type().unwrap();
-        (inner_children, inner_return_type) = get_children_and_return_type(&inner_children[0])?;
-    }
-
-    let [left_child, right_child]: [_; 2] = inner_children.try_into().unwrap();
-    let left_expr = expr_build_from_prost(&left_child)?;
-    let right_expr = expr_build_from_prost(&right_child)?;
-
-    let DataType::List { datatype: right_expr_return_type } = right_expr.return_type() else {
-        bail!("Expect Array Type");
-    };
-
-    let eval_func = {
-        let left_expr_input_ref = ExprNode {
-            expr_type: Type::InputRef as i32,
-            return_type: Some(left_expr.return_type().to_protobuf()),
-            rex_node: Some(RexNode::InputRef(0)),
-        };
-        let right_expr_input_ref = ExprNode {
-            expr_type: Type::InputRef as i32,
-            return_type: Some(right_expr_return_type.to_protobuf()),
-            rex_node: Some(RexNode::InputRef(1)),
-        };
-        let mut root_expr_node = ExprNode {
-            expr_type: inner_expr_type as i32,
-            return_type: Some(inner_return_type.to_protobuf()),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![left_expr_input_ref, right_expr_input_ref],
-            })),
-        };
-        while let Some((expr_type, return_type)) = stack.pop() {
-            root_expr_node = ExprNode {
-                expr_type: expr_type as i32,
-                return_type: Some(return_type.to_protobuf()),
-                rex_node: Some(RexNode::FuncCall(FunctionCall {
-                    children: vec![root_expr_node],
-                })),
-            }
-        }
-        expr_build_from_prost(&root_expr_node)?
-    };
-
-    Ok(Box::new(SomeAllExpression::new(
-        left_expr,
-        right_expr,
-        outer_expr_type,
-        eval_func,
-    )))
-}
-
-#[cfg(test)]
-mod tests {
-    use std::vec;
-
-    use risingwave_common::array::{ArrayImpl, DataChunk, Utf8Array};
-    use risingwave_common::types::Scalar;
-    use risingwave_common::util::value_encoding::serialize_datum;
-    use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::{DataType as ProstDataType, Datum as ProstDatum};
-    use risingwave_pb::expr::expr_node::{RexNode, Type};
-    use risingwave_pb::expr::{ExprNode, FunctionCall};
-
-    use super::*;
-
-    #[tokio::test]
-    async fn test_array_access_expr() {
-        let values = FunctionCall {
-            children: vec![
-                ExprNode {
-                    expr_type: Type::ConstantValue as i32,
-                    return_type: Some(ProstDataType {
-                        type_name: TypeName::Varchar as i32,
-                        ..Default::default()
-                    }),
-                    rex_node: Some(RexNode::Constant(ProstDatum {
-                        body: serialize_datum(Some("foo".into()).as_ref()),
-                    })),
-                },
-                ExprNode {
-                    expr_type: Type::ConstantValue as i32,
-                    return_type: Some(ProstDataType {
-                        type_name: TypeName::Varchar as i32,
-                        ..Default::default()
-                    }),
-                    rex_node: Some(RexNode::Constant(ProstDatum {
-                        body: serialize_datum(Some("bar".into()).as_ref()),
-                    })),
-                },
-            ],
-        };
-        let array_index = FunctionCall {
-            children: vec![
-                ExprNode {
-                    expr_type: Type::Array as i32,
-                    return_type: Some(ProstDataType {
-                        type_name: TypeName::List as i32,
-                        field_type: vec![ProstDataType {
-                            type_name: TypeName::Varchar as i32,
-                            ..Default::default()
-                        }],
-                        ..Default::default()
-                    }),
-                    rex_node: Some(RexNode::FuncCall(values)),
-                },
-                ExprNode {
-                    expr_type: Type::ConstantValue as i32,
-                    return_type: Some(ProstDataType {
-                        type_name: TypeName::Int32 as i32,
-                        ..Default::default()
-                    }),
-                    rex_node: Some(RexNode::Constant(ProstDatum {
-                        body: serialize_datum(Some(1_i32.to_scalar_value()).as_ref()),
-                    })),
-                },
-            ],
-        };
-        let access = ExprNode {
-            expr_type: Type::ArrayAccess as i32,
-            return_type: Some(ProstDataType {
-                type_name: TypeName::Varchar as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(array_index)),
-        };
-        let expr = build_nullable_binary_expr_prost(&access);
-        assert!(expr.is_ok());
-
-        let res = expr.unwrap().eval(&DataChunk::new_dummy(1)).await.unwrap();
-        assert_eq!(*res, ArrayImpl::Utf8(Utf8Array::from_iter(["foo"])));
-    }
-
-    #[test]
-    fn test_build_extract_expr() {
-        let left = ExprNode {
-            expr_type: Type::ConstantValue as i32,
-            return_type: Some(ProstDataType {
-                type_name: TypeName::Varchar as i32,
-                precision: 11,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: serialize_datum(Some("DAY".into()).as_ref()),
-            })),
-        };
-        let right_date = ExprNode {
-            expr_type: Type::ConstantValue as i32,
-            return_type: Some(ProstDataType {
-                type_name: TypeName::Date as i32,
-                ..Default::default()
-            }),
-            rex_node: None,
-        };
-        let right_time = ExprNode {
-            expr_type: Type::ConstantValue as i32,
-            return_type: Some(ProstDataType {
-                type_name: TypeName::Timestamp as i32,
-                ..Default::default()
-            }),
-            rex_node: None,
-        };
-
-        let expr = ExprNode {
-            expr_type: Type::Extract as i32,
-            return_type: Some(ProstDataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![left.clone(), right_date],
-            })),
-        };
-        assert!(build_binary_expr_prost(&expr).is_ok());
-        let expr = ExprNode {
-            expr_type: Type::Extract as i32,
-            return_type: Some(ProstDataType {
-                type_name: TypeName::Int64 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![left, right_time],
-            })),
-        };
-        assert!(build_binary_expr_prost(&expr).is_ok());
-    }
-}
diff --git a/src/expr/src/expr/data_types.rs b/src/expr/src/expr/data_types.rs
index 6fe46a9fc37b7..d094cb81c7390 100644
--- a/src/expr/src/expr/data_types.rs
+++ b/src/expr/src/expr/data_types.rs
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// We may remove the entire file once procedual macros are ready for aggregations.
+#![allow(unused_imports)]
+
 //! Macros containing all necessary information for a logical type.
 //!
 //! Each type macro will call the `$macro` with multiple parameters:
@@ -131,6 +134,18 @@ macro_rules! float32 {
 
 pub(crate) use float32;
 
+#[macro_export]
+macro_rules! serial {
+    ($macro:ident) => {
+        $macro! {
+            risingwave_common::types::DataType::Serial,
+            risingwave_common::array::serial_array::SerialArray
+        }
+    };
+}
+
+pub(crate) use serial;
+
 #[macro_export]
 macro_rules! float64 {
     ($macro:ident) => {
@@ -160,7 +175,7 @@ macro_rules! date {
     ($macro:ident) => {
         $macro! {
             risingwave_common::types::DataType::Date,
-            risingwave_common::array::NaiveDateArray
+            risingwave_common::array::DateArray
         }
     };
 }
@@ -196,7 +211,7 @@ macro_rules! time {
     ($macro:ident) => {
         $macro! {
             risingwave_common::types::DataType::Time,
-            risingwave_common::array::NaiveTimeArray
+            risingwave_common::array::TimeArray
         }
     };
 }
@@ -208,7 +223,7 @@ macro_rules! timestamp {
     ($macro:ident) => {
         $macro! {
             risingwave_common::types::DataType::Timestamp,
-            risingwave_common::array::NaiveDateTimeArray
+            risingwave_common::array::TimestampArray
         }
     };
 }
diff --git a/src/expr/src/expr/expr_array_concat.rs b/src/expr/src/expr/expr_array_concat.rs
index f904afc7ebb4e..08e58d17189ea 100644
--- a/src/expr/src/expr/expr_array_concat.rs
+++ b/src/expr/src/expr/expr_array_concat.rs
@@ -386,8 +386,8 @@ mod tests {
     use itertools::Itertools;
     use risingwave_common::array::DataChunk;
     use risingwave_common::types::ScalarImpl;
-    use risingwave_pb::data::Datum as ProstDatum;
-    use risingwave_pb::expr::expr_node::{RexNode, Type as ProstType};
+    use risingwave_pb::data::PbDatum;
+    use risingwave_pb::expr::expr_node::{PbType, RexNode};
     use risingwave_pb::expr::{ExprNode, FunctionCall};
 
     use super::*;
@@ -395,9 +395,9 @@ mod tests {
 
     fn make_i64_expr_node(value: i64) -> ExprNode {
         ExprNode {
-            expr_type: ProstType::ConstantValue as i32,
+            expr_type: PbType::ConstantValue as i32,
             return_type: Some(DataType::Int64.to_protobuf()),
-            rex_node: Some(RexNode::Constant(ProstDatum {
+            rex_node: Some(RexNode::Constant(PbDatum {
                 body: value.to_be_bytes().to_vec(),
             })),
         }
@@ -405,7 +405,7 @@ mod tests {
 
     fn make_i64_array_expr_node(values: Vec<i64>) -> ExprNode {
         ExprNode {
-            expr_type: ProstType::Array as i32,
+            expr_type: PbType::Array as i32,
             return_type: Some(
                 DataType::List {
                     datatype: Box::new(DataType::Int64),
@@ -420,7 +420,7 @@ mod tests {
 
     fn make_i64_array_array_expr_node(values: Vec<Vec<i64>>) -> ExprNode {
         ExprNode {
-            expr_type: ProstType::Array as i32,
+            expr_type: PbType::Array as i32,
             return_type: Some(
                 DataType::List {
                     datatype: Box::new(DataType::List {
@@ -441,7 +441,7 @@ mod tests {
             let left = make_i64_array_expr_node(vec![42]);
             let right = make_i64_array_expr_node(vec![43]);
             let expr = ExprNode {
-                expr_type: ProstType::ArrayCat as i32,
+                expr_type: PbType::ArrayCat as i32,
                 return_type: Some(
                     DataType::List {
                         datatype: Box::new(DataType::Int64),
@@ -459,7 +459,7 @@ mod tests {
             let left = make_i64_array_array_expr_node(vec![vec![42]]);
             let right = make_i64_array_array_expr_node(vec![vec![43]]);
             let expr = ExprNode {
-                expr_type: ProstType::ArrayCat as i32,
+                expr_type: PbType::ArrayCat as i32,
                 return_type: Some(
                     DataType::List {
                         datatype: Box::new(DataType::Int64),
@@ -477,7 +477,7 @@ mod tests {
             let left = make_i64_array_expr_node(vec![42]);
             let right = make_i64_expr_node(43);
             let expr = ExprNode {
-                expr_type: ProstType::ArrayAppend as i32,
+                expr_type: PbType::ArrayAppend as i32,
                 return_type: Some(
                     DataType::List {
                         datatype: Box::new(DataType::Int64),
@@ -495,7 +495,7 @@ mod tests {
             let left = make_i64_array_array_expr_node(vec![vec![42]]);
             let right = make_i64_array_expr_node(vec![43]);
             let expr = ExprNode {
-                expr_type: ProstType::ArrayAppend as i32,
+                expr_type: PbType::ArrayAppend as i32,
                 return_type: Some(
                     DataType::List {
                         datatype: Box::new(DataType::Int64),
@@ -513,7 +513,7 @@ mod tests {
             let left = make_i64_expr_node(43);
             let right = make_i64_array_expr_node(vec![42]);
             let expr = ExprNode {
-                expr_type: ProstType::ArrayPrepend as i32,
+                expr_type: PbType::ArrayPrepend as i32,
                 return_type: Some(
                     DataType::List {
                         datatype: Box::new(DataType::Int64),
@@ -531,7 +531,7 @@ mod tests {
             let left = make_i64_array_expr_node(vec![43]);
             let right = make_i64_array_array_expr_node(vec![vec![42]]);
             let expr = ExprNode {
-                expr_type: ProstType::ArrayPrepend as i32,
+                expr_type: PbType::ArrayPrepend as i32,
                 return_type: Some(
                     DataType::List {
                         datatype: Box::new(DataType::Int64),
diff --git a/src/expr/src/expr/expr_array_distinct.rs b/src/expr/src/expr/expr_array_distinct.rs
index 010f184023e87..e0fc29bfa5988 100644
--- a/src/expr/src/expr/expr_array_distinct.rs
+++ b/src/expr/src/expr/expr_array_distinct.rs
@@ -12,18 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::Arc;
-
 use itertools::Itertools;
 use risingwave_common::array::*;
-use risingwave_common::row::OwnedRow;
-use risingwave_common::types::{DataType, Datum, DatumRef, ScalarRefImpl, ToDatumRef};
-use risingwave_common::util::iter_util::ZipEqFast;
-use risingwave_pb::expr::expr_node::{RexNode, Type};
-use risingwave_pb::expr::ExprNode;
-
-use crate::expr::{build_from_prost, BoxedExpression, Expression};
-use crate::{bail, ensure, ExprError, Result};
+use risingwave_common::types::ScalarRefImpl;
+use risingwave_expr_macro::function;
 
 /// Returns a new array removing all the duplicates from the input array
 ///
@@ -58,204 +50,28 @@ use crate::{bail, ensure, ExprError, Result};
 /// select array_distinct(null);
 /// ```
 
-#[derive(Debug)]
-pub struct ArrayDistinctExpression {
-    array: BoxedExpression,
-    return_type: DataType,
-}
-
-impl<'a> TryFrom<&'a ExprNode> for ArrayDistinctExpression {
-    type Error = ExprError;
-
-    fn try_from(prost: &'a ExprNode) -> Result<Self> {
-        ensure!(prost.get_expr_type().unwrap() == Type::ArrayDistinct);
-        let RexNode::FuncCall(func_call_node) = prost.get_rex_node().unwrap() else {
-            bail!("Expected RexNode::FuncCall");
-        };
-        let children = func_call_node.get_children();
-        ensure!(children.len() == 1);
-        let array = build_from_prost(&children[0])?;
-        let return_type = array.return_type();
-        Ok(Self { array, return_type })
-    }
-}
-
-#[async_trait::async_trait]
-impl Expression for ArrayDistinctExpression {
-    fn return_type(&self) -> DataType {
-        self.return_type.clone()
-    }
-
-    async fn eval(&self, input: &DataChunk) -> Result<ArrayRef> {
-        let array = self.array.eval_checked(input).await?;
-        let mut builder = self.return_type.create_array_builder(array.len());
-        for (vis, arr) in input.vis().iter().zip_eq_fast(array.iter()) {
-            if !vis {
-                builder.append_null();
-            } else {
-                builder.append_datum(&self.evaluate(arr));
-            }
-        }
-        Ok(Arc::new(builder.finish()))
-    }
-
-    async fn eval_row(&self, input: &OwnedRow) -> Result<Datum> {
-        let array_data = self.array.eval_row(input).await?;
-        Ok(self.evaluate(array_data.to_datum_ref()))
-    }
-}
-
-impl ArrayDistinctExpression {
-    fn evaluate(&self, array: DatumRef<'_>) -> Datum {
-        match array {
-            Some(ScalarRefImpl::List(array)) => Some(
-                ListValue::new(
-                    array
-                        .values_ref()
-                        .into_iter()
-                        .map(|x| x.map(ScalarRefImpl::into_scalar_impl))
-                        .unique()
-                        .collect(),
-                )
-                .into(),
-            ),
-            None => None,
-            Some(_) => unreachable!("the operand must be a list type"),
-        }
-    }
+#[function("array_distinct(list) -> list")]
+pub fn array_distinct(list: ListRef<'_>) -> ListValue {
+    ListValue::new(
+        list.values_ref()
+            .into_iter()
+            .map(|x| x.map(ScalarRefImpl::into_scalar_impl))
+            .unique()
+            .collect(),
+    )
 }
 
 #[cfg(test)]
 mod tests {
-
-    use itertools::Itertools;
-    use risingwave_common::array::DataChunk;
-    use risingwave_common::types::ScalarImpl;
-    use risingwave_pb::data::Datum as ProstDatum;
-    use risingwave_pb::expr::expr_node::{RexNode, Type as ProstType};
-    use risingwave_pb::expr::{ExprNode, FunctionCall};
+    use risingwave_common::types::Scalar;
 
     use super::*;
-    use crate::expr::{Expression, LiteralExpression};
-
-    fn make_i64_expr_node(value: i64) -> ExprNode {
-        ExprNode {
-            expr_type: ProstType::ConstantValue as i32,
-            return_type: Some(DataType::Int64.to_protobuf()),
-            rex_node: Some(RexNode::Constant(ProstDatum {
-                body: value.to_be_bytes().to_vec(),
-            })),
-        }
-    }
-
-    fn make_i64_array_expr_node(values: Vec<i64>) -> ExprNode {
-        ExprNode {
-            expr_type: ProstType::Array as i32,
-            return_type: Some(
-                DataType::List {
-                    datatype: Box::new(DataType::Int64),
-                }
-                .to_protobuf(),
-            ),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: values.into_iter().map(make_i64_expr_node).collect(),
-            })),
-        }
-    }
-
-    fn make_i64_array_array_expr_node(values: Vec<Vec<i64>>) -> ExprNode {
-        ExprNode {
-            expr_type: ProstType::Array as i32,
-            return_type: Some(
-                DataType::List {
-                    datatype: Box::new(DataType::List {
-                        datatype: Box::new(DataType::Int64),
-                    }),
-                }
-                .to_protobuf(),
-            ),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: values.into_iter().map(make_i64_array_expr_node).collect(),
-            })),
-        }
-    }
 
     #[test]
-    fn test_array_distinct_try_from() {
-        {
-            let array = make_i64_array_expr_node(vec![12]);
-            let expr = ExprNode {
-                expr_type: ProstType::ArrayDistinct as i32,
-                return_type: Some(
-                    DataType::List {
-                        datatype: Box::new(DataType::Int64),
-                    }
-                    .to_protobuf(),
-                ),
-                rex_node: Some(RexNode::FuncCall(FunctionCall {
-                    children: vec![array],
-                })),
-            };
-            assert!(ArrayDistinctExpression::try_from(&expr).is_ok());
-        }
-
-        {
-            let array = make_i64_array_array_expr_node(vec![vec![42], vec![42]]);
-            let expr = ExprNode {
-                expr_type: ProstType::ArrayDistinct as i32,
-                return_type: Some(
-                    DataType::List {
-                        datatype: Box::new(DataType::Int64),
-                    }
-                    .to_protobuf(),
-                ),
-                rex_node: Some(RexNode::FuncCall(FunctionCall {
-                    children: vec![array],
-                })),
-            };
-            assert!(ArrayDistinctExpression::try_from(&expr).is_ok());
-        }
-    }
-
-    fn make_i64_array_expr(values: Vec<i64>) -> BoxedExpression {
-        LiteralExpression::new(
-            DataType::List {
-                datatype: Box::new(DataType::Int64),
-            },
-            Some(ListValue::new(values.into_iter().map(|x| Some(x.into())).collect()).into()),
-        )
-        .boxed()
-    }
-
-    #[tokio::test]
-    async fn test_array_distinct_array_of_primitives() {
-        let array = make_i64_array_expr(vec![42, 43, 42]);
-        let expr = ArrayDistinctExpression {
-            return_type: DataType::List {
-                datatype: Box::new(DataType::Int64),
-            },
-            array,
-        };
-
-        let chunk = DataChunk::new_dummy(4)
-            .with_visibility([true, false, true, true].into_iter().collect());
-        let expected_array = Some(ScalarImpl::List(ListValue::new(vec![
-            Some(42i64.into()),
-            Some(43i64.into()),
-        ])));
-        let expected = vec![
-            expected_array.clone(),
-            None,
-            expected_array.clone(),
-            expected_array,
-        ];
-        let actual = expr
-            .eval(&chunk)
-            .await
-            .unwrap()
-            .iter()
-            .map(|v| v.map(|s| s.into_scalar_impl()))
-            .collect_vec();
+    fn test_array_distinct_array_of_primitives() {
+        let array = ListValue::new([42, 43, 42].into_iter().map(|x| Some(x.into())).collect());
+        let expected = ListValue::new([42, 43].into_iter().map(|x| Some(x.into())).collect());
+        let actual = array_distinct(array.as_scalar_ref());
         assert_eq!(actual, expected);
     }
 
diff --git a/src/expr/src/expr/expr_array_length.rs b/src/expr/src/expr/expr_array_length.rs
new file mode 100644
index 0000000000000..76d062d7be134
--- /dev/null
+++ b/src/expr/src/expr/expr_array_length.rs
@@ -0,0 +1,63 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 risingwave_common::array::ListRef;
+use risingwave_expr_macro::function;
+
+/// Returns the length of an array.
+///
+/// ```sql
+/// array_length ( array anyarray) → int64
+/// ```
+///
+/// Examples:
+///
+/// ```slt
+/// query T
+/// select array_length(null::int[]);
+/// ----
+/// NULL
+///
+/// query T
+/// select array_length(array[1,2,3]);
+/// ----
+/// 3
+///
+/// query T
+/// select array_length(array[1,2,3,4,1]);
+/// ----
+/// 5
+///
+/// query T
+/// select array_length(null::int[]);
+/// ----
+/// NULL
+///
+/// query T
+/// select array_length(array[array[1, 2, 3]]);
+/// ----
+/// 1
+///
+/// query T
+/// select array_length(array[NULL]);
+/// ----
+/// 1
+///
+/// query error unknown type
+/// select array_length(null);
+/// ```
+#[function("array_length(list) -> int64")]
+fn array_length(array: ListRef<'_>) -> i64 {
+    array.values_ref().len() as _
+}
diff --git a/src/expr/src/expr/expr_array_to_string.rs b/src/expr/src/expr/expr_array_to_string.rs
index 0e991b0b44a97..7ebc5a30e6251 100644
--- a/src/expr/src/expr/expr_array_to_string.rs
+++ b/src/expr/src/expr/expr_array_to_string.rs
@@ -12,18 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![allow(clippy::unit_arg)]
+
 use std::fmt::Write;
-use std::sync::Arc;
 
 use risingwave_common::array::*;
-use risingwave_common::row::OwnedRow;
 use risingwave_common::types::to_text::ToText;
-use risingwave_common::types::{DataType, Datum};
-use risingwave_pb::expr::expr_node::{RexNode, Type};
-use risingwave_pb::expr::ExprNode;
-
-use crate::expr::{build_from_prost, Expression};
-use crate::{bail, ensure, ExprError, Result};
+use risingwave_common::types::DataType;
+use risingwave_expr_macro::build_function;
+
+use super::template::{BinaryBytesExpression, TernaryBytesExpression};
+use super::{BoxedExpression, Result};
+
+#[build_function("array_to_string(list, varchar) -> varchar")]
+fn build_array_to_string(
+    return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let mut iter = children.into_iter();
+    let list = iter.next().unwrap();
+    let delimiter = iter.next().unwrap();
+    let elem_type = match list.return_type() {
+        DataType::List { datatype } => *datatype,
+        _ => panic!("expected list type"),
+    };
+    let expr = BinaryBytesExpression::<ListArray, Utf8Array, _>::new(
+        list,
+        delimiter,
+        return_type,
+        move |a, d, writer| Ok(array_to_string(a, &elem_type, d, writer)),
+    );
+    Ok(Box::new(expr))
+}
 
 /// Converts each array element to its text representation, and concatenates those
 /// separated by the delimiter string. If `null_string` is given and is not NULL,
@@ -74,163 +94,65 @@ use crate::{bail, ensure, ExprError, Result};
 /// query error polymorphic type
 /// select array_to_string(null, ',');
 /// ```
-#[derive(Debug)]
-pub struct ArrayToStringExpression {
-    array: Box<dyn Expression>,
-    element_data_type: DataType,
-    delimiter: Box<dyn Expression>,
-    null_string: Option<Box<dyn Expression>>,
-}
-
-impl<'a> TryFrom<&'a ExprNode> for ArrayToStringExpression {
-    type Error = ExprError;
-
-    fn try_from(prost: &'a ExprNode) -> Result<Self> {
-        ensure!(prost.get_expr_type().unwrap() == Type::ArrayToString);
-        let RexNode::FuncCall(func_call_node) = prost.get_rex_node().unwrap() else {
-            bail!("Expected RexNode::FuncCall");
-        };
-        let mut children = func_call_node.children.iter();
-        let Some(array_node) = children.next() else {
-            bail!("Expected argument 'array'");
-        };
-        let array = build_from_prost(array_node)?;
-
-        let element_data_type = match array.return_type() {
-            DataType::List { datatype } => *datatype,
-            _ => bail!("Expected argument 'array' to be of type List"),
-        };
-
-        let Some(delim_node) = children.next() else {
-            bail!("Expected argument 'delimiter'");
-        };
-        let delimiter = build_from_prost(delim_node)?;
-
-        let null_string = if let Some(null_string_node) = children.next() {
-            Some(build_from_prost(null_string_node)?)
-        } else {
-            None
-        };
-
-        Ok(Self {
-            array,
-            element_data_type,
-            delimiter,
-            null_string,
-        })
-    }
-}
-
-#[async_trait::async_trait]
-impl Expression for ArrayToStringExpression {
-    fn return_type(&self) -> DataType {
-        DataType::Varchar
-    }
-
-    async fn eval(&self, input: &DataChunk) -> Result<ArrayRef> {
-        let list_array = self.array.eval_checked(input).await?;
-        let list_array = list_array.as_list();
-
-        let delim_array = self.delimiter.eval_checked(input).await?;
-        let delim_array = delim_array.as_utf8();
-
-        let null_string_array = if let Some(expr) = &self.null_string {
-            let null_string_array = expr.eval_checked(input).await?;
-            Some(null_string_array)
+fn array_to_string(
+    array: ListRef<'_>,
+    element_data_type: &DataType,
+    delimiter: &str,
+    mut writer: &mut dyn Write,
+) {
+    let mut first = true;
+    for element in array.values_ref().iter().flat_map(|f| f.iter()) {
+        if !first {
+            write!(writer, "{}", delimiter).unwrap();
         } else {
-            None
-        };
-        let null_string_array = null_string_array.as_ref().map(|a| a.as_utf8());
-
-        let mut output = Utf8ArrayBuilder::with_meta(input.capacity(), ArrayMeta::Simple);
-
-        for (i, vis) in input.vis().iter().enumerate() {
-            if !vis {
-                output.append_null();
-                continue;
-            }
-            let array = list_array.value_at(i);
-            let delim = delim_array.value_at(i);
-            let null_string = if let Some(a) = null_string_array {
-                a.value_at(i)
-            } else {
-                None
-            };
-
-            if let Some(array) = array && let Some(delim) = delim {
-                let mut writer = output.writer().begin();
-                if let Some(null_string) = null_string {
-                    self.evaluate_with_nulls(array, delim, null_string, &mut writer);
-                } else {
-                    self.evaluate(array, delim, &mut writer);
-                }
-                writer.finish();
-            } else {
-                output.append_null();
-            }
+            first = false;
         }
-        Ok(Arc::new(output.finish().into()))
+        element
+            .write_with_type(element_data_type, &mut writer)
+            .unwrap();
     }
+}
 
-    async fn eval_row(&self, input: &OwnedRow) -> Result<Datum> {
-        let array = self.array.eval_row(input).await?;
-        let delimiter = self.delimiter.eval_row(input).await?;
-
-        let result = if let Some(array) = array && let Some(delimiter) = delimiter {
-            let null_string = if let Some(e) = &self.null_string {
-                e.eval_row(input).await?
-            } else {
-                None
-            };
-            let mut writer = String::new();
-            if let Some(null_string) = null_string {
-                self.evaluate_with_nulls(array.as_scalar_ref_impl().into_list(), delimiter.as_utf8(), null_string.as_utf8(), &mut writer);
-            } else {
-                self.evaluate(array.as_scalar_ref_impl().into_list(), delimiter.as_utf8(), &mut writer);
-            }
-            Some(writer)
-        } else {
-            None
-        };
-        Ok(result.map(|r| r.into()))
-    }
+#[build_function("array_to_string(list, varchar, varchar) -> varchar")]
+fn build_array_to_string_with_null(
+    return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let mut iter = children.into_iter();
+    let list = iter.next().unwrap();
+    let delimiter = iter.next().unwrap();
+    let null_string = iter.next().unwrap();
+    let elem_type = match list.return_type() {
+        DataType::List { datatype } => *datatype,
+        _ => panic!("expected list type"),
+    };
+    let expr = TernaryBytesExpression::<ListArray, Utf8Array, Utf8Array, _>::new(
+        list,
+        delimiter,
+        null_string,
+        return_type,
+        move |a, d, n, writer| Ok(array_to_string_with_null(a, &elem_type, d, n, writer)),
+    );
+    Ok(Box::new(expr))
 }
 
-impl ArrayToStringExpression {
-    fn evaluate(&self, array: ListRef<'_>, delimiter: &str, mut writer: &mut dyn Write) {
-        let mut first = true;
-        for element in array.values_ref().iter().flat_map(|f| f.iter()) {
-            if !first {
-                write!(writer, "{}", delimiter).unwrap();
-            } else {
-                first = false;
-            }
-            element
-                .write_with_type(&self.element_data_type, &mut writer)
-                .unwrap();
+fn array_to_string_with_null(
+    array: ListRef<'_>,
+    element_data_type: &DataType,
+    delimiter: &str,
+    null_string: &str,
+    mut writer: &mut dyn Write,
+) {
+    let mut first = true;
+    for element in array.values_ref() {
+        if !first {
+            write!(writer, "{}", delimiter).unwrap();
+        } else {
+            first = false;
         }
-    }
-
-    fn evaluate_with_nulls(
-        &self,
-        array: ListRef<'_>,
-        delimiter: &str,
-        null_string: &str,
-        mut writer: &mut dyn Write,
-    ) {
-        let mut first = true;
-        for element in array.values_ref() {
-            if !first {
-                write!(writer, "{}", delimiter).unwrap();
-            } else {
-                first = false;
-            }
-            match element {
-                Some(s) => s
-                    .write_with_type(&self.element_data_type, &mut writer)
-                    .unwrap(),
-                None => write!(writer, "{}", null_string).unwrap(),
-            }
+        match element {
+            Some(s) => s.write_with_type(element_data_type, &mut writer).unwrap(),
+            None => write!(writer, "{}", null_string).unwrap(),
         }
     }
 }
diff --git a/src/expr/src/expr/expr_binary_bytes.rs b/src/expr/src/expr/expr_binary_bytes.rs
deleted file mode 100644
index 01a85163be2d3..0000000000000
--- a/src/expr/src/expr/expr_binary_bytes.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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.
-
-//! For expression that only accept two arguments + 1 bytes writer as input.
-
-use risingwave_common::array::{I32Array, NaiveDateTimeArray, Utf8Array};
-use risingwave_common::types::DataType;
-
-use super::Expression;
-use crate::expr::template::BinaryBytesExpression;
-use crate::expr::BoxedExpression;
-use crate::vector_op::concat_op::concat_op;
-use crate::vector_op::repeat::repeat;
-use crate::vector_op::substr::*;
-use crate::vector_op::to_char::to_char_timestamp;
-use crate::vector_op::trim_characters::{ltrim_characters, rtrim_characters, trim_characters};
-
-pub fn new_substr_start(
-    expr_ia1: BoxedExpression,
-    expr_ia2: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    BinaryBytesExpression::<Utf8Array, I32Array, _>::new(
-        expr_ia1,
-        expr_ia2,
-        return_type,
-        substr_start,
-    )
-    .boxed()
-}
-
-#[cfg_attr(not(test), expect(dead_code))]
-pub fn new_substr_for(
-    expr_ia1: BoxedExpression,
-    expr_ia2: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    BinaryBytesExpression::<Utf8Array, I32Array, _>::new(
-        expr_ia1,
-        expr_ia2,
-        return_type,
-        substr_for,
-    )
-    .boxed()
-}
-
-// TODO: Support more `to_char` types.
-pub fn new_to_char(
-    expr_ia1: BoxedExpression,
-    expr_ia2: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    BinaryBytesExpression::<NaiveDateTimeArray, Utf8Array, _>::new(
-        expr_ia1,
-        expr_ia2,
-        return_type,
-        to_char_timestamp,
-    )
-    .boxed()
-}
-
-pub fn new_repeat(
-    expr_ia1: BoxedExpression,
-    expr_ia2: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    BinaryBytesExpression::<Utf8Array, I32Array, _>::new(expr_ia1, expr_ia2, return_type, repeat)
-        .boxed()
-}
-
-macro_rules! impl_utf8_utf8 {
-    ($({ $func_name:ident, $method:ident }),*) => {
-        $(pub fn $func_name(
-            expr_ia1: BoxedExpression,
-            expr_ia2: BoxedExpression,
-            return_type: DataType,
-        ) -> BoxedExpression {
-            BinaryBytesExpression::<Utf8Array, Utf8Array, _>::new(
-                expr_ia1,
-                expr_ia2,
-                return_type,
-                $method,
-            )
-            .boxed()
-        })*
-    };
-}
-
-macro_rules! for_all_utf8_utf8_op {
-    ($macro:ident) => {
-        $macro! {
-            { new_trim_characters, trim_characters },
-            { new_ltrim_characters, ltrim_characters },
-            { new_rtrim_characters, rtrim_characters },
-            { new_concat_op, concat_op }
-        }
-    };
-}
-
-for_all_utf8_utf8_op! { impl_utf8_utf8 }
-
-#[cfg(test)]
-mod tests {
-    use risingwave_common::array::DataChunk;
-    use risingwave_common::row::OwnedRow;
-    use risingwave_common::types::{Datum, ScalarImpl};
-
-    use super::*;
-    use crate::expr::LiteralExpression;
-
-    fn create_str_i32_binary_expr(
-        f: fn(BoxedExpression, BoxedExpression, DataType) -> BoxedExpression,
-        str_arg: Datum,
-        i32_arg: Datum,
-    ) -> BoxedExpression {
-        f(
-            Box::new(LiteralExpression::new(DataType::Varchar, str_arg)),
-            Box::new(LiteralExpression::new(DataType::Int32, i32_arg)),
-            DataType::Varchar,
-        )
-    }
-
-    async fn test_evals_dummy(expr: &BoxedExpression, expected: Datum) {
-        let res = expr.eval(&DataChunk::new_dummy(1)).await.unwrap();
-        assert_eq!(res.to_datum(), expected);
-
-        let res = expr.eval_row(&OwnedRow::new(vec![])).await.unwrap();
-        assert_eq!(res, expected);
-    }
-
-    #[tokio::test]
-    async fn test_substr() {
-        let text = "quick brown";
-        let start_pos = 3;
-        let for_pos = 4;
-
-        let substr_start_normal = create_str_i32_binary_expr(
-            new_substr_start,
-            Some(ScalarImpl::from(String::from(text))),
-            Some(ScalarImpl::Int32(start_pos)),
-        );
-        test_evals_dummy(
-            &substr_start_normal,
-            Some(ScalarImpl::from(String::from(
-                &text[start_pos as usize - 1..],
-            ))),
-        )
-        .await;
-
-        let substr_start_i32_none = create_str_i32_binary_expr(
-            new_substr_start,
-            Some(ScalarImpl::from(String::from(text))),
-            None,
-        );
-        test_evals_dummy(&substr_start_i32_none, None).await;
-
-        let substr_for_normal = create_str_i32_binary_expr(
-            new_substr_for,
-            Some(ScalarImpl::from(String::from(text))),
-            Some(ScalarImpl::Int32(for_pos)),
-        );
-        test_evals_dummy(
-            &substr_for_normal,
-            Some(ScalarImpl::from(String::from(&text[..for_pos as usize]))),
-        )
-        .await;
-
-        let substr_for_str_none =
-            create_str_i32_binary_expr(new_substr_for, None, Some(ScalarImpl::Int32(for_pos)));
-        test_evals_dummy(&substr_for_str_none, None).await;
-    }
-}
diff --git a/src/expr/src/expr/expr_binary_nonnull.rs b/src/expr/src/expr/expr_binary_nonnull.rs
index 2e4a273cf05b7..f90206414aed1 100644
--- a/src/expr/src/expr/expr_binary_nonnull.rs
+++ b/src/expr/src/expr/expr_binary_nonnull.rs
@@ -12,843 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use risingwave_common::array::{
-    Array, BoolArray, DecimalArray, F64Array, I32Array, I64Array, IntervalArray, JsonbArrayBuilder,
-    ListArray, NaiveDateArray, NaiveDateTimeArray, NaiveTimeArray, StructArray, Utf8Array,
-    Utf8ArrayBuilder,
-};
-use risingwave_common::types::*;
-use risingwave_pb::expr::expr_node::Type;
-
-use super::Expression;
-use crate::expr::expr_binary_bytes::new_concat_op;
-use crate::expr::expr_jsonb_access::{
-    jsonb_array_element, jsonb_object_field, JsonbAccessExpression,
-};
-use crate::expr::template::{BinaryBytesExpression, BinaryExpression};
-use crate::expr::{template_fast, BoxedExpression};
-use crate::vector_op::arithmetic_op::*;
-use crate::vector_op::bitwise_op::*;
-use crate::vector_op::cmp::*;
-use crate::vector_op::date_trunc::{date_trunc_interval, date_trunc_timestamp};
-use crate::vector_op::extract::{
-    extract_from_date, extract_from_time, extract_from_timestamp, extract_from_timestamptz,
-};
-use crate::vector_op::like::like_default;
-use crate::vector_op::position::position;
-use crate::vector_op::round::round_digits;
-use crate::vector_op::timestamptz::{
-    str_to_timestamptz, timestamp_at_time_zone, timestamptz_at_time_zone, timestamptz_to_string,
-};
-use crate::vector_op::to_timestamp::to_timestamp;
-use crate::vector_op::tumble::{
-    tumble_start_date, tumble_start_date_time, tumble_start_timestamptz,
-};
-use crate::{for_all_cmp_variants, ExprError, Result};
-
-/// This macro helps create arithmetic expression.
-/// It receive all the combinations of `gen_binary_expr` and generate corresponding match cases
-/// In [], the parameters are for constructing new expression
-/// * $l: left expression
-/// * $r: right expression
-/// * $ret: return array type
-/// In ()*, the parameters are for generating match cases
-/// * $i1: left array type
-/// * $i2: right array type
-/// * $rt: The return type in that the operation will calculate
-/// * $The scalar function for expression, it's a generic function and specialized by the type of
-///   `$i1, $i2, $rt`
-macro_rules! gen_atm_impl {
-    ([$l:expr, $r:expr, $ret:expr], $( { $i1:ident, $i2:ident, $rt:ident, $func:ident },)*) => {
-        match ($l.return_type(), $r.return_type()) {
-            $(
-                ($i1! { type_match_pattern }, $i2! { type_match_pattern }) => {
-                    Box::new(
-                        BinaryExpression::<
-                            $i1! { type_array },
-                            $i2! { type_array },
-                            $rt! { type_array },
-                            _
-                        >::new(
-                            $l,
-                            $r,
-                            $ret,
-                            $func::< <$i1! { type_array } as Array>::OwnedItem, <$i2! { type_array } as Array>::OwnedItem, <$rt! { type_array } as Array>::OwnedItem>,
-                        )
-                    ) as BoxedExpression
-                },
-            )*
-            _ => {
-                return Err(ExprError::UnsupportedFunction(format!(
-                    "{:?} atm {:?}",
-                    $l.return_type(), $r.return_type()
-                )));
-            }
-        }
-    };
-}
-
-macro_rules! gen_atm_impl_fast {
-    ([$l:expr, $r:expr, $ret:expr], $( { $i1:ident, $i2:ident, $rt:ident, $func:ident },)*) => {
-        match ($l.return_type(), $r.return_type()) {
-            $(
-                ($i1! { type_match_pattern }, $i2! { type_match_pattern }) => {
-                    template_fast::BinaryExpression::new(
-                        $l, $r, $ret,
-                        $func::<
-                            <$i1! { type_array } as Array>::OwnedItem,
-                            <$i2! { type_array } as Array>::OwnedItem,
-                            <$rt! { type_array } as Array>::OwnedItem
-                        >,
-                    ).boxed()
-                },
-            )*
-            _ => {
-                return Err(ExprError::UnsupportedFunction(format!(
-                    "{:?} atm {:?}",
-                    $l.return_type(), $r.return_type()
-                )));
-            }
-        }
-    };
-}
-
-/// This macro helps create comparison expression. Its output array is a bool array
-/// Similar to `gen_atm_impl`.
-macro_rules! gen_cmp_impl {
-    ([$l:expr, $r:expr, $ret:expr], $( { $i1:ident, $i2:ident, $cast:ident, $func:ident} ),* $(,)?) => {
-        match ($l.return_type(), $r.return_type()) {
-            $(
-                ($i1! { type_match_pattern }, $i2! { type_match_pattern }) => {
-                    template_fast::CompareExpression::new(
-                        $l,
-                        $r,
-                        $func::<
-                            <$i1! { type_array } as Array>::OwnedItem,
-                            <$i2! { type_array } as Array>::OwnedItem,
-                            <$cast! { type_array } as Array>::OwnedItem
-                        >,
-                    ).boxed()
-                }
-            ),*
-            _ => {
-                return Err(ExprError::UnsupportedFunction(format!(
-                    "{:?} cmp {:?}",
-                    $l.return_type(), $r.return_type()
-                )));
-            }
-        }
-    };
-}
-
-/// This macro helps create bitwise shift expression. The Output type is same as LHS of the
-/// expression and the RHS of the expression is being match into u32. Similar to `gen_atm_impl`.
-macro_rules! gen_shift_impl {
-    ([$l:expr, $r:expr, $ret:expr], $( { $i1:ident, $i2:ident, $func:ident },)*) => {
-        match ($l.return_type(), $r.return_type()) {
-            $(
-                ($i1! { type_match_pattern }, $i2! { type_match_pattern }) => {
-                    Box::new(
-                        BinaryExpression::<
-                            $i1! { type_array },
-                            $i2! { type_array },
-                            $i1! { type_array },
-                            _
-                        >::new(
-                            $l,
-                            $r,
-                            $ret,
-                            $func::<
-                                <$i1! { type_array } as Array>::OwnedItem,
-                                <$i2! { type_array } as Array>::OwnedItem>,
-
-                        )
-                    ) as BoxedExpression
-                },
-            )*
-            _ => {
-                return Err(ExprError::UnsupportedFunction(format!(
-                    "{:?} shift {:?}",
-                    $l.return_type(), $r.return_type()
-                )));
-            }
-        }
-    };
-}
-
-/// Based on the data type of `$l`, `$r`, `$ret`, return corresponding expression struct with scalar
-/// function inside.
-/// * `$l`: left expression
-/// * `$r`: right expression
-/// * `$ret`: returned expression
-/// * `macro`: a macro helps create expression
-/// * `general_f`: generic cmp function (require a common ``TryInto`` type for two input).
-/// * `boolean_f`: boolean cmp function
-/// * `str_f`: cmp function between str
-macro_rules! gen_binary_expr_cmp {
-    ($macro:ident, $general_f:ident, $boolean_f:ident, $op:ident, $l:expr, $r:expr, $ret:expr) => {
-        match ($l.return_type(), $r.return_type()) {
-            (DataType::Boolean, DataType::Boolean) => {
-                template_fast::BooleanBinaryExpression::new($l, $r, $boolean_f, |l, r| {
-                    match (l, r) {
-                        (Some(l), Some(r)) => Some($general_f::<bool, bool, bool>(l, r)),
-                        _ => None,
-                    }
-                })
-                .boxed()
-            }
-            (DataType::Varchar, DataType::Varchar) => {
-                Box::new(BinaryExpression::<Utf8Array, Utf8Array, BoolArray, _>::new(
-                    $l,
-                    $r,
-                    $ret,
-                    gen_str_cmp($op),
-                )) as BoxedExpression
-            }
-            (DataType::Struct { .. }, DataType::Struct { .. }) => {
-                Box::new(
-                    BinaryExpression::<StructArray, StructArray, BoolArray, _>::new(
-                        $l,
-                        $r,
-                        $ret,
-                        gen_struct_cmp($op),
-                    ),
-                )
-            }
-            (DataType::List { .. }, DataType::List { .. }) => {
-                Box::new(BinaryExpression::<ListArray, ListArray, BoolArray, _>::new(
-                    $l,
-                    $r,
-                    $ret,
-                    gen_list_cmp($op),
-                ))
-            }
-            _ => {
-                for_all_cmp_variants! {$macro, $l, $r, $ret, $general_f}
-            }
-        }
-    };
-}
-
-/// `gen_binary_expr_atm` is similar to `gen_binary_expr_cmp`.
-///  `atm` means arithmetic here.
-/// They are differentiate cuz one type may not support atm and cmp at the same time. For example,
-/// Varchar can support compare but not arithmetic.
-/// * `$general_f`: generic atm function (require a common ``TryInto`` type for two input)
-/// * `$i1`, `$i2`, `$rt`, `$func`: extra list passed to `$macro` directly
-macro_rules! gen_binary_expr_atm {
-    (
-        $macro:ident,
-        $l:expr,
-        $r:expr,
-        $ret:expr,
-        $general_f:ident,
-        {
-            $( { $i1:ident, $i2:ident, $rt:ident, $func:ident }, )*
-        } $(,)?
-    ) => {
-        $macro! {
-            [$l, $r, $ret],
-            { int16, int16, int16, $general_f },
-            { int16, int32, int32, $general_f },
-            { int16, int64, int64, $general_f },
-            { int16, float32, float64, $general_f },
-            { int16, float64, float64, $general_f },
-            { int32, int16, int32, $general_f },
-            { int32, int32, int32, $general_f },
-            { int32, int64, int64, $general_f },
-            { int32, float32, float64, $general_f },
-            { int32, float64, float64, $general_f },
-            { int64, int16,int64, $general_f },
-            { int64, int32,int64, $general_f },
-            { int64, int64, int64, $general_f },
-            { int64, float32, float64 , $general_f},
-            { int64, float64, float64, $general_f },
-            { float32, int16, float64, $general_f },
-            { float32, int32, float64, $general_f },
-            { float32, int64, float64 , $general_f},
-            { float32, float32, float32, $general_f },
-            { float32, float64, float64, $general_f },
-            { float64, int16, float64, $general_f },
-            { float64, int32, float64, $general_f },
-            { float64, int64, float64, $general_f },
-            { float64, float32, float64, $general_f },
-            { float64, float64, float64, $general_f },
-            { decimal, int16, decimal, $general_f },
-            { decimal, int32, decimal, $general_f },
-            { decimal, int64, decimal, $general_f },
-            { decimal, float32, float64, $general_f },
-            { decimal, float64, float64, $general_f },
-            { int16, decimal, decimal, $general_f },
-            { int32, decimal, decimal, $general_f },
-            { int64, decimal, decimal, $general_f },
-            { decimal, decimal, decimal, $general_f },
-            { float32, decimal, float64, $general_f },
-            { float64, decimal, float64, $general_f },
-            $(
-                { $i1, $i2, $rt, $func },
-            )*
-        }
-    };
-}
-
-/// `gen_binary_expr_bitwise` is similar to `gen_binary_expr_atm`.
-/// They are differentiate because bitwise operation only supports integral datatype.
-/// * `$general_f`: generic atm function (require a common ``TryInto`` type for two input)
-/// * `$i1`, `$i2`, `$rt`, `$func`: extra list passed to `$macro` directly
-macro_rules! gen_binary_expr_bitwise {
-    (
-        $macro:ident,
-        $l:expr,
-        $r:expr,
-        $ret:expr,
-        $general_f:ident,
-        {
-            $( { $i1:ident, $i2:ident, $rt:ident, $func:ident }, )*
-        } $(,)?
-    ) => {
-        $macro! {
-            [$l, $r, $ret],
-            { int16, int16, int16, $general_f },
-            { int16, int32, int32, $general_f },
-            { int16, int64, int64, $general_f },
-            { int32, int16, int32, $general_f },
-            { int32, int32, int32, $general_f },
-            { int32, int64, int64, $general_f },
-            { int64, int16, int64, $general_f },
-            { int64, int32, int64, $general_f },
-            { int64, int64, int64, $general_f },
-            $(
-                { $i1, $i2, $rt, $func },
-            )*
-        }
-    };
-}
-
-/// `gen_binary_expr_shift` is similar to `gen_binary_expr_bitwise`.
-/// They are differentiate because shift operation have different typing rules.
-/// * `$general_f`: generic atm function
-/// `$rt` is not required because Type of the output is same as the Type of LHS of expression.
-/// * `$i1`, `$i2`, `$func`: extra list passed to `$macro` directly
-macro_rules! gen_binary_expr_shift {
-    (
-        $macro:ident,
-        $l:expr,
-        $r:expr,
-        $ret:expr,
-        $general_f:ident,
-        {
-            $( { $i1:ident, $i2:ident, $func:ident }, )*
-        } $(,)?
-    ) => {
-        $macro! {
-            [$l, $r, $ret],
-            { int16, int16, $general_f },
-            { int32, int16, $general_f },
-            { int16, int32, $general_f },
-            { int32, int32, $general_f },
-            { int64, int16, $general_f },
-            { int64, int32, $general_f },
-            $(
-                { $i1, $i2, $func },
-            )*
-        }
-    };
-}
-
-fn build_extract_expr(
-    ret: DataType,
-    l: BoxedExpression,
-    r: BoxedExpression,
-) -> Result<BoxedExpression> {
-    let expr: BoxedExpression =
-        match r.return_type() {
-            DataType::Date => Box::new(BinaryExpression::<
-                Utf8Array,
-                NaiveDateArray,
-                DecimalArray,
-                _,
-            >::new(l, r, ret, extract_from_date)),
-            DataType::Timestamp => Box::new(BinaryExpression::<
-                Utf8Array,
-                NaiveDateTimeArray,
-                DecimalArray,
-                _,
-            >::new(l, r, ret, extract_from_timestamp)),
-            DataType::Timestamptz => Box::new(BinaryExpression::<
-                Utf8Array,
-                I64Array,
-                DecimalArray,
-                _,
-            >::new(
-                l, r, ret, extract_from_timestamptz
-            )),
-            DataType::Time => Box::new(BinaryExpression::<
-                Utf8Array,
-                NaiveTimeArray,
-                DecimalArray,
-                _,
-            >::new(l, r, ret, extract_from_time)),
-            _ => {
-                return Err(ExprError::UnsupportedFunction(format!(
-                    "Extract ( {:?} ) is not supported yet!",
-                    r.return_type()
-                )))
-            }
-        };
-    Ok(expr)
-}
-
-fn build_at_time_zone_expr(
-    ret: DataType,
-    l: BoxedExpression,
-    r: BoxedExpression,
-) -> Result<BoxedExpression> {
-    let expr: BoxedExpression = match l.return_type() {
-        DataType::Timestamp => Box::new(BinaryExpression::<
-            NaiveDateTimeArray,
-            Utf8Array,
-            I64Array,
-            _,
-        >::new(l, r, ret, timestamp_at_time_zone)),
-        DataType::Timestamptz => Box::new(BinaryExpression::<
-            I64Array,
-            Utf8Array,
-            NaiveDateTimeArray,
-            _,
-        >::new(l, r, ret, timestamptz_at_time_zone)),
-        _ => {
-            return Err(ExprError::UnsupportedFunction(format!(
-                "{:?} AT TIME ZONE is not supported yet!",
-                l.return_type()
-            )))
-        }
-    };
-    Ok(expr)
-}
-
-fn build_cast_with_time_zone_expr(
-    ret: DataType,
-    l: BoxedExpression,
-    r: BoxedExpression,
-) -> Result<BoxedExpression> {
-    let expr: BoxedExpression = match (ret.clone(), l.return_type()) {
-        (DataType::Varchar, DataType::Timestamptz) => Box::new(BinaryBytesExpression::<
-            I64Array,
-            Utf8Array,
-            _,
-        >::new(
-            l, r, ret, timestamptz_to_string
-        )),
-        (DataType::Timestamptz, DataType::Varchar) => {
-            Box::new(BinaryExpression::<Utf8Array, Utf8Array, I64Array, _>::new(
-                l,
-                r,
-                ret,
-                str_to_timestamptz,
-            ))
-        }
-        _ => {
-            return Err(ExprError::UnsupportedFunction(format!(
-                "cannot cast at time zone (input type: {:?}, output type: {:?}",
-                l.return_type(),
-                ret,
-            )))
-        }
-    };
-    Ok(expr)
-}
-
-pub fn new_date_trunc_expr(
-    ret: DataType,
-    field: BoxedExpression,
-    source: BoxedExpression,
-    timezone: Option<(BoxedExpression, BoxedExpression)>,
-) -> BoxedExpression {
-    match source.return_type() {
-        DataType::Timestamp => BinaryExpression::<
-            Utf8Array,
-            NaiveDateTimeArray,
-            NaiveDateTimeArray,
-            _,
-        >::new(field, source, ret, date_trunc_timestamp).boxed(),
-        DataType::Timestamptz => {
-            // timestamptz AT TIME ZONE zone -> timestamp
-            // truncate(field, timestamp) -> timestamp
-            // timestamp AT TIME ZONE zone -> timestamptz
-            let (timezone1, timezone2) = timezone
-                .expect("A time zone must be specified when processing timestamp with time zone");
-            let timestamp = BinaryExpression::<I64Array, Utf8Array, NaiveDateTimeArray, _>::new(
-                source,
-                timezone1,
-                DataType::Timestamp,
-                timestamptz_at_time_zone,
-            ).boxed();
-            let truncated = BinaryExpression::<
-                Utf8Array,
-                NaiveDateTimeArray,
-                NaiveDateTimeArray,
-                _,
-            >::new(
-                field,
-                timestamp,
-                DataType::Timestamp,
-                date_trunc_timestamp,
-            ).boxed();
-            BinaryExpression::<NaiveDateTimeArray, Utf8Array, I64Array, _>::new(
-                truncated,
-                timezone2,
-                DataType::Timestamptz,
-                timestamp_at_time_zone,
-            ).boxed()
-        }
-        DataType::Interval => BinaryExpression::<
-            Utf8Array,
-            IntervalArray,
-            IntervalArray,
-            _,
-        >::new(field, source, ret, date_trunc_interval).boxed(),
-        _ => panic!("source must be a value expression of type timestamp, timestamp with time zone, or interval."),
-    }
-}
-
-/// Create a new binary expression.
-pub fn new_binary_expr(
-    expr_type: Type,
-    ret: DataType,
-    l: BoxedExpression,
-    r: BoxedExpression,
-) -> Result<BoxedExpression> {
-    use crate::expr::data_types::*;
-    let expr = match expr_type {
-        Type::Equal => {
-            gen_binary_expr_cmp! {gen_cmp_impl, general_eq, boolean_eq, EQ, l, r, ret}
-        }
-        Type::NotEqual => {
-            gen_binary_expr_cmp! {gen_cmp_impl, general_ne, boolean_ne, NE, l, r, ret}
-        }
-        Type::LessThan => {
-            gen_binary_expr_cmp! {gen_cmp_impl, general_lt, boolean_lt, LT, l, r, ret}
-        }
-        Type::GreaterThan => {
-            gen_binary_expr_cmp! {gen_cmp_impl, general_gt, boolean_gt, GT, l, r, ret}
-        }
-        Type::GreaterThanOrEqual => {
-            gen_binary_expr_cmp! {gen_cmp_impl, general_ge, boolean_ge, GE, l, r, ret}
-        }
-        Type::LessThanOrEqual => {
-            gen_binary_expr_cmp! {gen_cmp_impl, general_le, boolean_le, LE, l, r, ret}
-        }
-        Type::Add => {
-            gen_binary_expr_atm! {
-                gen_atm_impl,
-                l, r, ret,
-                general_add,
-                {
-                    { timestamptz, interval, timestamptz, timestamptz_interval_add },
-                    { interval, timestamptz, timestamptz, interval_timestamptz_add },
-                    { timestamp, interval, timestamp, timestamp_interval_add },
-                    { interval, timestamp, timestamp, interval_timestamp_add },
-                    { interval, date, timestamp, interval_date_add },
-                    { interval, time, time, interval_time_add },
-                    { date, interval, timestamp, date_interval_add },
-                    { date, int32, date, date_int_add },
-                    { int32, date, date, int_date_add },
-                    { date, time, timestamp, date_time_add },
-                    { time, date, timestamp, time_date_add },
-                    { interval, interval, interval, general_add },
-                    { time, interval, time, time_interval_add },
-                },
-            }
-        }
-        Type::Subtract => {
-            gen_binary_expr_atm! {
-                gen_atm_impl,
-                l, r, ret,
-                general_sub,
-                {
-                    { timestamptz, interval, timestamptz, timestamptz_interval_sub },
-                    { timestamp, timestamp, interval, timestamp_timestamp_sub },
-                    { timestamp, interval, timestamp, timestamp_interval_sub },
-                    { date, date, int32, date_date_sub },
-                    { date, interval, timestamp, date_interval_sub },
-                    { time, time, interval, time_time_sub },
-                    { time, interval, time, time_interval_sub },
-                    { interval, interval, interval, general_sub },
-                    { date, int32, date, date_int_sub },
-                },
-            }
-        }
-        Type::Multiply => {
-            gen_binary_expr_atm! {
-                gen_atm_impl,
-                l, r, ret,
-                general_mul,
-                {
-                    { interval, int16, interval, interval_int_mul },
-                    { interval, int32, interval, interval_int_mul },
-                    { interval, int64, interval, interval_int_mul },
-                    { interval, float32, interval, interval_float_mul },
-                    { interval, float64, interval, interval_float_mul },
-                    { interval, decimal, interval, interval_float_mul },
-
-                    { int16, interval, interval, int_interval_mul },
-                    { int32, interval, interval, int_interval_mul },
-                    { int64, interval, interval, int_interval_mul },
-                    { float32, interval, interval, float_interval_mul },
-                    { float64, interval, interval, float_interval_mul },
-                    { decimal, interval, interval, float_interval_mul },
-                },
-            }
-        }
-        Type::Divide => {
-            gen_binary_expr_atm! {
-                gen_atm_impl,
-                l, r, ret,
-                general_div,
-                {
-                    { interval, int16, interval, interval_float_div },
-                    { interval, int32, interval, interval_float_div },
-                    { interval, int64, interval, interval_float_div },
-                    { interval, float32, interval, interval_float_div },
-                    { interval, float64, interval, interval_float_div },
-                    { interval, decimal, interval, interval_float_div },
-                },
-            }
-        }
-        Type::Modulus => {
-            gen_binary_expr_atm! {
-                gen_atm_impl,
-                l, r, ret,
-                general_mod,
-                {
-                },
-            }
-        }
-        // BitWise Operation
-        Type::BitwiseShiftLeft => {
-            gen_binary_expr_shift! {
-                gen_shift_impl,
-                l, r, ret,
-                general_shl,
-                {
-
-                },
-            }
-        }
-        Type::BitwiseShiftRight => {
-            gen_binary_expr_shift! {
-                gen_shift_impl,
-                l, r, ret,
-                general_shr,
-                {
-
-                },
-            }
-        }
-        Type::BitwiseAnd => {
-            gen_binary_expr_bitwise! {
-                gen_atm_impl_fast,
-                l, r, ret,
-                general_bitand,
-                {
-                },
-            }
-        }
-        Type::BitwiseOr => {
-            gen_binary_expr_bitwise! {
-                gen_atm_impl_fast,
-                l, r, ret,
-                general_bitor,
-                {
-                },
-            }
-        }
-        Type::BitwiseXor => {
-            gen_binary_expr_bitwise! {
-                gen_atm_impl_fast,
-                l, r, ret,
-                general_bitxor,
-                {
-                },
-            }
-        }
-        Type::Pow => Box::new(BinaryExpression::<F64Array, F64Array, F64Array, _>::new(
-            l, r, ret, pow_f64,
-        )),
-        Type::Extract => build_extract_expr(ret, l, r)?,
-        Type::AtTimeZone => build_at_time_zone_expr(ret, l, r)?,
-        Type::CastWithTimeZone => build_cast_with_time_zone_expr(ret, l, r)?,
-        Type::RoundDigit => Box::new(template_fast::BinaryExpression::new(
-            l,
-            r,
-            ret,
-            round_digits::<i32>,
-        )),
-        Type::Position => Box::new(BinaryExpression::<Utf8Array, Utf8Array, I32Array, _>::new(
-            l, r, ret, position,
-        )),
-        Type::ConcatOp => new_concat_op(l, r, ret),
-        Type::JsonbAccessInner => match r.return_type() {
-            DataType::Varchar => {
-                JsonbAccessExpression::<Utf8Array, JsonbArrayBuilder, _>::new_expr(
-                    l,
-                    r,
-                    jsonb_object_field,
-                )
-                .boxed()
-            }
-            DataType::Int32 => JsonbAccessExpression::<I32Array, JsonbArrayBuilder, _>::new_expr(
-                l,
-                r,
-                jsonb_array_element,
-            )
-            .boxed(),
-            t => return Err(ExprError::UnsupportedFunction(format!("jsonb -> {t}"))),
-        },
-        Type::JsonbAccessStr => match r.return_type() {
-            DataType::Varchar => JsonbAccessExpression::<Utf8Array, Utf8ArrayBuilder, _>::new_expr(
-                l,
-                r,
-                jsonb_object_field,
-            )
-            .boxed(),
-            DataType::Int32 => JsonbAccessExpression::<I32Array, Utf8ArrayBuilder, _>::new_expr(
-                l,
-                r,
-                jsonb_array_element,
-            )
-            .boxed(),
-            t => return Err(ExprError::UnsupportedFunction(format!("jsonb ->> {t}"))),
-        },
-        tp => {
-            return Err(ExprError::UnsupportedFunction(format!(
-                "{:?}({:?}, {:?})",
-                tp,
-                l.return_type(),
-                r.return_type(),
-            )));
-        }
-    };
-    Ok(expr)
-}
-
-pub fn new_tumble_start(
-    expr_ia1: BoxedExpression,
-    expr_ia2: BoxedExpression,
-    return_type: DataType,
-) -> Result<BoxedExpression> {
-    let expr: BoxedExpression = match expr_ia1.return_type() {
-        DataType::Date => Box::new(BinaryExpression::<
-            NaiveDateArray,
-            IntervalArray,
-            NaiveDateTimeArray,
-            _,
-        >::new(
-            expr_ia1, expr_ia2, return_type, tumble_start_date
-        )),
-        DataType::Timestamp => Box::new(BinaryExpression::<
-            NaiveDateTimeArray,
-            IntervalArray,
-            NaiveDateTimeArray,
-            _,
-        >::new(
-            expr_ia1, expr_ia2, return_type, tumble_start_date_time
-        )),
-        DataType::Timestamptz => Box::new(
-            BinaryExpression::<I64Array, IntervalArray, I64Array, _>::new(
-                expr_ia1,
-                expr_ia2,
-                return_type,
-                tumble_start_timestamptz,
-            ),
-        ),
-        _ => {
-            return Err(ExprError::UnsupportedFunction(format!(
-                "tumble_start is not supported for {:?}",
-                expr_ia1.return_type()
-            )))
-        }
-    };
-    Ok(expr)
-}
-
-pub fn new_like_default(
-    expr_ia1: BoxedExpression,
-    expr_ia2: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    Box::new(BinaryExpression::<Utf8Array, Utf8Array, BoolArray, _>::new(
-        expr_ia1,
-        expr_ia2,
-        return_type,
-        like_default,
-    ))
-}
-
-pub fn new_to_timestamp(
-    expr_ia1: BoxedExpression,
-    expr_ia2: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    BinaryExpression::<Utf8Array, Utf8Array, NaiveDateTimeArray, _>::new(
-        expr_ia1,
-        expr_ia2,
-        return_type,
-        to_timestamp,
-    )
-    .boxed()
-}
-
-fn boolean_eq(l: &BoolArray, r: &BoolArray) -> BoolArray {
-    let data = !(l.data() ^ r.data());
-    let bitmap = l.null_bitmap() & r.null_bitmap();
-    BoolArray::new(data, bitmap)
-}
-
-fn boolean_ne(l: &BoolArray, r: &BoolArray) -> BoolArray {
-    let data = l.data() ^ r.data();
-    let bitmap = l.null_bitmap() & r.null_bitmap();
-    BoolArray::new(data, bitmap)
-}
-
-fn boolean_gt(l: &BoolArray, r: &BoolArray) -> BoolArray {
-    let data = l.data() & !r.data();
-    let bitmap = l.null_bitmap() & r.null_bitmap();
-    BoolArray::new(data, bitmap)
-}
-
-fn boolean_lt(l: &BoolArray, r: &BoolArray) -> BoolArray {
-    let data = !l.data() & r.data();
-    let bitmap = l.null_bitmap() & r.null_bitmap();
-    BoolArray::new(data, bitmap)
-}
-
-fn boolean_ge(l: &BoolArray, r: &BoolArray) -> BoolArray {
-    let data = l.data() | !r.data();
-    let bitmap = l.null_bitmap() & r.null_bitmap();
-    BoolArray::new(data, bitmap)
-}
-
-fn boolean_le(l: &BoolArray, r: &BoolArray) -> BoolArray {
-    let data = !l.data() | r.data();
-    let bitmap = l.null_bitmap() & r.null_bitmap();
-    BoolArray::new(data, bitmap)
-}
-
 #[cfg(test)]
 mod tests {
     use risingwave_common::array::interval_array::IntervalArray;
     use risingwave_common::array::*;
-    use risingwave_common::types::test_utils::IntervalUnitTestExt;
-    use risingwave_common::types::{
-        Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, Scalar,
-    };
-    use risingwave_pb::data::data_type::TypeName;
+    use risingwave_common::types::test_utils::IntervalTestExt;
+    use risingwave_common::types::{Date, Decimal, Interval, Scalar};
     use risingwave_pb::expr::expr_node::Type;
 
     use super::super::*;
-    use crate::expr::test_utils::make_expression;
     use crate::vector_op::arithmetic_op::{date_interval_add, date_interval_sub};
 
     #[tokio::test]
@@ -873,19 +45,13 @@ mod tests {
         test_binary_decimal::<BoolArray, _>(|x, y| x >= y, Type::GreaterThanOrEqual).await;
         test_binary_decimal::<BoolArray, _>(|x, y| x < y, Type::LessThan).await;
         test_binary_decimal::<BoolArray, _>(|x, y| x <= y, Type::LessThanOrEqual).await;
-        test_binary_interval::<NaiveDateTimeArray, _>(
-            |x, y| {
-                date_interval_add::<NaiveDateWrapper, IntervalUnit, NaiveDateTimeWrapper>(x, y)
-                    .unwrap()
-            },
+        test_binary_interval::<TimestampArray, _>(
+            |x, y| date_interval_add(x, y).unwrap(),
             Type::Add,
         )
         .await;
-        test_binary_interval::<NaiveDateTimeArray, _>(
-            |x, y| {
-                date_interval_sub::<NaiveDateWrapper, IntervalUnit, NaiveDateTimeWrapper>(x, y)
-                    .unwrap()
-            },
+        test_binary_interval::<TimestampArray, _>(
+            |x, y| date_interval_sub(x, y).unwrap(),
             Type::Subtract,
         )
         .await;
@@ -924,9 +90,19 @@ mod tests {
         let col1 = I32Array::from_iter(&lhs).into();
         let col2 = I32Array::from_iter(&rhs).into();
         let data_chunk = DataChunk::new(vec![col1, col2], 100);
-        let expr = make_expression(kind, &[TypeName::Int32, TypeName::Int32], &[0, 1]);
-        let vec_executor = build_from_prost(&expr).unwrap();
-        let res = vec_executor.eval(&data_chunk).await.unwrap();
+        let expr = build(
+            kind,
+            match kind {
+                Type::Add | Type::Subtract | Type::Multiply | Type::Divide => DataType::Int32,
+                _ => DataType::Boolean,
+            },
+            vec![
+                InputRefExpression::new(DataType::Int32, 0).boxed(),
+                InputRefExpression::new(DataType::Int32, 1).boxed(),
+            ],
+        )
+        .unwrap();
+        let res = expr.eval(&data_chunk).await.unwrap();
         let arr: &A = res.as_ref().into();
         for (idx, item) in arr.iter().enumerate() {
             let x = target[idx].as_ref().map(|x| x.as_scalar_ref());
@@ -938,7 +114,7 @@ mod tests {
                 lhs[i].map(|int| int.to_scalar_value()),
                 rhs[i].map(|int| int.to_scalar_value()),
             ]);
-            let result = vec_executor.eval_row(&row).await.unwrap();
+            let result = expr.eval_row(&row).await.unwrap();
             let expected = target[i].as_ref().cloned().map(|x| x.to_scalar_value());
             assert_eq!(result, expected);
         }
@@ -949,32 +125,31 @@ mod tests {
         A: Array,
         for<'a> &'a A: std::convert::From<&'a ArrayImpl>,
         for<'a> <A as Array>::RefItem<'a>: PartialEq,
-        F: Fn(NaiveDateWrapper, IntervalUnit) -> <A as Array>::OwnedItem,
+        F: Fn(Date, Interval) -> <A as Array>::OwnedItem,
     {
-        let mut lhs = Vec::<Option<NaiveDateWrapper>>::new();
-        let mut rhs = Vec::<Option<IntervalUnit>>::new();
+        let mut lhs = Vec::<Option<Date>>::new();
+        let mut rhs = Vec::<Option<Interval>>::new();
         let mut target = Vec::<Option<<A as Array>::OwnedItem>>::new();
         for i in 0..100 {
             if i % 2 == 0 {
-                rhs.push(Some(IntervalUnit::from_ymd(0, i, i)));
+                rhs.push(Some(Interval::from_ymd(0, i, i)));
                 lhs.push(None);
                 target.push(None);
             } else {
-                rhs.push(Some(IntervalUnit::from_ymd(0, i, i)));
-                lhs.push(Some(NaiveDateWrapper::from_num_days_from_ce_uncheck(i)));
+                rhs.push(Some(Interval::from_ymd(0, i, i)));
+                lhs.push(Some(Date::from_num_days_from_ce_uncheck(i)));
                 target.push(Some(f(
-                    NaiveDateWrapper::from_num_days_from_ce_uncheck(i),
-                    IntervalUnit::from_ymd(0, i, i),
+                    Date::from_num_days_from_ce_uncheck(i),
+                    Interval::from_ymd(0, i, i),
                 )));
             }
         }
 
-        let col1 = NaiveDateArray::from_iter(&lhs).into();
+        let col1 = DateArray::from_iter(&lhs).into();
         let col2 = IntervalArray::from_iter(&rhs).into();
         let data_chunk = DataChunk::new(vec![col1, col2], 100);
-        let expr = make_expression(kind, &[TypeName::Date, TypeName::Interval], &[0, 1]);
-        let vec_executor = build_from_prost(&expr).unwrap();
-        let res = vec_executor.eval(&data_chunk).await.unwrap();
+        let expr = build_from_pretty(format!("({kind:?}:timestamp $0:date $1:interval)"));
+        let res = expr.eval(&data_chunk).await.unwrap();
         let arr: &A = res.as_ref().into();
         for (idx, item) in arr.iter().enumerate() {
             let x = target[idx].as_ref().map(|x| x.as_scalar_ref());
@@ -986,7 +161,7 @@ mod tests {
                 lhs[i].map(|date| date.to_scalar_value()),
                 rhs[i].map(|date| date.to_scalar_value()),
             ]);
-            let result = vec_executor.eval_row(&row).await.unwrap();
+            let result = expr.eval_row(&row).await.unwrap();
             let expected = target[i].as_ref().cloned().map(|x| x.to_scalar_value());
             assert_eq!(result, expected);
         }
@@ -1025,9 +200,19 @@ mod tests {
         let col1 = DecimalArray::from_iter(&lhs).into();
         let col2 = DecimalArray::from_iter(&rhs).into();
         let data_chunk = DataChunk::new(vec![col1, col2], 100);
-        let expr = make_expression(kind, &[TypeName::Decimal, TypeName::Decimal], &[0, 1]);
-        let vec_executor = build_from_prost(&expr).unwrap();
-        let res = vec_executor.eval(&data_chunk).await.unwrap();
+        let expr = build(
+            kind,
+            match kind {
+                Type::Add | Type::Subtract | Type::Multiply | Type::Divide => DataType::Decimal,
+                _ => DataType::Boolean,
+            },
+            vec![
+                InputRefExpression::new(DataType::Decimal, 0).boxed(),
+                InputRefExpression::new(DataType::Decimal, 1).boxed(),
+            ],
+        )
+        .unwrap();
+        let res = expr.eval(&data_chunk).await.unwrap();
         let arr: &A = res.as_ref().into();
         for (idx, item) in arr.iter().enumerate() {
             let x = target[idx].as_ref().map(|x| x.as_scalar_ref());
@@ -1039,7 +224,7 @@ mod tests {
                 lhs[i].map(|dec| dec.to_scalar_value()),
                 rhs[i].map(|dec| dec.to_scalar_value()),
             ]);
-            let result = vec_executor.eval_row(&row).await.unwrap();
+            let result = expr.eval_row(&row).await.unwrap();
             let expected = target[i].as_ref().cloned().map(|x| x.to_scalar_value());
             assert_eq!(result, expected);
         }
diff --git a/src/expr/src/expr/expr_binary_nullable.rs b/src/expr/src/expr/expr_binary_nullable.rs
index 2d26232fb1291..c5d0a4d1b5736 100644
--- a/src/expr/src/expr/expr_binary_nullable.rs
+++ b/src/expr/src/expr/expr_binary_nullable.rs
@@ -16,51 +16,16 @@
 
 use std::sync::Arc;
 
-use risingwave_common::array::serial_array::SerialArray;
 use risingwave_common::array::*;
 use risingwave_common::buffer::Bitmap;
 use risingwave_common::row::OwnedRow;
 use risingwave_common::types::{DataType, Datum, Scalar};
+use risingwave_expr_macro::build_function;
 use risingwave_pb::expr::expr_node::Type;
 
 use super::{BoxedExpression, Expression};
-use crate::expr::template::BinaryNullableExpression;
-use crate::expr::template_fast;
-use crate::vector_op::array_access::array_access;
-use crate::vector_op::cmp::{
-    general_is_distinct_from, general_is_not_distinct_from, general_ne, str_is_distinct_from,
-    str_is_not_distinct_from,
-};
 use crate::vector_op::conjunction::{and, or};
-use crate::vector_op::format_type::format_type;
-use crate::{for_all_cmp_variants, ExprError, Result};
-
-macro_rules! gen_is_distinct_from_impl {
-    ([$l:expr, $r:expr, $ret:expr], $( { $i1:ident, $i2:ident, $cast:ident, $func:ident} ),* $(,)?) => {
-        match ($l.return_type(), $r.return_type()) {
-            $(
-                ($i1! { type_match_pattern }, $i2! { type_match_pattern }) => {
-                    template_fast::IsDistinctFromExpression::new(
-                        $l,
-                        $r,
-                        general_ne::<
-                            <$i1! { type_array } as Array>::OwnedItem,
-                            <$i2! { type_array } as Array>::OwnedItem,
-                            <$cast! { type_array } as Array>::OwnedItem
-                        >,
-                        $func,
-                    ).boxed()
-                }
-            ),*
-            _ => {
-                return Err(ExprError::UnsupportedFunction(format!(
-                    "{:?} cmp {:?}",
-                    $l.return_type(), $r.return_type()
-                )));
-            }
-        }
-    };
-}
+use crate::Result;
 
 pub struct BinaryShortCircuitExpression {
     expr_ia1: BoxedExpression,
@@ -138,360 +103,134 @@ impl Expression for BinaryShortCircuitExpression {
         }
         let ret_ia2 = self.expr_ia2.eval_row(input).await?.map(|x| x.into_bool());
         match self.expr_type {
-            Type::Or => Ok(or(ret_ia1, ret_ia2)?.map(|x| x.to_scalar_value())),
-            Type::And => Ok(and(ret_ia1, ret_ia2)?.map(|x| x.to_scalar_value())),
+            Type::Or => Ok(or(ret_ia1, ret_ia2).map(|x| x.to_scalar_value())),
+            Type::And => Ok(and(ret_ia1, ret_ia2).map(|x| x.to_scalar_value())),
             _ => unimplemented!(),
         }
     }
 }
 
-impl BinaryShortCircuitExpression {
-    pub fn new(expr_ia1: BoxedExpression, expr_ia2: BoxedExpression, expr_type: Type) -> Self {
-        Self {
-            expr_ia1,
-            expr_ia2,
-            expr_type,
-        }
-    }
-}
-
-pub fn new_nullable_binary_expr(
-    expr_type: Type,
-    ret: DataType,
-    l: BoxedExpression,
-    r: BoxedExpression,
-) -> Result<BoxedExpression> {
-    let expr = match expr_type {
-        Type::ArrayAccess => build_array_access_expr(ret, l, r),
-        Type::And => Box::new(BinaryShortCircuitExpression::new(l, r, expr_type)),
-        Type::Or => Box::new(BinaryShortCircuitExpression::new(l, r, expr_type)),
-        Type::IsDistinctFrom => new_distinct_from_expr(l, r, ret)?,
-        Type::IsNotDistinctFrom => new_not_distinct_from_expr(l, r, ret)?,
-        Type::FormatType => new_format_type_expr(l, r, ret),
-        tp => {
-            return Err(ExprError::UnsupportedFunction(format!(
-                "{:?}({:?}, {:?})",
-                tp,
-                l.return_type(),
-                r.return_type(),
-            )));
-        }
-    };
-    Ok(expr)
-}
-
-fn build_array_access_expr(
-    ret: DataType,
-    l: BoxedExpression,
-    r: BoxedExpression,
-) -> BoxedExpression {
-    macro_rules! array_access_expression {
-        ($array:ty) => {
-            Box::new(
-                BinaryNullableExpression::<ListArray, I32Array, $array, _>::new(
-                    l,
-                    r,
-                    ret,
-                    array_access,
-                ),
-            )
-        };
-    }
-
-    match ret {
-        DataType::Boolean => array_access_expression!(BoolArray),
-        DataType::Int16 => array_access_expression!(I16Array),
-        DataType::Int32 => array_access_expression!(I32Array),
-        DataType::Int64 => array_access_expression!(I64Array),
-        DataType::Serial => array_access_expression!(SerialArray),
-        DataType::Float32 => array_access_expression!(F32Array),
-        DataType::Float64 => array_access_expression!(F64Array),
-        DataType::Decimal => array_access_expression!(DecimalArray),
-        DataType::Date => array_access_expression!(NaiveDateArray),
-        DataType::Varchar => array_access_expression!(Utf8Array),
-        DataType::Bytea => array_access_expression!(BytesArray),
-        DataType::Time => array_access_expression!(NaiveTimeArray),
-        DataType::Timestamp => array_access_expression!(NaiveDateTimeArray),
-        DataType::Timestamptz => array_access_expression!(PrimitiveArray::<i64>),
-        DataType::Interval => array_access_expression!(IntervalArray),
-        DataType::Jsonb => array_access_expression!(JsonbArray),
-        DataType::Struct { .. } => array_access_expression!(StructArray),
-        DataType::List { .. } => array_access_expression!(ListArray),
-    }
-}
-
-pub fn new_distinct_from_expr(
-    l: BoxedExpression,
-    r: BoxedExpression,
-    ret: DataType,
-) -> Result<BoxedExpression> {
-    use crate::expr::data_types::*;
-
-    let expr: BoxedExpression = match (l.return_type(), r.return_type()) {
-        (DataType::Boolean, DataType::Boolean) => template_fast::BooleanBinaryExpression::new(
-            l,
-            r,
-            |l, r| {
-                let data = ((l.data() ^ r.data()) & (l.null_bitmap() & r.null_bitmap()))
-                    | (l.null_bitmap() ^ r.null_bitmap());
-                BoolArray::new(data, Bitmap::ones(l.len()))
-            },
-            |l, r| Some(general_is_distinct_from::<bool, bool, bool>(l, r)),
-        )
-        .boxed(),
-        (DataType::Varchar, DataType::Varchar) => Box::new(BinaryNullableExpression::<
-            Utf8Array,
-            Utf8Array,
-            BoolArray,
-            _,
-        >::new(
-            l, r, ret, str_is_distinct_from
-        )),
-        _ => {
-            for_all_cmp_variants! { gen_is_distinct_from_impl, l, r, ret, false }
-        }
-    };
-    Ok(expr)
+#[build_function("and(boolean, boolean) -> boolean")]
+fn build_and_expr(_: DataType, children: Vec<BoxedExpression>) -> Result<BoxedExpression> {
+    let mut iter = children.into_iter();
+    Ok(Box::new(BinaryShortCircuitExpression {
+        expr_ia1: iter.next().unwrap(),
+        expr_ia2: iter.next().unwrap(),
+        expr_type: Type::And,
+    }))
 }
 
-pub fn new_not_distinct_from_expr(
-    l: BoxedExpression,
-    r: BoxedExpression,
-    ret: DataType,
-) -> Result<BoxedExpression> {
-    use crate::expr::data_types::*;
-
-    let expr: BoxedExpression = match (l.return_type(), r.return_type()) {
-        (DataType::Boolean, DataType::Boolean) => template_fast::BooleanBinaryExpression::new(
-            l,
-            r,
-            |l, r| {
-                let data = !(((l.data() ^ r.data()) & (l.null_bitmap() & r.null_bitmap()))
-                    | (l.null_bitmap() ^ r.null_bitmap()));
-                BoolArray::new(data, Bitmap::ones(l.len()))
-            },
-            |l, r| Some(general_is_not_distinct_from::<bool, bool, bool>(l, r)),
-        )
-        .boxed(),
-        (DataType::Varchar, DataType::Varchar) => Box::new(BinaryNullableExpression::<
-            Utf8Array,
-            Utf8Array,
-            BoolArray,
-            _,
-        >::new(
-            l, r, ret, str_is_not_distinct_from
-        )),
-        _ => {
-            for_all_cmp_variants! { gen_is_distinct_from_impl, l, r, ret, true }
-        }
-    };
-    Ok(expr)
-}
-
-pub fn new_format_type_expr(
-    expr_ia1: BoxedExpression,
-    expr_ia2: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    Box::new(
-        BinaryNullableExpression::<I32Array, I32Array, Utf8Array, _>::new(
-            expr_ia1,
-            expr_ia2,
-            return_type,
-            format_type,
-        ),
-    )
+#[build_function("or(boolean, boolean) -> boolean")]
+fn build_or_expr(_: DataType, children: Vec<BoxedExpression>) -> Result<BoxedExpression> {
+    let mut iter = children.into_iter();
+    Ok(Box::new(BinaryShortCircuitExpression {
+        expr_ia1: iter.next().unwrap(),
+        expr_ia2: iter.next().unwrap(),
+        expr_type: Type::Or,
+    }))
 }
 
 #[cfg(test)]
 mod tests {
-    use risingwave_common::row::OwnedRow;
-    use risingwave_common::types::Scalar;
-    use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::expr::expr_node::Type;
+    use risingwave_common::array::DataChunk;
+    use risingwave_common::test_prelude::DataChunkTestExt;
 
-    use crate::expr::build_from_prost;
-    use crate::expr::test_utils::make_expression;
+    use crate::expr::build_from_pretty;
 
     #[tokio::test]
     async fn test_and() {
-        let lhs = vec![
-            Some(true),
-            Some(true),
-            Some(true),
-            Some(false),
-            Some(false),
-            Some(false),
-            None,
-            None,
-            None,
-        ];
-        let rhs = vec![
-            Some(true),
-            Some(false),
-            None,
-            Some(true),
-            Some(false),
-            None,
-            Some(true),
-            Some(false),
-            None,
-        ];
-        let target = vec![
-            Some(true),
-            Some(false),
-            None,
-            Some(false),
-            Some(false),
-            Some(false),
-            None,
-            Some(false),
-            None,
-        ];
-
-        let expr = make_expression(Type::And, &[TypeName::Boolean, TypeName::Boolean], &[0, 1]);
-        let vec_executor = build_from_prost(&expr).unwrap();
-
-        for i in 0..lhs.len() {
-            let row = OwnedRow::new(vec![
-                lhs[i].map(|x| x.to_scalar_value()),
-                rhs[i].map(|x| x.to_scalar_value()),
-            ]);
-            let res = vec_executor.eval_row(&row).await.unwrap();
-            let expected = target[i].map(|x| x.to_scalar_value());
-            assert_eq!(res, expected);
-        }
+        let (input, target) = DataChunk::from_pretty(
+            "
+            B B B
+            t t t
+            t f f
+            t . .
+            f t f
+            f f f
+            f . f
+            . t .
+            . f f
+            . . .
+        ",
+        )
+        .split_column_at(2);
+        let expr = build_from_pretty("(and:boolean $0:boolean $1:boolean)");
+        let result = expr.eval(&input).await.unwrap();
+        assert_eq!(result, target.column_at(0).array());
     }
 
     #[tokio::test]
     async fn test_or() {
-        let lhs = vec![
-            Some(true),
-            Some(true),
-            Some(true),
-            Some(false),
-            Some(false),
-            Some(false),
-            None,
-            None,
-            None,
-        ];
-        let rhs = vec![
-            Some(true),
-            Some(false),
-            None,
-            Some(true),
-            Some(false),
-            None,
-            Some(true),
-            Some(false),
-            None,
-        ];
-        let target = vec![
-            Some(true),
-            Some(true),
-            Some(true),
-            Some(true),
-            Some(false),
-            None,
-            Some(true),
-            None,
-            None,
-        ];
-
-        let expr = make_expression(Type::Or, &[TypeName::Boolean, TypeName::Boolean], &[0, 1]);
-        let vec_executor = build_from_prost(&expr).unwrap();
-
-        for i in 0..lhs.len() {
-            let row = OwnedRow::new(vec![
-                lhs[i].map(|x| x.to_scalar_value()),
-                rhs[i].map(|x| x.to_scalar_value()),
-            ]);
-            let res = vec_executor.eval_row(&row).await.unwrap();
-            let expected = target[i].map(|x| x.to_scalar_value());
-            assert_eq!(res, expected);
-        }
+        let (input, target) = DataChunk::from_pretty(
+            "
+            B B B
+            t t t
+            t f t
+            t . t
+            f t t
+            f f f
+            f . .
+            . t t
+            . f .
+            . . .
+        ",
+        )
+        .split_column_at(2);
+        let expr = build_from_pretty("(or:boolean $0:boolean $1:boolean)");
+        let result = expr.eval(&input).await.unwrap();
+        assert_eq!(result, target.column_at(0).array());
     }
 
     #[tokio::test]
     async fn test_is_distinct_from() {
-        let lhs = vec![None, None, Some(1), Some(2), Some(3)];
-        let rhs = vec![None, Some(1), None, Some(2), Some(4)];
-        let target = vec![Some(false), Some(true), Some(true), Some(false), Some(true)];
-
-        let expr = make_expression(
-            Type::IsDistinctFrom,
-            &[TypeName::Int32, TypeName::Int32],
-            &[0, 1],
-        );
-        let vec_executor = build_from_prost(&expr).unwrap();
-
-        for i in 0..lhs.len() {
-            let row = OwnedRow::new(vec![
-                lhs[i].map(|x| x.to_scalar_value()),
-                rhs[i].map(|x| x.to_scalar_value()),
-            ]);
-            let res = vec_executor.eval_row(&row).await.unwrap();
-            let expected = target[i].map(|x| x.to_scalar_value());
-            assert_eq!(res, expected);
-        }
+        let (input, target) = DataChunk::from_pretty(
+            "
+            i i B
+            . . f
+            . 1 t
+            1 . t
+            2 2 f
+            3 4 t
+        ",
+        )
+        .split_column_at(2);
+        let expr = build_from_pretty("(is_distinct_from:boolean $0:int4 $1:int4)");
+        let result = expr.eval(&input).await.unwrap();
+        assert_eq!(result, target.column_at(0).array());
     }
 
     #[tokio::test]
     async fn test_is_not_distinct_from() {
-        let lhs = vec![None, None, Some(1), Some(2), Some(3)];
-        let rhs = vec![None, Some(1), None, Some(2), Some(4)];
-        let target = vec![
-            Some(true),
-            Some(false),
-            Some(false),
-            Some(true),
-            Some(false),
-        ];
-
-        let expr = make_expression(
-            Type::IsNotDistinctFrom,
-            &[TypeName::Int32, TypeName::Int32],
-            &[0, 1],
-        );
-        let vec_executor = build_from_prost(&expr).unwrap();
-
-        for i in 0..lhs.len() {
-            let row = OwnedRow::new(vec![
-                lhs[i].map(|x| x.to_scalar_value()),
-                rhs[i].map(|x| x.to_scalar_value()),
-            ]);
-            let res = vec_executor.eval_row(&row).await.unwrap();
-            let expected = target[i].map(|x| x.to_scalar_value());
-            assert_eq!(res, expected);
-        }
+        let (input, target) = DataChunk::from_pretty(
+            "
+            i i B
+            . . t
+            . 1 f
+            1 . f
+            2 2 t
+            3 4 f
+            ",
+        )
+        .split_column_at(2);
+        let expr = build_from_pretty("(is_not_distinct_from:boolean $0:int4 $1:int4)");
+        let result = expr.eval(&input).await.unwrap();
+        assert_eq!(result, target.column_at(0).array());
     }
 
     #[tokio::test]
     async fn test_format_type() {
-        let l = vec![Some(16), Some(21), Some(9527), None];
-        let r = vec![Some(0), None, Some(0), Some(0)];
-        let target: Vec<Option<String>> = vec![
-            Some("boolean".into()),
-            Some("smallint".into()),
-            Some("???".into()),
-            None,
-        ];
-        let expr = make_expression(
-            Type::FormatType,
-            &[TypeName::Int32, TypeName::Int32],
-            &[0, 1],
-        );
-        let vec_executor = build_from_prost(&expr).unwrap();
-
-        for i in 0..l.len() {
-            let row = OwnedRow::new(vec![
-                l[i].map(|x| x.to_scalar_value()),
-                r[i].map(|x| x.to_scalar_value()),
-            ]);
-            let res = vec_executor.eval_row(&row).await.unwrap();
-            let expected = target[i].as_ref().map(|x| x.into());
-            assert_eq!(res, expected);
-        }
+        let (input, target) = DataChunk::from_pretty(
+            "
+            i       i T
+            16      0 boolean
+            21      . smallint
+            9527    0 ???
+            .       0 .
+            ",
+        )
+        .split_column_at(2);
+        let expr = build_from_pretty("(format_type:varchar $0:int4 $1:int4)");
+        let result = expr.eval(&input).await.unwrap();
+        assert_eq!(result, target.column_at(0).array());
     }
 }
diff --git a/src/expr/src/expr/expr_case.rs b/src/expr/src/expr/expr_case.rs
index 8754db3d71f17..4a1129da55094 100644
--- a/src/expr/src/expr/expr_case.rs
+++ b/src/expr/src/expr/expr_case.rs
@@ -18,7 +18,7 @@ use risingwave_common::array::{ArrayRef, DataChunk, Vis};
 use risingwave_common::row::OwnedRow;
 use risingwave_common::types::{DataType, Datum};
 use risingwave_common::{bail, ensure};
-use risingwave_pb::expr::expr_node::{RexNode, Type};
+use risingwave_pb::expr::expr_node::{PbType, RexNode};
 use risingwave_pb::expr::ExprNode;
 
 use crate::expr::{build_from_prost, BoxedExpression, Expression};
@@ -26,14 +26,8 @@ use crate::{ExprError, Result};
 
 #[derive(Debug)]
 pub struct WhenClause {
-    pub when: BoxedExpression,
-    pub then: BoxedExpression,
-}
-
-impl WhenClause {
-    pub fn new(when: BoxedExpression, then: BoxedExpression) -> Self {
-        WhenClause { when, then }
-    }
+    when: BoxedExpression,
+    then: BoxedExpression,
 }
 
 #[derive(Debug)]
@@ -122,7 +116,7 @@ impl<'a> TryFrom<&'a ExprNode> for CaseExpression {
     type Error = ExprError;
 
     fn try_from(prost: &'a ExprNode) -> Result<Self> {
-        ensure!(prost.get_expr_type().unwrap() == Type::Case);
+        ensure!(prost.get_expr_type().unwrap() == PbType::Case);
 
         let ret_type = DataType::from(prost.get_return_type().unwrap());
         let RexNode::FuncCall(func_call_node) = prost.get_rex_node().unwrap() else {
@@ -152,7 +146,10 @@ impl<'a> TryFrom<&'a ExprNode> for CaseExpression {
             if then_expr.return_type() != ret_type {
                 bail!("Type mismatched between then clause and case");
             }
-            let when_clause = WhenClause::new(when_expr, then_expr);
+            let when_clause = WhenClause {
+                when: when_expr,
+                then: then_expr,
+            };
             when_clauses.push(when_clause);
         }
         Ok(CaseExpression::new(ret_type, when_clauses, else_clause))
@@ -163,47 +160,9 @@ impl<'a> TryFrom<&'a ExprNode> for CaseExpression {
 mod tests {
     use risingwave_common::test_prelude::DataChunkTestExt;
     use risingwave_common::types::Scalar;
-    use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::DataType as ProstDataType;
-    use risingwave_pb::expr::expr_node::Type;
-    use risingwave_pb::expr::FunctionCall;
 
     use super::*;
-    use crate::expr::expr_binary_nonnull::new_binary_expr;
-    use crate::expr::{InputRefExpression, LiteralExpression};
-
-    #[test]
-    fn test_case_expr() {
-        let call = FunctionCall {
-            children: vec![
-                ExprNode {
-                    expr_type: Type::ConstantValue as i32,
-                    return_type: Some(ProstDataType {
-                        type_name: TypeName::Boolean as i32,
-                        ..Default::default()
-                    }),
-                    rex_node: None,
-                },
-                ExprNode {
-                    expr_type: Type::ConstantValue as i32,
-                    return_type: Some(ProstDataType {
-                        type_name: TypeName::Int32 as i32,
-                        ..Default::default()
-                    }),
-                    rex_node: None,
-                },
-            ],
-        };
-        let p = ExprNode {
-            expr_type: Type::Case as i32,
-            return_type: Some(ProstDataType {
-                type_name: TypeName::Int32 as i32,
-                ..Default::default()
-            }),
-            rex_node: Some(RexNode::FuncCall(call)),
-        };
-        assert!(CaseExpression::try_from(&p).is_ok());
-    }
+    use crate::expr::build_from_pretty;
 
     async fn test_eval_row(expr: CaseExpression, row_inputs: Vec<i32>, expected: Vec<Option<f32>>) {
         for (i, row_input) in row_inputs.iter().enumerate() {
@@ -217,25 +176,12 @@ mod tests {
     #[tokio::test]
     async fn test_eval_searched_case() {
         let ret_type = DataType::Float32;
-        // when x <= 2 then 3.1
-        let when_clauses = vec![WhenClause::new(
-            new_binary_expr(
-                Type::LessThanOrEqual,
-                DataType::Boolean,
-                Box::new(InputRefExpression::new(DataType::Int32, 0)),
-                Box::new(LiteralExpression::new(DataType::Float32, Some(2f32.into()))),
-            )
-            .unwrap(),
-            Box::new(LiteralExpression::new(
-                DataType::Float32,
-                Some(3.1f32.into()),
-            )),
-        )];
-        // else 4.1
-        let els = Box::new(LiteralExpression::new(
-            DataType::Float32,
-            Some(4.1f32.into()),
-        ));
+        // when x <= 2 then 3.1 else 4.1
+        let when_clauses = vec![WhenClause {
+            when: build_from_pretty("(less_than_or_equal:boolean $0:int4 2:float4)"),
+            then: build_from_pretty("3.1:float4"),
+        }];
+        let els = build_from_pretty("4.1:float4");
         let searched_case_expr = CaseExpression::new(ret_type, when_clauses, Some(els));
         let input = DataChunk::from_pretty(
             "i
@@ -257,19 +203,10 @@ mod tests {
     async fn test_eval_without_else() {
         let ret_type = DataType::Float32;
         // when x <= 3 then 3.1
-        let when_clauses = vec![WhenClause::new(
-            new_binary_expr(
-                Type::LessThanOrEqual,
-                DataType::Boolean,
-                Box::new(InputRefExpression::new(DataType::Int32, 0)),
-                Box::new(LiteralExpression::new(DataType::Float32, Some(3f32.into()))),
-            )
-            .unwrap(),
-            Box::new(LiteralExpression::new(
-                DataType::Float32,
-                Some(3.1f32.into()),
-            )),
-        )];
+        let when_clauses = vec![WhenClause {
+            when: build_from_pretty("(less_than_or_equal:boolean $0:int4 3:float4)"),
+            then: build_from_pretty("3.1:float4"),
+        }];
         let searched_case_expr = CaseExpression::new(ret_type, when_clauses, None);
         let input = DataChunk::from_pretty(
             "i
@@ -288,25 +225,12 @@ mod tests {
     #[tokio::test]
     async fn test_eval_row_searched_case() {
         let ret_type = DataType::Float32;
-        // when x <= 2 then 3.1
-        let when_clauses = vec![WhenClause::new(
-            new_binary_expr(
-                Type::LessThanOrEqual,
-                DataType::Boolean,
-                Box::new(InputRefExpression::new(DataType::Int32, 0)),
-                Box::new(LiteralExpression::new(DataType::Float32, Some(2f32.into()))),
-            )
-            .unwrap(),
-            Box::new(LiteralExpression::new(
-                DataType::Float32,
-                Some(3.1f32.into()),
-            )),
-        )];
-        // else 4.1
-        let els = Box::new(LiteralExpression::new(
-            DataType::Float32,
-            Some(4.1f32.into()),
-        ));
+        // when x <= 2 then 3.1 else 4.1
+        let when_clauses = vec![WhenClause {
+            when: build_from_pretty("(less_than_or_equal:boolean $0:int4 2:float4)"),
+            then: build_from_pretty("3.1:float4"),
+        }];
+        let els = build_from_pretty("4.1:float4");
         let searched_case_expr = CaseExpression::new(ret_type, when_clauses, Some(els));
 
         let row_inputs = vec![1, 2, 3, 4, 5];
@@ -325,19 +249,10 @@ mod tests {
     async fn test_eval_row_without_else() {
         let ret_type = DataType::Float32;
         // when x <= 3 then 3.1
-        let when_clauses = vec![WhenClause::new(
-            new_binary_expr(
-                Type::LessThanOrEqual,
-                DataType::Boolean,
-                Box::new(InputRefExpression::new(DataType::Int32, 0)),
-                Box::new(LiteralExpression::new(DataType::Float32, Some(3f32.into()))),
-            )
-            .unwrap(),
-            Box::new(LiteralExpression::new(
-                DataType::Float32,
-                Some(3.1f32.into()),
-            )),
-        )];
+        let when_clauses = vec![WhenClause {
+            when: build_from_pretty("(less_than_or_equal:boolean $0:int4 3:float4)"),
+            then: build_from_pretty("3.1:float4"),
+        }];
         let searched_case_expr = CaseExpression::new(ret_type, when_clauses, None);
 
         let row_inputs = vec![2, 3, 4, 5];
diff --git a/src/expr/src/expr/expr_coalesce.rs b/src/expr/src/expr/expr_coalesce.rs
index 4eb3355daacb9..94c4b3523141f 100644
--- a/src/expr/src/expr/expr_coalesce.rs
+++ b/src/expr/src/expr/expr_coalesce.rs
@@ -119,7 +119,7 @@ mod tests {
     use risingwave_common::test_prelude::DataChunkTestExt;
     use risingwave_common::types::{Scalar, ScalarImpl};
     use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::DataType as ProstDataType;
+    use risingwave_pb::data::PbDataType;
     use risingwave_pb::expr::expr_node::RexNode;
     use risingwave_pb::expr::expr_node::Type::Coalesce;
     use risingwave_pb::expr::{ExprNode, FunctionCall};
@@ -131,7 +131,7 @@ mod tests {
     pub fn make_coalesce_function(children: Vec<ExprNode>, ret: TypeName) -> ExprNode {
         ExprNode {
             expr_type: Coalesce as i32,
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: ret as i32,
                 ..Default::default()
             }),
diff --git a/src/expr/src/expr/expr_concat_ws.rs b/src/expr/src/expr/expr_concat_ws.rs
index 0a5780bc3db19..c1fa8c98bf1f5 100644
--- a/src/expr/src/expr/expr_concat_ws.rs
+++ b/src/expr/src/expr/expr_concat_ws.rs
@@ -162,7 +162,7 @@ mod tests {
     use risingwave_common::row::OwnedRow;
     use risingwave_common::types::Datum;
     use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::DataType as ProstDataType;
+    use risingwave_pb::data::PbDataType;
     use risingwave_pb::expr::expr_node::RexNode;
     use risingwave_pb::expr::expr_node::Type::ConcatWs;
     use risingwave_pb::expr::{ExprNode, FunctionCall};
@@ -174,7 +174,7 @@ mod tests {
     pub fn make_concat_ws_function(children: Vec<ExprNode>, ret: TypeName) -> ExprNode {
         ExprNode {
             expr_type: ConcatWs as i32,
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: ret as i32,
                 ..Default::default()
             }),
diff --git a/src/expr/src/expr/expr_in.rs b/src/expr/src/expr/expr_in.rs
index 6f8abb1f4cc1a..21c93e9538a28 100644
--- a/src/expr/src/expr/expr_in.rs
+++ b/src/expr/src/expr/expr_in.rs
@@ -132,7 +132,7 @@ mod tests {
     use risingwave_common::types::{DataType, ScalarImpl};
     use risingwave_common::util::value_encoding::serialize_datum;
     use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::{DataType as ProstDataType, Datum as ProstDatum};
+    use risingwave_pb::data::{PbDataType, PbDatum};
     use risingwave_pb::expr::expr_node::{RexNode, Type};
     use risingwave_pb::expr::{ExprNode, FunctionCall};
 
@@ -143,7 +143,7 @@ mod tests {
     fn test_in_expr() {
         let input_ref_expr_node = ExprNode {
             expr_type: Type::InputRef as i32,
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: TypeName::Varchar as i32,
                 ..Default::default()
             }),
@@ -152,21 +152,21 @@ mod tests {
         let constant_values = vec![
             ExprNode {
                 expr_type: Type::ConstantValue as i32,
-                return_type: Some(ProstDataType {
+                return_type: Some(PbDataType {
                     type_name: TypeName::Varchar as i32,
                     ..Default::default()
                 }),
-                rex_node: Some(RexNode::Constant(ProstDatum {
+                rex_node: Some(RexNode::Constant(PbDatum {
                     body: serialize_datum(Some("ABC".into()).as_ref()),
                 })),
             },
             ExprNode {
                 expr_type: Type::ConstantValue as i32,
-                return_type: Some(ProstDataType {
+                return_type: Some(PbDataType {
                     type_name: TypeName::Varchar as i32,
                     ..Default::default()
                 }),
-                rex_node: Some(RexNode::Constant(ProstDatum {
+                rex_node: Some(RexNode::Constant(PbDatum {
                     body: serialize_datum(Some("def".into()).as_ref()),
                 })),
             },
@@ -178,7 +178,7 @@ mod tests {
         };
         let p = ExprNode {
             expr_type: Type::In as i32,
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: TypeName::Boolean as i32,
                 ..Default::default()
             }),
diff --git a/src/expr/src/expr/expr_is_null.rs b/src/expr/src/expr/expr_is_null.rs
index 95c91920f9f74..3d6bf5081f4db 100644
--- a/src/expr/src/expr/expr_is_null.rs
+++ b/src/expr/src/expr/expr_is_null.rs
@@ -18,6 +18,7 @@ use risingwave_common::array::{ArrayImpl, ArrayRef, BoolArray, DataChunk};
 use risingwave_common::buffer::Bitmap;
 use risingwave_common::row::OwnedRow;
 use risingwave_common::types::{DataType, Datum, Scalar};
+use risingwave_expr_macro::build_function;
 
 use crate::expr::{BoxedExpression, Expression};
 use crate::Result;
@@ -33,13 +34,13 @@ pub struct IsNotNullExpression {
 }
 
 impl IsNullExpression {
-    pub(crate) fn new(child: BoxedExpression) -> Self {
+    fn new(child: BoxedExpression) -> Self {
         Self { child }
     }
 }
 
 impl IsNotNullExpression {
-    pub(crate) fn new(child: BoxedExpression) -> Self {
+    fn new(child: BoxedExpression) -> Self {
         Self { child }
     }
 }
@@ -88,6 +89,20 @@ impl Expression for IsNotNullExpression {
     }
 }
 
+#[build_function("is_null(*) -> boolean")]
+fn build_is_null_expr(_: DataType, children: Vec<BoxedExpression>) -> Result<BoxedExpression> {
+    Ok(Box::new(IsNullExpression::new(
+        children.into_iter().next().unwrap(),
+    )))
+}
+
+#[build_function("is_not_null(*) -> boolean")]
+fn build_is_not_null_expr(_: DataType, children: Vec<BoxedExpression>) -> Result<BoxedExpression> {
+    Ok(Box::new(IsNotNullExpression::new(
+        children.into_iter().next().unwrap(),
+    )))
+}
+
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;
diff --git a/src/expr/src/expr/expr_jsonb_access.rs b/src/expr/src/expr/expr_jsonb_access.rs
index 8445976c74591..e8f159ad0070a 100644
--- a/src/expr/src/expr/expr_jsonb_access.rs
+++ b/src/expr/src/expr/expr_jsonb_access.rs
@@ -14,14 +14,16 @@
 
 use either::Either;
 use risingwave_common::array::{
-    Array, ArrayBuilder, ArrayImpl, ArrayRef, DataChunk, JsonbArray, JsonbArrayBuilder, JsonbRef,
-    Utf8ArrayBuilder,
+    Array, ArrayBuilder, ArrayImpl, ArrayRef, DataChunk, I32Array, JsonbArray, JsonbArrayBuilder,
+    JsonbRef, Utf8Array, Utf8ArrayBuilder,
 };
 use risingwave_common::row::OwnedRow;
 use risingwave_common::types::{DataType, Datum, Scalar, ScalarRef};
 use risingwave_common::util::iter_util::ZipEqFast;
+use risingwave_expr_macro::build_function;
 
 use super::{BoxedExpression, Expression};
+use crate::Result;
 
 /// This is forked from [`BinaryExpression`] for the following reasons:
 /// * Optimize for the case when rhs path is const. (not implemented yet)
@@ -221,3 +223,149 @@ impl AccessOutput for Utf8ArrayBuilder {
         }
     }
 }
+
+#[build_function("jsonb_access_inner(jsonb, varchar) -> jsonb")]
+fn build_jsonb_access_object_field(
+    _return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let mut iter = children.into_iter();
+    let l = iter.next().unwrap();
+    let r = iter.next().unwrap();
+    Ok(
+        JsonbAccessExpression::<Utf8Array, JsonbArrayBuilder, _>::new_expr(
+            l,
+            r,
+            jsonb_object_field,
+        )
+        .boxed(),
+    )
+}
+
+#[build_function("jsonb_access_inner(jsonb, int32) -> jsonb")]
+fn build_jsonb_access_array_element(
+    _return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let mut iter = children.into_iter();
+    let l = iter.next().unwrap();
+    let r = iter.next().unwrap();
+    Ok(
+        JsonbAccessExpression::<I32Array, JsonbArrayBuilder, _>::new_expr(
+            l,
+            r,
+            jsonb_array_element,
+        )
+        .boxed(),
+    )
+}
+
+#[build_function("jsonb_access_str(jsonb, varchar) -> varchar")]
+fn build_jsonb_access_object_field_str(
+    _return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let mut iter = children.into_iter();
+    let l = iter.next().unwrap();
+    let r = iter.next().unwrap();
+    Ok(
+        JsonbAccessExpression::<Utf8Array, Utf8ArrayBuilder, _>::new_expr(l, r, jsonb_object_field)
+            .boxed(),
+    )
+}
+
+#[build_function("jsonb_access_str(jsonb, int32) -> varchar")]
+fn build_jsonb_access_array_element_str(
+    _return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let mut iter = children.into_iter();
+    let l = iter.next().unwrap();
+    let r = iter.next().unwrap();
+    Ok(
+        JsonbAccessExpression::<I32Array, Utf8ArrayBuilder, _>::new_expr(l, r, jsonb_array_element)
+            .boxed(),
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use std::vec;
+
+    use risingwave_common::array::{ArrayImpl, DataChunk, Utf8Array};
+    use risingwave_common::types::Scalar;
+    use risingwave_common::util::value_encoding::serialize_datum;
+    use risingwave_pb::data::data_type::TypeName;
+    use risingwave_pb::data::{DataType as ProstDataType, Datum as ProstDatum};
+    use risingwave_pb::expr::expr_node::{RexNode, Type};
+    use risingwave_pb::expr::{ExprNode, FunctionCall};
+
+    use crate::expr::build_from_prost;
+
+    #[tokio::test]
+    async fn test_array_access_expr() {
+        let values = FunctionCall {
+            children: vec![
+                ExprNode {
+                    expr_type: Type::ConstantValue as i32,
+                    return_type: Some(ProstDataType {
+                        type_name: TypeName::Varchar as i32,
+                        ..Default::default()
+                    }),
+                    rex_node: Some(RexNode::Constant(ProstDatum {
+                        body: serialize_datum(Some("foo".into()).as_ref()),
+                    })),
+                },
+                ExprNode {
+                    expr_type: Type::ConstantValue as i32,
+                    return_type: Some(ProstDataType {
+                        type_name: TypeName::Varchar as i32,
+                        ..Default::default()
+                    }),
+                    rex_node: Some(RexNode::Constant(ProstDatum {
+                        body: serialize_datum(Some("bar".into()).as_ref()),
+                    })),
+                },
+            ],
+        };
+        let array_index = FunctionCall {
+            children: vec![
+                ExprNode {
+                    expr_type: Type::Array as i32,
+                    return_type: Some(ProstDataType {
+                        type_name: TypeName::List as i32,
+                        field_type: vec![ProstDataType {
+                            type_name: TypeName::Varchar as i32,
+                            ..Default::default()
+                        }],
+                        ..Default::default()
+                    }),
+                    rex_node: Some(RexNode::FuncCall(values)),
+                },
+                ExprNode {
+                    expr_type: Type::ConstantValue as i32,
+                    return_type: Some(ProstDataType {
+                        type_name: TypeName::Int32 as i32,
+                        ..Default::default()
+                    }),
+                    rex_node: Some(RexNode::Constant(ProstDatum {
+                        body: serialize_datum(Some(1_i32.to_scalar_value()).as_ref()),
+                    })),
+                },
+            ],
+        };
+        let access = ExprNode {
+            expr_type: Type::ArrayAccess as i32,
+            return_type: Some(ProstDataType {
+                type_name: TypeName::Varchar as i32,
+                ..Default::default()
+            }),
+            rex_node: Some(RexNode::FuncCall(array_index)),
+        };
+        let expr = build_from_prost(&access);
+        assert!(expr.is_ok());
+
+        let res = expr.unwrap().eval(&DataChunk::new_dummy(1)).await.unwrap();
+        assert_eq!(*res, ArrayImpl::Utf8(Utf8Array::from_iter(["foo"])));
+    }
+}
diff --git a/src/expr/src/expr/expr_literal.rs b/src/expr/src/expr/expr_literal.rs
index 376ed2dda42ed..436aed3b853ea 100644
--- a/src/expr/src/expr/expr_literal.rs
+++ b/src/expr/src/expr/expr_literal.rs
@@ -71,6 +71,10 @@ impl Expression for LiteralExpression {
     async fn eval_row(&self, _input: &OwnedRow) -> Result<Datum> {
         Ok(self.literal.as_ref().cloned())
     }
+
+    fn eval_const(&self) -> Result<Datum> {
+        Ok(self.literal.clone())
+    }
 }
 
 impl LiteralExpression {
@@ -121,11 +125,11 @@ impl<'a> TryFrom<&'a ExprNode> for LiteralExpression {
 mod tests {
     use risingwave_common::array::{I32Array, StructValue};
     use risingwave_common::array_nonnull;
-    use risingwave_common::types::test_utils::IntervalUnitTestExt;
-    use risingwave_common::types::{Decimal, IntervalUnit, IntoOrdered};
+    use risingwave_common::types::test_utils::IntervalTestExt;
+    use risingwave_common::types::{Decimal, Interval, IntoOrdered};
     use risingwave_common::util::value_encoding::serialize_datum;
     use risingwave_pb::data::data_type::{IntervalType, TypeName};
-    use risingwave_pb::data::{DataType as ProstDataType, Datum as ProstDatum};
+    use risingwave_pb::data::{PbDataType, PbDatum};
     use risingwave_pb::expr::expr_node::RexNode::Constant;
     use risingwave_pb::expr::expr_node::Type;
     use risingwave_pb::expr::ExprNode;
@@ -142,25 +146,25 @@ mod tests {
         let body = serialize_datum(Some(value.clone().to_scalar_value()).as_ref());
         let expr = ExprNode {
             expr_type: Type::ConstantValue as i32,
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: TypeName::Struct as i32,
                 field_type: vec![
-                    ProstDataType {
+                    PbDataType {
                         type_name: TypeName::Varchar as i32,
                         ..Default::default()
                     },
-                    ProstDataType {
+                    PbDataType {
                         type_name: TypeName::Int32 as i32,
                         ..Default::default()
                     },
-                    ProstDataType {
+                    PbDataType {
                         type_name: TypeName::Int32 as i32,
                         ..Default::default()
                     },
                 ],
                 ..Default::default()
             }),
-            rex_node: Some(Constant(ProstDatum { body })),
+            rex_node: Some(Constant(PbDatum { body })),
         };
         let expr = LiteralExpression::try_from(&expr).unwrap();
         assert_eq!(value.to_scalar_value(), expr.literal().unwrap());
@@ -225,10 +229,10 @@ mod tests {
 
         let v = 32i32;
         let t = TypeName::Interval;
-        let bytes = serialize_datum(Some(IntervalUnit::from_month(v).to_scalar_value()).as_ref());
+        let bytes = serialize_datum(Some(Interval::from_month(v).to_scalar_value()).as_ref());
         let expr = LiteralExpression::try_from(&make_expression(Some(bytes), t)).unwrap();
         assert_eq!(
-            IntervalUnit::from_month(v).to_scalar_value(),
+            Interval::from_month(v).to_scalar_value(),
             expr.literal().unwrap()
         );
     }
@@ -236,12 +240,12 @@ mod tests {
     fn make_expression(bytes: Option<Vec<u8>>, data_type: TypeName) -> ExprNode {
         ExprNode {
             expr_type: Type::ConstantValue as i32,
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: data_type as i32,
                 interval_type: IntervalType::Month as i32,
                 ..Default::default()
             }),
-            rex_node: bytes.map(|bs| RexNode::Constant(ProstDatum { body: bs })),
+            rex_node: bytes.map(|bs| RexNode::Constant(PbDatum { body: bs })),
         }
     }
 
diff --git a/src/expr/src/expr/expr_now.rs b/src/expr/src/expr/expr_now.rs
new file mode 100644
index 0000000000000..5791083787a72
--- /dev/null
+++ b/src/expr/src/expr/expr_now.rs
@@ -0,0 +1,24 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 risingwave_common::types::DataType;
+use risingwave_expr_macro::build_function;
+
+use super::{BoxedExpression, Result};
+
+#[build_function("now(timestamptz) -> timestamptz")]
+fn build_now_expr(_: DataType, children: Vec<BoxedExpression>) -> Result<BoxedExpression> {
+    // there should be exact 1 child containing a timestamp literal
+    Ok(children.into_iter().next().unwrap())
+}
diff --git a/src/expr/src/expr/expr_quaternary_bytes.rs b/src/expr/src/expr/expr_quaternary_bytes.rs
deleted file mode 100644
index b1a2c097a54f2..0000000000000
--- a/src/expr/src/expr/expr_quaternary_bytes.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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.
-
-//! For expression that accept 4 arguments + 1 bytes writer as input.
-
-use risingwave_common::array::{I32Array, Utf8Array};
-use risingwave_common::types::DataType;
-
-use crate::expr::template::QuaternaryBytesExpression;
-use crate::expr::BoxedExpression;
-use crate::vector_op::overlay::overlay_for;
-
-pub fn new_overlay_for_exp(
-    s: BoxedExpression,
-    new_sub_str: BoxedExpression,
-    start: BoxedExpression,
-    count: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    Box::new(QuaternaryBytesExpression::<
-        Utf8Array,
-        Utf8Array,
-        I32Array,
-        I32Array,
-        _,
-    >::new(
-        s, new_sub_str, start, count, return_type, overlay_for
-    ))
-}
-
-#[cfg(test)]
-mod tests {
-    use risingwave_common::array::DataChunk;
-    use risingwave_common::row::OwnedRow;
-    use risingwave_common::types::{Datum, ScalarImpl};
-
-    use super::*;
-    use crate::expr::LiteralExpression;
-
-    async fn test_evals_dummy(expr: BoxedExpression, expected: Datum, is_negative_len: bool) {
-        let res = expr.eval(&DataChunk::new_dummy(1)).await;
-        if is_negative_len {
-            assert!(res.is_err());
-        } else {
-            assert_eq!(res.unwrap().to_datum(), expected);
-        }
-
-        let res = expr.eval_row(&OwnedRow::new(vec![])).await;
-        if is_negative_len {
-            assert!(res.is_err());
-        } else {
-            assert_eq!(res.unwrap(), expected);
-        }
-    }
-
-    #[tokio::test]
-    async fn test_overlay() {
-        let cases = vec![
-            ("aaa", "XY", 1, 0, "XYaaa"),
-            ("aaa_aaa", "XYZ", 4, 1, "aaaXYZaaa"),
-            ("aaaaaa", "XYZ", 4, 0, "aaaXYZaaa"),
-            ("aaa___aaa", "X", 4, 3, "aaaXaaa"),
-            ("aaa", "X", 4, -123, "aaaX"),
-            ("aaa_", "X", 4, 123, "aaaX"),
-        ];
-
-        for (s, new_sub_str, start, count, expected) in cases {
-            let expr = new_overlay_for_exp(
-                Box::new(LiteralExpression::new(
-                    DataType::Varchar,
-                    Some(ScalarImpl::from(String::from(s))),
-                )),
-                Box::new(LiteralExpression::new(
-                    DataType::Varchar,
-                    Some(ScalarImpl::from(String::from(new_sub_str))),
-                )),
-                Box::new(LiteralExpression::new(
-                    DataType::Int32,
-                    Some(ScalarImpl::from(start)),
-                )),
-                Box::new(LiteralExpression::new(
-                    DataType::Int32,
-                    Some(ScalarImpl::from(count)),
-                )),
-                DataType::Varchar,
-            );
-
-            test_evals_dummy(expr, Some(ScalarImpl::from(String::from(expected))), false).await;
-        }
-    }
-}
diff --git a/src/expr/src/expr/expr_some_all.rs b/src/expr/src/expr/expr_some_all.rs
index 749ce3951f386..dc72d72efb5db 100644
--- a/src/expr/src/expr/expr_some_all.rs
+++ b/src/expr/src/expr/expr_some_all.rs
@@ -19,10 +19,13 @@ use risingwave_common::array::{Array, ArrayMeta, ArrayRef, BoolArray, DataChunk}
 use risingwave_common::row::OwnedRow;
 use risingwave_common::types::{DataType, Datum, Scalar, ScalarImpl, ScalarRefImpl};
 use risingwave_common::util::iter_util::ZipEqFast;
-use risingwave_pb::expr::expr_node::Type;
+use risingwave_common::{bail, ensure};
+use risingwave_pb::expr::expr_node::{RexNode, Type};
+use risingwave_pb::expr::{ExprNode, FunctionCall};
 
-use super::{BoxedExpression, Expression};
-use crate::Result;
+use super::build::get_children_and_return_type;
+use super::{build_from_prost, BoxedExpression, Expression};
+use crate::{ExprError, Result};
 
 #[derive(Debug)]
 pub struct SomeAllExpression {
@@ -194,3 +197,67 @@ impl Expression for SomeAllExpression {
         }
     }
 }
+
+impl<'a> TryFrom<&'a ExprNode> for SomeAllExpression {
+    type Error = ExprError;
+
+    fn try_from(prost: &'a ExprNode) -> Result<Self> {
+        let outer_expr_type = prost.get_expr_type().unwrap();
+        let (outer_children, outer_return_type) = get_children_and_return_type(prost)?;
+        ensure!(matches!(outer_return_type, DataType::Boolean));
+
+        let mut inner_expr_type = outer_children[0].get_expr_type().unwrap();
+        let (mut inner_children, mut inner_return_type) =
+            get_children_and_return_type(&outer_children[0])?;
+        let mut stack = vec![];
+        while inner_children.len() != 2 {
+            stack.push((inner_expr_type, inner_return_type));
+            inner_expr_type = inner_children[0].get_expr_type().unwrap();
+            (inner_children, inner_return_type) = get_children_and_return_type(&inner_children[0])?;
+        }
+
+        let left_expr = build_from_prost(&inner_children[0])?;
+        let right_expr = build_from_prost(&inner_children[1])?;
+
+        let DataType::List { datatype: right_expr_return_type } = right_expr.return_type() else {
+        bail!("Expect Array Type");
+    };
+
+        let eval_func = {
+            let left_expr_input_ref = ExprNode {
+                expr_type: Type::InputRef as i32,
+                return_type: Some(left_expr.return_type().to_protobuf()),
+                rex_node: Some(RexNode::InputRef(0)),
+            };
+            let right_expr_input_ref = ExprNode {
+                expr_type: Type::InputRef as i32,
+                return_type: Some(right_expr_return_type.to_protobuf()),
+                rex_node: Some(RexNode::InputRef(1)),
+            };
+            let mut root_expr_node = ExprNode {
+                expr_type: inner_expr_type as i32,
+                return_type: Some(inner_return_type.to_protobuf()),
+                rex_node: Some(RexNode::FuncCall(FunctionCall {
+                    children: vec![left_expr_input_ref, right_expr_input_ref],
+                })),
+            };
+            while let Some((expr_type, return_type)) = stack.pop() {
+                root_expr_node = ExprNode {
+                    expr_type: expr_type as i32,
+                    return_type: Some(return_type.to_protobuf()),
+                    rex_node: Some(RexNode::FuncCall(FunctionCall {
+                        children: vec![root_expr_node],
+                    })),
+                }
+            }
+            build_from_prost(&root_expr_node)?
+        };
+
+        Ok(SomeAllExpression::new(
+            left_expr,
+            right_expr,
+            outer_expr_type,
+            eval_func,
+        ))
+    }
+}
diff --git a/src/expr/src/expr/expr_ternary.rs b/src/expr/src/expr/expr_ternary.rs
deleted file mode 100644
index e249a5ee73c1b..0000000000000
--- a/src/expr/src/expr/expr_ternary.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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 risingwave_common::array::{I64Array, IntervalArray, NaiveDateArray, NaiveDateTimeArray};
-use risingwave_common::types::DataType;
-
-use super::template::TernaryExpression;
-use super::BoxedExpression;
-use crate::vector_op::tumble::{
-    tumble_start_offset_date, tumble_start_offset_date_time, tumble_start_offset_timestamptz,
-};
-use crate::{ExprError, Result};
-
-pub(crate) fn new_tumble_start_offset(
-    time: BoxedExpression,
-    window_size: BoxedExpression,
-    offset: BoxedExpression,
-    return_type: DataType,
-) -> Result<BoxedExpression> {
-    let expr: BoxedExpression = match time.return_type() {
-        DataType::Date => Box::new(TernaryExpression::<
-            NaiveDateArray,
-            IntervalArray,
-            IntervalArray,
-            NaiveDateTimeArray,
-            _,
-        >::new(
-            time,
-            window_size,
-            offset,
-            return_type,
-            tumble_start_offset_date,
-        )),
-        DataType::Timestamp => Box::new(TernaryExpression::<
-            NaiveDateTimeArray,
-            IntervalArray,
-            IntervalArray,
-            NaiveDateTimeArray,
-            _,
-        >::new(
-            time,
-            window_size,
-            offset,
-            return_type,
-            tumble_start_offset_date_time,
-        )),
-        DataType::Timestamptz => Box::new(TernaryExpression::<
-            I64Array,
-            IntervalArray,
-            IntervalArray,
-            I64Array,
-            _,
-        >::new(
-            time,
-            window_size,
-            offset,
-            return_type,
-            tumble_start_offset_timestamptz,
-        )),
-        _ => {
-            return Err(ExprError::UnsupportedFunction(format!(
-                "tumble_start_offset is not supported for {:?}",
-                time.return_type()
-            )))
-        }
-    };
-
-    Ok(expr)
-}
diff --git a/src/expr/src/expr/expr_ternary_bytes.rs b/src/expr/src/expr/expr_ternary_bytes.rs
deleted file mode 100644
index 5e0a63cceef89..0000000000000
--- a/src/expr/src/expr/expr_ternary_bytes.rs
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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.
-
-//! For expression that accept 3 arguments + 1 bytes writer as input.
-
-use risingwave_common::array::{I32Array, Utf8Array};
-use risingwave_common::types::DataType;
-
-use crate::expr::template::TernaryBytesExpression;
-use crate::expr::BoxedExpression;
-use crate::vector_op::overlay::overlay;
-use crate::vector_op::replace::replace;
-use crate::vector_op::split_part::split_part;
-use crate::vector_op::substr::substr_start_for;
-use crate::vector_op::translate::translate;
-
-pub fn new_substr_start_end(
-    items: BoxedExpression,
-    off: BoxedExpression,
-    len: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    Box::new(
-        TernaryBytesExpression::<Utf8Array, I32Array, I32Array, _>::new(
-            items,
-            off,
-            len,
-            return_type,
-            substr_start_for,
-        ),
-    )
-}
-
-pub fn new_replace_expr(
-    s: BoxedExpression,
-    from_str: BoxedExpression,
-    to_str: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    Box::new(
-        TernaryBytesExpression::<Utf8Array, Utf8Array, Utf8Array, _>::new(
-            s,
-            from_str,
-            to_str,
-            return_type,
-            replace,
-        ),
-    )
-}
-
-pub fn new_translate_expr(
-    s: BoxedExpression,
-    match_str: BoxedExpression,
-    replace_str: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    Box::new(
-        TernaryBytesExpression::<Utf8Array, Utf8Array, Utf8Array, _>::new(
-            s,
-            match_str,
-            replace_str,
-            return_type,
-            translate,
-        ),
-    )
-}
-
-pub fn new_split_part_expr(
-    string_expr: BoxedExpression,
-    delimiter_expr: BoxedExpression,
-    nth_expr: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    Box::new(
-        TernaryBytesExpression::<Utf8Array, Utf8Array, I32Array, _>::new(
-            string_expr,
-            delimiter_expr,
-            nth_expr,
-            return_type,
-            split_part,
-        ),
-    )
-}
-
-pub fn new_overlay_exp(
-    s: BoxedExpression,
-    new_sub_str: BoxedExpression,
-    start: BoxedExpression,
-    return_type: DataType,
-) -> BoxedExpression {
-    Box::new(
-        TernaryBytesExpression::<Utf8Array, Utf8Array, I32Array, _>::new(
-            s,
-            new_sub_str,
-            start,
-            return_type,
-            overlay,
-        ),
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use risingwave_common::array::DataChunk;
-    use risingwave_common::row::OwnedRow;
-    use risingwave_common::types::{Datum, ScalarImpl};
-
-    use super::*;
-    use crate::expr::LiteralExpression;
-
-    async fn test_evals_dummy(expr: BoxedExpression, expected: Datum, is_negative_len: bool) {
-        let res = expr.eval(&DataChunk::new_dummy(1)).await;
-        if is_negative_len {
-            assert!(res.is_err());
-        } else {
-            assert_eq!(res.unwrap().to_datum(), expected);
-        }
-
-        let res = expr.eval_row(&OwnedRow::new(vec![])).await;
-        if is_negative_len {
-            assert!(res.is_err());
-        } else {
-            assert_eq!(res.unwrap(), expected);
-        }
-    }
-
-    #[tokio::test]
-    async fn test_substr_start_end() {
-        let text = "quick brown";
-        let cases = [
-            (
-                Some(ScalarImpl::Int32(4)),
-                Some(ScalarImpl::Int32(2)),
-                Some(ScalarImpl::from(String::from("ck"))),
-            ),
-            (
-                Some(ScalarImpl::Int32(-1)),
-                Some(ScalarImpl::Int32(5)),
-                Some(ScalarImpl::from(String::from("qui"))),
-            ),
-            (
-                Some(ScalarImpl::Int32(0)),
-                Some(ScalarImpl::Int32(20)),
-                Some(ScalarImpl::from(String::from("quick brown"))),
-            ),
-            (
-                Some(ScalarImpl::Int32(12)),
-                Some(ScalarImpl::Int32(20)),
-                Some(ScalarImpl::from(String::from(""))),
-            ),
-            (
-                Some(ScalarImpl::Int32(5)),
-                Some(ScalarImpl::Int32(0)),
-                Some(ScalarImpl::from(String::from(""))),
-            ),
-            (
-                Some(ScalarImpl::Int32(5)),
-                Some(ScalarImpl::Int32(-1)),
-                Some(ScalarImpl::from(String::from(""))),
-            ),
-            (Some(ScalarImpl::Int32(12)), None, None),
-            (None, Some(ScalarImpl::Int32(20)), None),
-            (None, None, None),
-        ];
-
-        for (start, len, expected) in cases {
-            let is_negative_len = matches!(len, Some(ScalarImpl::Int32(len_i32)) if len_i32 < 0);
-            let expr = new_substr_start_end(
-                Box::new(LiteralExpression::new(
-                    DataType::Varchar,
-                    Some(ScalarImpl::from(String::from(text))),
-                )),
-                Box::new(LiteralExpression::new(DataType::Int32, start)),
-                Box::new(LiteralExpression::new(DataType::Int32, len)),
-                DataType::Varchar,
-            );
-
-            test_evals_dummy(expr, expected, is_negative_len).await;
-        }
-    }
-
-    #[tokio::test]
-    async fn test_replace() {
-        let cases = [
-            ("hello, word", "我的", "world", "hello, word"),
-            ("hello, word", "", "world", "hello, word"),
-            ("hello, word", "word", "world", "hello, world"),
-            ("hello, world", "world", "", "hello, "),
-            ("你是❤️，是暖，是希望", "是", "非", "你非❤️，非暖，非希望"),
-            ("👴笑了", "👴", "爷爷", "爷爷笑了"),
-            (
-                "НОЧЬ НА ОЧКРАИНЕ МОСКВЫ",
-                "ОЧ",
-                "Ы",
-                "НЫЬ НА ЫКРАИНЕ МОСКВЫ",
-            ),
-        ];
-
-        for (text, pattern, replacement, expected) in cases {
-            let expr = new_replace_expr(
-                Box::new(LiteralExpression::new(
-                    DataType::Varchar,
-                    Some(ScalarImpl::from(String::from(text))),
-                )),
-                Box::new(LiteralExpression::new(
-                    DataType::Varchar,
-                    Some(ScalarImpl::from(String::from(pattern))),
-                )),
-                Box::new(LiteralExpression::new(
-                    DataType::Varchar,
-                    Some(ScalarImpl::from(String::from(replacement))),
-                )),
-                DataType::Varchar,
-            );
-
-            test_evals_dummy(expr, Some(ScalarImpl::from(String::from(expected))), false).await;
-        }
-    }
-
-    #[tokio::test]
-    async fn test_overlay() {
-        let cases = vec![
-            ("aaa__aaa", "XY", 4, "aaaXYaaa"),
-            ("aaa", "XY", 3, "aaXY"),
-            ("aaa", "XY", 4, "aaaXY"),
-            ("aaa", "XY", -123, "XYa"),
-            ("aaa", "XY", 123, "aaaXY"),
-        ];
-
-        for (s, new_sub_str, start, expected) in cases {
-            let expr = new_overlay_exp(
-                Box::new(LiteralExpression::new(
-                    DataType::Varchar,
-                    Some(ScalarImpl::from(String::from(s))),
-                )),
-                Box::new(LiteralExpression::new(
-                    DataType::Varchar,
-                    Some(ScalarImpl::from(String::from(new_sub_str))),
-                )),
-                Box::new(LiteralExpression::new(
-                    DataType::Int32,
-                    Some(ScalarImpl::from(start)),
-                )),
-                DataType::Varchar,
-            );
-
-            test_evals_dummy(expr, Some(ScalarImpl::from(String::from(expected))), false).await;
-        }
-    }
-}
diff --git a/src/expr/src/expr/expr_to_char_const_tmpl.rs b/src/expr/src/expr/expr_to_char_const_tmpl.rs
index 4544ee9947e00..5b4165ff84b6b 100644
--- a/src/expr/src/expr/expr_to_char_const_tmpl.rs
+++ b/src/expr/src/expr/expr_to_char_const_tmpl.rs
@@ -15,23 +15,25 @@
 use std::fmt::Write;
 use std::sync::Arc;
 
-use risingwave_common::array::{Array, ArrayBuilder, NaiveDateTimeArray, Utf8ArrayBuilder};
+use risingwave_common::array::{Array, ArrayBuilder, TimestampArray, Utf8ArrayBuilder};
 use risingwave_common::row::OwnedRow;
 use risingwave_common::types::{DataType, Datum, ScalarImpl};
 use risingwave_common::util::iter_util::ZipEqFast;
+use risingwave_expr_macro::build_function;
 
-use super::Expression;
-use crate::vector_op::to_char::ChronoPattern;
+use super::{BoxedExpression, Expression, Result};
+use crate::expr::template::BinaryBytesExpression;
+use crate::vector_op::to_char::{compile_pattern_to_chrono, to_char_timestamp, ChronoPattern};
 
 #[derive(Debug)]
-pub(crate) struct ExprToCharConstTmplContext {
-    pub(crate) chrono_pattern: ChronoPattern,
+struct ExprToCharConstTmplContext {
+    chrono_pattern: ChronoPattern,
 }
 
 #[derive(Debug)]
-pub(crate) struct ExprToCharConstTmpl {
-    pub(crate) child: Box<dyn Expression>,
-    pub(crate) ctx: ExprToCharConstTmplContext,
+struct ExprToCharConstTmpl {
+    child: Box<dyn Expression>,
+    ctx: ExprToCharConstTmplContext,
 }
 
 #[async_trait::async_trait]
@@ -45,7 +47,7 @@ impl Expression for ExprToCharConstTmpl {
         input: &risingwave_common::array::DataChunk,
     ) -> crate::Result<risingwave_common::array::ArrayRef> {
         let data_arr = self.child.eval_checked(input).await?;
-        let data_arr: &NaiveDateTimeArray = data_arr.as_ref().into();
+        let data_arr: &TimestampArray = data_arr.as_ref().into();
         let mut output = Utf8ArrayBuilder::new(input.capacity());
         for (data, vis) in data_arr.iter().zip_eq_fast(input.vis().iter()) {
             if !vis {
@@ -67,7 +69,7 @@ impl Expression for ExprToCharConstTmpl {
 
     async fn eval_row(&self, input: &OwnedRow) -> crate::Result<Datum> {
         let data = self.child.eval_row(input).await?;
-        Ok(if let Some(ScalarImpl::NaiveDateTime(data)) = data {
+        Ok(if let Some(ScalarImpl::Timestamp(data)) = data {
             Some(
                 data.0
                     .format_with_items(self.ctx.chrono_pattern.borrow_items().iter())
@@ -79,3 +81,34 @@ impl Expression for ExprToCharConstTmpl {
         })
     }
 }
+
+#[build_function("to_char(timestamp, varchar) -> varchar")]
+fn build_to_char_expr(
+    return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    use risingwave_common::array::*;
+
+    let mut iter = children.into_iter();
+    let data_expr = iter.next().unwrap();
+    let tmpl_expr = iter.next().unwrap();
+
+    Ok(if let Ok(Some(tmpl)) = tmpl_expr.eval_const() {
+        ExprToCharConstTmpl {
+            ctx: ExprToCharConstTmplContext {
+                chrono_pattern: compile_pattern_to_chrono(tmpl.as_utf8()),
+            },
+            child: data_expr,
+        }
+        .boxed()
+    } else {
+        BinaryBytesExpression::<TimestampArray, Utf8Array, _>::new(
+            data_expr,
+            tmpl_expr,
+            return_type,
+            #[allow(clippy::unit_arg)]
+            |a, b, w| Ok(to_char_timestamp(a, b, w)),
+        )
+        .boxed()
+    })
+}
diff --git a/src/expr/src/expr/expr_to_timestamp_const_tmpl.rs b/src/expr/src/expr/expr_to_timestamp_const_tmpl.rs
index c5223437904ad..f162bf84727eb 100644
--- a/src/expr/src/expr/expr_to_timestamp_const_tmpl.rs
+++ b/src/expr/src/expr/expr_to_timestamp_const_tmpl.rs
@@ -14,24 +14,26 @@
 
 use std::sync::Arc;
 
-use risingwave_common::array::{Array, ArrayBuilder, NaiveDateTimeArrayBuilder, Utf8Array};
+use risingwave_common::array::{Array, ArrayBuilder, TimestampArrayBuilder, Utf8Array};
 use risingwave_common::row::OwnedRow;
 use risingwave_common::types::{DataType, Datum, ScalarImpl};
 use risingwave_common::util::iter_util::ZipEqFast;
+use risingwave_expr_macro::build_function;
 
-use super::Expression;
-use crate::vector_op::to_char::ChronoPattern;
-use crate::vector_op::to_timestamp::to_timestamp_const_tmpl;
+use super::{BoxedExpression, Expression, Result};
+use crate::expr::template::BinaryExpression;
+use crate::vector_op::to_char::{compile_pattern_to_chrono, ChronoPattern};
+use crate::vector_op::to_timestamp::{to_timestamp, to_timestamp_const_tmpl};
 
 #[derive(Debug)]
-pub(crate) struct ExprToTimestampConstTmplContext {
-    pub(crate) chrono_pattern: ChronoPattern,
+struct ExprToTimestampConstTmplContext {
+    chrono_pattern: ChronoPattern,
 }
 
 #[derive(Debug)]
-pub(crate) struct ExprToTimestampConstTmpl {
-    pub(crate) child: Box<dyn Expression>,
-    pub(crate) ctx: ExprToTimestampConstTmplContext,
+struct ExprToTimestampConstTmpl {
+    child: Box<dyn Expression>,
+    ctx: ExprToTimestampConstTmplContext,
 }
 
 #[async_trait::async_trait]
@@ -46,7 +48,7 @@ impl Expression for ExprToTimestampConstTmpl {
     ) -> crate::Result<risingwave_common::array::ArrayRef> {
         let data_arr = self.child.eval_checked(input).await?;
         let data_arr: &Utf8Array = data_arr.as_ref().into();
-        let mut output = NaiveDateTimeArrayBuilder::new(input.capacity());
+        let mut output = TimestampArrayBuilder::new(input.capacity());
         for (data, vis) in data_arr.iter().zip_eq_fast(input.vis().iter()) {
             if !vis {
                 output.append_null();
@@ -71,3 +73,33 @@ impl Expression for ExprToTimestampConstTmpl {
         })
     }
 }
+
+#[build_function("to_timestamp1(varchar, varchar) -> timestamp")]
+fn build_to_timestamp_expr(
+    return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    use risingwave_common::array::*;
+
+    let mut iter = children.into_iter();
+    let data_expr = iter.next().unwrap();
+    let tmpl_expr = iter.next().unwrap();
+
+    Ok(if let Ok(Some(tmpl)) = tmpl_expr.eval_const() {
+        ExprToTimestampConstTmpl {
+            ctx: ExprToTimestampConstTmplContext {
+                chrono_pattern: compile_pattern_to_chrono(tmpl.as_utf8()),
+            },
+            child: data_expr,
+        }
+        .boxed()
+    } else {
+        BinaryExpression::<Utf8Array, Utf8Array, TimestampArray, _>::new(
+            data_expr,
+            tmpl_expr,
+            return_type,
+            to_timestamp,
+        )
+        .boxed()
+    })
+}
diff --git a/src/expr/src/expr/expr_unary.rs b/src/expr/src/expr/expr_unary.rs
index b8c3bea2bac2d..1d18deb217791 100644
--- a/src/expr/src/expr/expr_unary.rs
+++ b/src/expr/src/expr/expr_unary.rs
@@ -14,373 +14,20 @@
 
 //! For expression that only accept one value as input (e.g. CAST)
 
-use risingwave_common::array::*;
-use risingwave_common::buffer::Bitmap;
-use risingwave_common::types::*;
-use risingwave_pb::expr::expr_node::Type as ProstType;
-
-use super::expr_is_null::{IsNotNullExpression, IsNullExpression};
-use super::template::{UnaryBytesExpression, UnaryExpression};
-use super::template_fast::BooleanUnaryExpression;
-use super::{template_fast, BoxedExpression, Expression};
-use crate::vector_op::arithmetic_op::{decimal_abs, general_abs, general_neg};
-use crate::vector_op::ascii::ascii;
-use crate::vector_op::bitwise_op::general_bitnot;
-use crate::vector_op::cast::*;
-use crate::vector_op::cmp::{is_false, is_not_false, is_not_true, is_true};
-use crate::vector_op::conjunction;
-use crate::vector_op::exp::exp_f64;
-use crate::vector_op::jsonb_info::{jsonb_array_length, jsonb_typeof};
-use crate::vector_op::length::{bit_length, length_default, octet_length};
-use crate::vector_op::lower::lower;
-use crate::vector_op::ltrim::ltrim;
-use crate::vector_op::md5::md5;
-use crate::vector_op::round::*;
-use crate::vector_op::rtrim::rtrim;
-use crate::vector_op::timestamptz::f64_sec_to_timestamptz;
-use crate::vector_op::trim::trim;
-use crate::vector_op::upper::upper;
-use crate::{for_all_cast_variants, ExprError, Result};
-
-/// This macro helps to create unary expression.
-/// In [], the parameters are for constructing new expression
-/// * $`expr_name`: expression name, used for print error message
-/// * $child: child expression
-/// * $ret: return array type
-/// In ()*, the parameters are for generating match cases
-/// * $input: child array type
-/// * $rt: The return type in that the operation will calculate
-/// * $func: The scalar function for expression
-macro_rules! gen_unary_impl {
-    ([$expr_name: literal, $child:expr, $ret:expr], $( { $input:ident, $rt: ident, $func:ident },)*) => {
-        match ($child.return_type()) {
-            $(
-                $input! { type_match_pattern } => Box::new(
-                        UnaryExpression::<$input! { type_array}, $rt! {type_array}, _>::new(
-                            $child,
-                            $ret.clone(),
-                            $func,
-                        )
-                ),
-            )*
-            _ => {
-                return Err(ExprError::UnsupportedFunction(format!("{}({:?}) -> {:?}", $expr_name, $child.return_type(), $ret)));
-            }
-        }
-    };
-}
-
-macro_rules! gen_unary_impl_fast {
-    ([$expr_name: literal, $child:expr, $ret:expr], $( { $input:ident, $rt: ident, $func:expr },)*) => {
-        match ($child.return_type()) {
-            $(
-                $input! { type_match_pattern } => template_fast::UnaryExpression::new($child, $ret, $func).boxed(),
-            )*
-            _ => {
-                return Err(ExprError::UnsupportedFunction(format!("{}({:?}) -> {:?}", $expr_name, $child.return_type(), $ret)));
-            }
-        }
-    };
-}
-
-macro_rules! gen_unary_atm_expr  {
-    (
-        $expr_name: literal,
-        $child:expr,
-        $ret:expr,
-        $general_func:ident,
-        {
-            $( { $input:ident, $rt:ident, $func:ident }, )*
-        } $(,)?
-    ) => {
-        gen_unary_impl! {
-            [$expr_name, $child, $ret],
-            { int16, int16, $general_func },
-            { int32, int32, $general_func },
-            { int64, int64, $general_func },
-            { float32, float32, $general_func },
-            { float64, float64, $general_func },
-            $(
-                { $input, $rt, $func },
-            )*
-        }
-    };
-}
-
-macro_rules! gen_round_expr {
-    (
-        $expr_name:literal,
-        $child:expr,
-        $ret:expr,
-        $float64_round_func:ident,
-        $decimal_round_func:ident
-    ) => {
-        gen_unary_impl_fast! {
-            [$expr_name, $child, $ret],
-            { float64, float64, $float64_round_func },
-            { decimal, decimal, $decimal_round_func },
-        }
-    };
-}
-
-/// Create a new unary expression.
-pub fn new_unary_expr(
-    expr_type: ProstType,
-    return_type: DataType,
-    child_expr: BoxedExpression,
-) -> Result<BoxedExpression> {
-    use crate::expr::data_types::*;
-
-    let expr: BoxedExpression = match (expr_type, return_type.clone(), child_expr.return_type()) {
-        (
-            ProstType::Cast,
-            DataType::List {
-                datatype: target_elem_type,
-            },
-            DataType::Varchar,
-        ) => Box::new(UnaryExpression::<Utf8Array, ListArray, _>::new(
-            child_expr,
-            return_type,
-            move |input| str_to_list(input, &target_elem_type),
-        )),
-        (ProstType::Cast, DataType::Struct(rty), DataType::Struct(lty)) => {
-            Box::new(UnaryExpression::<StructArray, StructArray, _>::new(
-                child_expr,
-                return_type,
-                move |input| struct_cast(input, &lty, &rty),
-            ))
-        }
-        (
-            ProstType::Cast,
-            DataType::List {
-                datatype: target_elem_type,
-            },
-            DataType::List {
-                datatype: source_elem_type,
-            },
-        ) => Box::new(UnaryExpression::<ListArray, ListArray, _>::new(
-            child_expr,
-            return_type,
-            move |input| list_cast(input, &source_elem_type, &target_elem_type),
-        )),
-        (ProstType::Cast, _, _) => {
-            macro_rules! gen_cast_impl {
-                ($( { $input:ident, $cast:ident, $func:expr, $infallible:ident } ),*) => {
-                    match (child_expr.return_type(), return_type.clone()) {
-                        $(
-                            ($input! { type_match_pattern }, $cast! { type_match_pattern }) => gen_cast_impl!(arm: $input, $cast, $func, $infallible),
-                        )*
-                        _ => {
-                            return Err(ExprError::UnsupportedCast(child_expr.return_type(), return_type));
-                        }
-                    }
-                };
-                (arm: $input:ident, varchar, $func:expr, false) => {
-                    UnaryBytesExpression::< $input! { type_array }, _>::new(
-                        child_expr,
-                        return_type.clone(),
-                        $func
-                    ).boxed()
-                };
-                (arm: $input:ident, $cast:ident, $func:expr, false) => {
-                    UnaryExpression::< $input! { type_array }, $cast! { type_array }, _>::new(
-                        child_expr,
-                        return_type.clone(),
-                        $func
-                    ).boxed()
-                };
-                (arm: $input:ident, $cast:ident, $func:expr, true) => {
-                    template_fast::UnaryExpression::new(
-                        child_expr,
-                        return_type.clone(),
-                        $func
-                    ).boxed()
-                };
-            }
-
-            for_all_cast_variants! { gen_cast_impl }
-        }
-        (ProstType::BoolOut, _, DataType::Boolean) => Box::new(
-            UnaryBytesExpression::<BoolArray, _>::new(child_expr, return_type, bool_out),
-        ),
-        (ProstType::Not, _, _) => Box::new(BooleanUnaryExpression::new(
-            child_expr,
-            |a| BoolArray::new(!a.data() & a.null_bitmap(), a.null_bitmap().clone()),
-            conjunction::not,
-        )),
-        (ProstType::IsTrue, _, _) => Box::new(BooleanUnaryExpression::new(
-            child_expr,
-            |a| BoolArray::new(a.to_bitmap(), Bitmap::ones(a.len())),
-            is_true,
-        )),
-        (ProstType::IsNotTrue, _, _) => Box::new(BooleanUnaryExpression::new(
-            child_expr,
-            |a| BoolArray::new(!a.to_bitmap(), Bitmap::ones(a.len())),
-            is_not_true,
-        )),
-        (ProstType::IsFalse, _, _) => Box::new(BooleanUnaryExpression::new(
-            child_expr,
-            |a| BoolArray::new(!a.data() & a.null_bitmap(), Bitmap::ones(a.len())),
-            is_false,
-        )),
-        (ProstType::IsNotFalse, _, _) => Box::new(BooleanUnaryExpression::new(
-            child_expr,
-            |a| BoolArray::new(a.data() | !a.null_bitmap(), Bitmap::ones(a.len())),
-            is_not_false,
-        )),
-        (ProstType::IsNull, _, _) => Box::new(IsNullExpression::new(child_expr)),
-        (ProstType::IsNotNull, _, _) => Box::new(IsNotNullExpression::new(child_expr)),
-        (ProstType::Upper, _, _) => Box::new(UnaryBytesExpression::<Utf8Array, _>::new(
-            child_expr,
-            return_type,
-            upper,
-        )),
-        (ProstType::Lower, _, _) => Box::new(UnaryBytesExpression::<Utf8Array, _>::new(
-            child_expr,
-            return_type,
-            lower,
-        )),
-        (ProstType::Md5, _, _) => Box::new(UnaryBytesExpression::<Utf8Array, _>::new(
-            child_expr,
-            return_type,
-            md5,
-        )),
-        (ProstType::Ascii, _, _) => Box::new(UnaryExpression::<Utf8Array, I32Array, _>::new(
-            child_expr,
-            return_type,
-            ascii,
-        )),
-        (ProstType::CharLength, _, _) => Box::new(UnaryExpression::<Utf8Array, I32Array, _>::new(
-            child_expr,
-            return_type,
-            length_default,
-        )),
-        (ProstType::OctetLength, _, _) => Box::new(UnaryExpression::<Utf8Array, I32Array, _>::new(
-            child_expr,
-            return_type,
-            octet_length,
-        )),
-        (ProstType::BitLength, _, _) => Box::new(UnaryExpression::<Utf8Array, I32Array, _>::new(
-            child_expr,
-            return_type,
-            bit_length,
-        )),
-        (ProstType::Neg, _, _) => {
-            gen_unary_atm_expr! { "Neg", child_expr, return_type, general_neg,
-                {
-                    { decimal, decimal, general_neg },
-                }
-            }
-        }
-        (ProstType::Abs, _, _) => {
-            gen_unary_atm_expr! { "Abs", child_expr, return_type, general_abs,
-                {
-                    {decimal, decimal, decimal_abs},
-                }
-            }
-        }
-        (ProstType::BitwiseNot, _, _) => {
-            gen_unary_impl_fast! {
-                [ "BitwiseNot", child_expr, return_type],
-                { int16, int16, general_bitnot::<i16> },
-                { int32, int32, general_bitnot::<i32> },
-                { int64, int64, general_bitnot::<i64> },
-            }
-        }
-        (ProstType::Ceil, _, _) => {
-            gen_round_expr! {"Ceil", child_expr, return_type, ceil_f64, ceil_decimal}
-        }
-        (ProstType::Floor, DataType::Float64, DataType::Float64) => {
-            gen_round_expr! {"Floor", child_expr, return_type, floor_f64, floor_decimal}
-        }
-        (ProstType::Round, _, _) => {
-            gen_round_expr! {"Ceil", child_expr, return_type, round_f64, round_decimal}
-        }
-        (ProstType::Exp, _, _) => Box::new(UnaryExpression::<F64Array, F64Array, _>::new(
-            child_expr,
-            return_type,
-            exp_f64,
-        )),
-        (ProstType::ToTimestamp, DataType::Timestamptz, DataType::Float64) => {
-            Box::new(UnaryExpression::<F64Array, I64Array, _>::new(
-                child_expr,
-                return_type,
-                f64_sec_to_timestamptz,
-            ))
-        }
-        (ProstType::JsonbTypeof, DataType::Varchar, DataType::Jsonb) => {
-            UnaryBytesExpression::<JsonbArray, _>::new(child_expr, return_type, jsonb_typeof)
-                .boxed()
-        }
-        (ProstType::JsonbArrayLength, DataType::Int32, DataType::Jsonb) => {
-            UnaryExpression::<JsonbArray, I32Array, _>::new(
-                child_expr,
-                return_type,
-                jsonb_array_length,
-            )
-            .boxed()
-        }
-        (expr, ret, child) => {
-            return Err(ExprError::UnsupportedFunction(format!(
-                "{:?}({:?}) -> {:?}",
-                expr, child, ret
-            )));
-        }
-    };
-
-    Ok(expr)
-}
-
-pub fn new_length_default(expr_ia1: BoxedExpression, return_type: DataType) -> BoxedExpression {
-    Box::new(UnaryExpression::<Utf8Array, I32Array, _>::new(
-        expr_ia1,
-        return_type,
-        length_default,
-    ))
-}
-
-pub fn new_trim_expr(expr_ia1: BoxedExpression, return_type: DataType) -> BoxedExpression {
-    Box::new(UnaryBytesExpression::<Utf8Array, _>::new(
-        expr_ia1,
-        return_type,
-        trim,
-    ))
-}
-
-pub fn new_ltrim_expr(expr_ia1: BoxedExpression, return_type: DataType) -> BoxedExpression {
-    Box::new(UnaryBytesExpression::<Utf8Array, _>::new(
-        expr_ia1,
-        return_type,
-        ltrim,
-    ))
-}
-
-pub fn new_rtrim_expr(expr_ia1: BoxedExpression, return_type: DataType) -> BoxedExpression {
-    Box::new(UnaryBytesExpression::<Utf8Array, _>::new(
-        expr_ia1,
-        return_type,
-        rtrim,
-    ))
-}
-
 #[cfg(test)]
 mod tests {
     use itertools::Itertools;
     use risingwave_common::array::*;
-    use risingwave_common::types::{NaiveDateWrapper, Scalar};
-    use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::DataType;
-    use risingwave_pb::expr::expr_node::{RexNode, Type};
-    use risingwave_pb::expr::{ExprNode, FunctionCall};
+    use risingwave_common::types::{Date, Scalar};
+    use risingwave_pb::expr::expr_node::PbType;
 
     use super::super::*;
-    use crate::expr::test_utils::{make_expression, make_input_ref};
     use crate::vector_op::cast::{str_parse, try_cast};
 
     #[tokio::test]
     async fn test_unary() {
-        test_unary_bool::<BoolArray, _>(|x| !x, Type::Not).await;
-        test_unary_date::<NaiveDateTimeArray, _>(|x| try_cast(x).unwrap(), Type::Cast).await;
+        test_unary_bool::<BoolArray, _>(|x| !x, PbType::Not).await;
+        test_unary_date::<TimestampArray, _>(|x| try_cast(x).unwrap(), PbType::Cast).await;
         test_str_to_int16::<I16Array, _>(|x| str_parse(x).unwrap()).await;
     }
 
@@ -399,20 +46,8 @@ mod tests {
         }
         let col1 = I16Array::from_iter(&input).into();
         let data_chunk = DataChunk::new(vec![col1], 100);
-        let return_type = DataType {
-            type_name: TypeName::Int32 as i32,
-            is_nullable: false,
-            ..Default::default()
-        };
-        let expr = ExprNode {
-            expr_type: Type::Cast as i32,
-            return_type: Some(return_type),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![make_input_ref(0, TypeName::Int16)],
-            })),
-        };
-        let vec_executor = build_from_prost(&expr).unwrap();
-        let res = vec_executor.eval(&data_chunk).await.unwrap();
+        let expr = build_from_pretty("(cast:int4 $0:int2)");
+        let res = expr.eval(&data_chunk).await.unwrap();
         let arr: &I32Array = res.as_ref().into();
         for (idx, item) in arr.iter().enumerate() {
             let x = target[idx].as_ref().map(|x| x.as_scalar_ref());
@@ -421,7 +56,7 @@ mod tests {
 
         for i in 0..input.len() {
             let row = OwnedRow::new(vec![input[i].map(|int| int.to_scalar_value())]);
-            let result = vec_executor.eval_row(&row).await.unwrap();
+            let result = expr.eval_row(&row).await.unwrap();
             let expected = target[i].map(|int| int.to_scalar_value());
             assert_eq!(result, expected);
         }
@@ -442,20 +77,8 @@ mod tests {
 
         let col1 = I32Array::from_iter(&input).into();
         let data_chunk = DataChunk::new(vec![col1], 3);
-        let return_type = DataType {
-            type_name: TypeName::Int32 as i32,
-            is_nullable: false,
-            ..Default::default()
-        };
-        let expr = ExprNode {
-            expr_type: Type::Neg as i32,
-            return_type: Some(return_type),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![make_input_ref(0, TypeName::Int32)],
-            })),
-        };
-        let vec_executor = build_from_prost(&expr).unwrap();
-        let res = vec_executor.eval(&data_chunk).await.unwrap();
+        let expr = build_from_pretty("(neg:int4 $0:int4)");
+        let res = expr.eval(&data_chunk).await.unwrap();
         let arr: &I32Array = res.as_ref().into();
         for (idx, item) in arr.iter().enumerate() {
             let x = target[idx].as_ref().map(|x| x.as_scalar_ref());
@@ -464,7 +87,7 @@ mod tests {
 
         for i in 0..input.len() {
             let row = OwnedRow::new(vec![input[i].map(|int| int.to_scalar_value())]);
-            let result = vec_executor.eval_row(&row).await.unwrap();
+            let result = expr.eval_row(&row).await.unwrap();
             let expected = target[i].map(|int| int.to_scalar_value());
             assert_eq!(result, expected);
         }
@@ -492,20 +115,8 @@ mod tests {
         let col1_data = &input.iter().map(|x| x.as_ref().map(|x| &**x)).collect_vec();
         let col1 = Utf8Array::from_iter(col1_data).into();
         let data_chunk = DataChunk::new(vec![col1], 1);
-        let return_type = DataType {
-            type_name: TypeName::Int16 as i32,
-            is_nullable: false,
-            ..Default::default()
-        };
-        let expr = ExprNode {
-            expr_type: Type::Cast as i32,
-            return_type: Some(return_type),
-            rex_node: Some(RexNode::FuncCall(FunctionCall {
-                children: vec![make_input_ref(0, TypeName::Varchar)],
-            })),
-        };
-        let vec_executor = build_from_prost(&expr).unwrap();
-        let res = vec_executor.eval(&data_chunk).await.unwrap();
+        let expr = build_from_pretty("(cast:int2 $0:varchar)");
+        let res = expr.eval(&data_chunk).await.unwrap();
         let arr: &A = res.as_ref().into();
         for (idx, item) in arr.iter().enumerate() {
             let x = target[idx].as_ref().map(|x| x.as_scalar_ref());
@@ -517,13 +128,13 @@ mod tests {
                 .as_ref()
                 .cloned()
                 .map(|str| str.to_scalar_value())]);
-            let result = vec_executor.eval_row(&row).await.unwrap();
+            let result = expr.eval_row(&row).await.unwrap();
             let expected = target[i].as_ref().cloned().map(|x| x.to_scalar_value());
             assert_eq!(result, expected);
         }
     }
 
-    async fn test_unary_bool<A, F>(f: F, kind: Type)
+    async fn test_unary_bool<A, F>(f: F, kind: PbType)
     where
         A: Array,
         for<'a> &'a A: std::convert::From<&'a ArrayImpl>,
@@ -547,9 +158,8 @@ mod tests {
 
         let col1 = BoolArray::from_iter(&input).into();
         let data_chunk = DataChunk::new(vec![col1], 100);
-        let expr = make_expression(kind, &[TypeName::Boolean], &[0]);
-        let vec_executor = build_from_prost(&expr).unwrap();
-        let res = vec_executor.eval(&data_chunk).await.unwrap();
+        let expr = build_from_pretty(format!("({kind:?}:boolean $0:boolean)"));
+        let res = expr.eval(&data_chunk).await.unwrap();
         let arr: &A = res.as_ref().into();
         for (idx, item) in arr.iter().enumerate() {
             let x = target[idx].as_ref().map(|x| x.as_scalar_ref());
@@ -558,24 +168,24 @@ mod tests {
 
         for i in 0..input.len() {
             let row = OwnedRow::new(vec![input[i].map(|b| b.to_scalar_value())]);
-            let result = vec_executor.eval_row(&row).await.unwrap();
+            let result = expr.eval_row(&row).await.unwrap();
             let expected = target[i].as_ref().cloned().map(|x| x.to_scalar_value());
             assert_eq!(result, expected);
         }
     }
 
-    async fn test_unary_date<A, F>(f: F, kind: Type)
+    async fn test_unary_date<A, F>(f: F, kind: PbType)
     where
         A: Array,
         for<'a> &'a A: std::convert::From<&'a ArrayImpl>,
         for<'a> <A as Array>::RefItem<'a>: PartialEq,
-        F: Fn(NaiveDateWrapper) -> <A as Array>::OwnedItem,
+        F: Fn(Date) -> <A as Array>::OwnedItem,
     {
-        let mut input = Vec::<Option<NaiveDateWrapper>>::new();
+        let mut input = Vec::<Option<Date>>::new();
         let mut target = Vec::<Option<<A as Array>::OwnedItem>>::new();
         for i in 0..100 {
             if i % 2 == 0 {
-                let date = NaiveDateWrapper::from_num_days_from_ce_uncheck(i);
+                let date = Date::from_num_days_from_ce_uncheck(i);
                 input.push(Some(date));
                 target.push(Some(f(date)));
             } else {
@@ -584,11 +194,10 @@ mod tests {
             }
         }
 
-        let col1 = NaiveDateArray::from_iter(&input).into();
+        let col1 = DateArray::from_iter(&input).into();
         let data_chunk = DataChunk::new(vec![col1], 100);
-        let expr = make_expression(kind, &[TypeName::Date], &[0]);
-        let vec_executor = build_from_prost(&expr).unwrap();
-        let res = vec_executor.eval(&data_chunk).await.unwrap();
+        let expr = build_from_pretty(format!("({kind:?}:timestamp $0:date)"));
+        let res = expr.eval(&data_chunk).await.unwrap();
         let arr: &A = res.as_ref().into();
         for (idx, item) in arr.iter().enumerate() {
             let x = target[idx].as_ref().map(|x| x.as_scalar_ref());
@@ -597,7 +206,7 @@ mod tests {
 
         for i in 0..input.len() {
             let row = OwnedRow::new(vec![input[i].map(|d| d.to_scalar_value())]);
-            let result = vec_executor.eval_row(&row).await.unwrap();
+            let result = expr.eval_row(&row).await.unwrap();
             let expected = target[i].as_ref().cloned().map(|x| x.to_scalar_value());
             assert_eq!(result, expected);
         }
diff --git a/src/expr/src/expr/expr_vnode.rs b/src/expr/src/expr/expr_vnode.rs
index c31aee110077c..bc2acb36619af 100644
--- a/src/expr/src/expr/expr_vnode.rs
+++ b/src/expr/src/expr/expr_vnode.rs
@@ -15,9 +15,9 @@
 use std::sync::Arc;
 
 use risingwave_common::array::{ArrayBuilder, ArrayImpl, ArrayRef, DataChunk, I16ArrayBuilder};
-use risingwave_common::row::{OwnedRow, Row, RowExt};
+use risingwave_common::hash::VirtualNode;
+use risingwave_common::row::OwnedRow;
 use risingwave_common::types::{DataType, Datum};
-use risingwave_common::util::hash_util::Crc32FastBuilder;
 use risingwave_pb::expr::expr_node::{RexNode, Type};
 use risingwave_pb::expr::ExprNode;
 
@@ -69,21 +69,20 @@ impl Expression for VnodeExpression {
     }
 
     async fn eval(&self, input: &DataChunk) -> Result<ArrayRef> {
-        let hash_values = input.get_hash_values(&self.dist_key_indices, Crc32FastBuilder);
+        let vnodes = VirtualNode::compute_chunk(input, &self.dist_key_indices);
         let mut builder = I16ArrayBuilder::new(input.capacity());
-        hash_values
+        vnodes
             .into_iter()
-            .for_each(|h| builder.append(Some(h.to_vnode().to_scalar())));
+            .for_each(|vnode| builder.append(Some(vnode.to_scalar())));
         Ok(Arc::new(ArrayImpl::from(builder.finish())))
     }
 
     async fn eval_row(&self, input: &OwnedRow) -> Result<Datum> {
-        let vnode = input
-            .project(&self.dist_key_indices)
-            .hash(Crc32FastBuilder)
-            .to_vnode()
-            .to_scalar();
-        Ok(Some(vnode.into()))
+        Ok(Some(
+            VirtualNode::compute_row(input, &self.dist_key_indices)
+                .to_scalar()
+                .into(),
+        ))
     }
 }
 
@@ -93,7 +92,7 @@ mod tests {
     use risingwave_common::hash::VirtualNode;
     use risingwave_common::row::Row;
     use risingwave_pb::data::data_type::TypeName;
-    use risingwave_pb::data::DataType as ProstDataType;
+    use risingwave_pb::data::PbDataType;
     use risingwave_pb::expr::expr_node::RexNode;
     use risingwave_pb::expr::expr_node::Type::Vnode;
     use risingwave_pb::expr::{ExprNode, FunctionCall};
@@ -105,7 +104,7 @@ mod tests {
     pub fn make_vnode_function(children: Vec<ExprNode>) -> ExprNode {
         ExprNode {
             expr_type: Vnode as i32,
-            return_type: Some(ProstDataType {
+            return_type: Some(PbDataType {
                 type_name: TypeName::Int16 as i32,
                 ..Default::default()
             }),
diff --git a/src/expr/src/expr/mod.rs b/src/expr/src/expr/mod.rs
index f9f3b6ec7a535..81476921f3122 100644
--- a/src/expr/src/expr/mod.rs
+++ b/src/expr/src/expr/mod.rs
@@ -34,8 +34,8 @@
 // These modules define concrete expression structures.
 mod expr_array_concat;
 mod expr_array_distinct;
+mod expr_array_length;
 mod expr_array_to_string;
-mod expr_binary_bytes;
 mod expr_binary_nonnull;
 mod expr_binary_nullable;
 mod expr_case;
@@ -48,11 +48,9 @@ mod expr_is_null;
 mod expr_jsonb_access;
 mod expr_literal;
 mod expr_nested_construct;
-mod expr_quaternary_bytes;
+mod expr_now;
 pub mod expr_regexp;
 mod expr_some_all;
-mod expr_ternary;
-mod expr_ternary_bytes;
 mod expr_to_char_const_tmpl;
 mod expr_to_timestamp_const_tmpl;
 mod expr_udf;
@@ -60,10 +58,10 @@ mod expr_unary;
 mod expr_vnode;
 
 mod agg;
-mod build_expr_from_prost;
+mod build;
 pub(crate) mod data_types;
-mod template;
-mod template_fast;
+pub(crate) mod template;
+pub(crate) mod template_fast;
 pub mod test_utils;
 
 use std::sync::Arc;
@@ -74,11 +72,9 @@ use risingwave_common::types::{DataType, Datum};
 use static_assertions::const_assert;
 
 pub use self::agg::AggKind;
-pub use self::build_expr_from_prost::build_from_prost;
-pub use self::expr_binary_nonnull::new_binary_expr;
+pub use self::build::*;
 pub use self::expr_input_ref::InputRefExpression;
 pub use self::expr_literal::LiteralExpression;
-pub use self::expr_unary::new_unary_expr;
 use super::{ExprError, Result};
 
 /// Instance of an expression
@@ -107,6 +103,11 @@ pub trait Expression: std::fmt::Debug + Sync + Send {
     /// Evaluate the expression in row-based execution.
     async fn eval_row(&self, input: &OwnedRow) -> Result<Datum>;
 
+    /// Evaluate if the expression is constant.
+    fn eval_const(&self) -> Result<Datum> {
+        Err(ExprError::NotConstant)
+    }
+
     /// Wrap the expression in a Box.
     fn boxed(self) -> BoxedExpression
     where
diff --git a/src/expr/src/expr/template.rs b/src/expr/src/expr/template.rs
index c10ca3cf4aef3..3fe8c885f234c 100644
--- a/src/expr/src/expr/template.rs
+++ b/src/expr/src/expr/template.rs
@@ -319,6 +319,7 @@ macro_rules! gen_expr_nullable {
             > $ty_name<$($arg, )* OA, F> {
                 // Compile failed due to some GAT lifetime issues so make this field private.
                 // Check issues #742.
+                #[allow(dead_code)]
                 pub fn new(
                     $([<expr_ $arg:lower>]: BoxedExpression, )*
                     return_type: DataType,
@@ -345,60 +346,5 @@ gen_expr_bytes!(BinaryBytesExpression, { IA1, IA2 });
 gen_expr_bytes!(TernaryBytesExpression, { IA1, IA2, IA3 });
 gen_expr_bytes!(QuaternaryBytesExpression, { IA1, IA2, IA3, IA4 });
 
+gen_expr_nullable!(UnaryNullableExpression, { IA1 });
 gen_expr_nullable!(BinaryNullableExpression, { IA1, IA2 });
-
-/// `for_all_cmp_types` helps in matching and casting types when building comparison expressions
-///  such as <= or IS DISTINCT FROM.
-#[macro_export]
-macro_rules! for_all_cmp_variants {
-    ($macro:ident, $l:expr, $r:expr, $ret:expr, $general_f:ident) => {
-        $macro! {
-            [$l, $r, $ret],
-            { int16, int16, int16, $general_f },
-            { int16, int32, int32, $general_f },
-            { int16, int64, int64, $general_f },
-            { int16, float32, float64, $general_f },
-            { int16, float64, float64, $general_f },
-            { int32, int16, int32, $general_f },
-            { int32, int32, int32, $general_f },
-            { int32, int64, int64, $general_f },
-            { int32, float32, float64, $general_f },
-            { int32, float64, float64, $general_f },
-            { int64, int16,int64, $general_f },
-            { int64, int32,int64, $general_f },
-            { int64, int64, int64, $general_f },
-            { int64, float32, float64 , $general_f},
-            { int64, float64, float64, $general_f },
-            { float32, int16, float64, $general_f },
-            { float32, int32, float64, $general_f },
-            { float32, int64, float64 , $general_f},
-            { float32, float32, float32, $general_f },
-            { float32, float64, float64, $general_f },
-            { float64, int16, float64, $general_f },
-            { float64, int32, float64, $general_f },
-            { float64, int64, float64, $general_f },
-            { float64, float32, float64, $general_f },
-            { float64, float64, float64, $general_f },
-            { decimal, int16, decimal, $general_f },
-            { decimal, int32, decimal, $general_f },
-            { decimal, int64, decimal, $general_f },
-            { decimal, float32, float64, $general_f },
-            { decimal, float64, float64, $general_f },
-            { int16, decimal, decimal, $general_f },
-            { int32, decimal, decimal, $general_f },
-            { int64, decimal, decimal, $general_f },
-            { decimal, decimal, decimal, $general_f },
-            { float32, decimal, float64, $general_f },
-            { float64, decimal, float64, $general_f },
-            { timestamptz, timestamptz, timestamptz, $general_f },
-            { timestamp, timestamp, timestamp, $general_f },
-            { interval, interval, interval, $general_f },
-            { time, time, time, $general_f },
-            { date, date, date, $general_f },
-            { timestamp, date, timestamp, $general_f },
-            { date, timestamp, timestamp, $general_f },
-            { interval, time, interval, $general_f },
-            { time, interval, interval, $general_f },
-        }
-    };
-}
diff --git a/src/expr/src/expr/template_fast.rs b/src/expr/src/expr/template_fast.rs
index 9091f351c4d74..7601f21920ca3 100644
--- a/src/expr/src/expr/template_fast.rs
+++ b/src/expr/src/expr/template_fast.rs
@@ -340,11 +340,11 @@ impl<F, A, B> fmt::Debug for CompareExpression<F, A, B> {
 
 impl<F, A, B> CompareExpression<F, A, B>
 where
-    F: Fn(A, B) -> bool + Send + Sync,
-    A: PrimitiveArrayItemType,
-    B: PrimitiveArrayItemType,
-    for<'a> &'a PrimitiveArray<A>: From<&'a ArrayImpl>,
-    for<'a> &'a PrimitiveArray<B>: From<&'a ArrayImpl>,
+    F: Fn(A::RefItem<'_>, B::RefItem<'_>) -> bool + Send + Sync,
+    A: Array,
+    B: Array,
+    for<'a> &'a A: std::convert::From<&'a ArrayImpl>,
+    for<'a> &'a B: std::convert::From<&'a ArrayImpl>,
 {
     pub fn new(left: BoxedExpression, right: BoxedExpression, func: F) -> Self {
         CompareExpression {
@@ -359,11 +359,11 @@ where
 #[async_trait::async_trait]
 impl<F, A, B> Expression for CompareExpression<F, A, B>
 where
-    F: Fn(A, B) -> bool + Send + Sync,
-    A: PrimitiveArrayItemType,
-    B: PrimitiveArrayItemType,
-    for<'a> &'a PrimitiveArray<A>: From<&'a ArrayImpl>,
-    for<'a> &'a PrimitiveArray<B>: From<&'a ArrayImpl>,
+    F: Fn(A::RefItem<'_>, B::RefItem<'_>) -> bool + Send + Sync,
+    A: Array,
+    B: Array,
+    for<'a> &'a A: std::convert::From<&'a ArrayImpl>,
+    for<'a> &'a B: std::convert::From<&'a ArrayImpl>,
 {
     fn return_type(&self) -> DataType {
         DataType::Boolean
@@ -380,8 +380,8 @@ where
         };
         bitmap &= left.null_bitmap();
         bitmap &= right.null_bitmap();
-        let a: &PrimitiveArray<A> = (&*left).into();
-        let b: &PrimitiveArray<B> = (&*right).into();
+        let a: &A = (&*left).into();
+        let b: &B = (&*right).into();
         let c = BoolArray::new(
             a.raw_iter()
                 .zip(b.raw_iter())
@@ -430,12 +430,13 @@ impl<F, A, B> fmt::Debug for IsDistinctFromExpression<F, A, B> {
 
 impl<F, A, B> IsDistinctFromExpression<F, A, B>
 where
-    F: Fn(A, B) -> bool + Send + Sync,
-    A: PrimitiveArrayItemType,
-    B: PrimitiveArrayItemType,
-    for<'a> &'a PrimitiveArray<A>: From<&'a ArrayImpl>,
-    for<'a> &'a PrimitiveArray<B>: From<&'a ArrayImpl>,
+    F: Fn(A::RefItem<'_>, B::RefItem<'_>) -> bool + Send + Sync,
+    A: Array,
+    B: Array,
+    for<'a> &'a A: std::convert::From<&'a ArrayImpl>,
+    for<'a> &'a B: std::convert::From<&'a ArrayImpl>,
 {
+    #[allow(dead_code)]
     pub fn new(left: BoxedExpression, right: BoxedExpression, ne: F, not: bool) -> Self {
         IsDistinctFromExpression {
             left,
@@ -450,11 +451,11 @@ where
 #[async_trait::async_trait]
 impl<F, A, B> Expression for IsDistinctFromExpression<F, A, B>
 where
-    F: Fn(A, B) -> bool + Send + Sync,
-    A: PrimitiveArrayItemType,
-    B: PrimitiveArrayItemType,
-    for<'a> &'a PrimitiveArray<A>: From<&'a ArrayImpl>,
-    for<'a> &'a PrimitiveArray<B>: From<&'a ArrayImpl>,
+    F: Fn(A::RefItem<'_>, B::RefItem<'_>) -> bool + Send + Sync,
+    A: Array,
+    B: Array,
+    for<'a> &'a A: std::convert::From<&'a ArrayImpl>,
+    for<'a> &'a B: std::convert::From<&'a ArrayImpl>,
 {
     fn return_type(&self) -> DataType {
         DataType::Boolean
@@ -465,8 +466,8 @@ where
         let right = self.right.eval_checked(data_chunk).await?;
         assert_eq!(left.len(), right.len());
 
-        let a: &PrimitiveArray<A> = (&*left).into();
-        let b: &PrimitiveArray<B> = (&*right).into();
+        let a: &A = (&*left).into();
+        let b: &B = (&*right).into();
 
         let mut data: Bitmap = a
             .raw_iter()
diff --git a/src/expr/src/expr/test_utils.rs b/src/expr/src/expr/test_utils.rs
index d32cada054ac3..d87b4d45d2125 100644
--- a/src/expr/src/expr/test_utils.rs
+++ b/src/expr/src/expr/test_utils.rs
@@ -17,42 +17,32 @@
 use std::num::NonZeroUsize;
 
 use num_traits::CheckedSub;
-use risingwave_common::types::{DataType, IntervalUnit, ScalarImpl};
-use risingwave_common::util::iter_util::ZipEqFast;
+use risingwave_common::types::{DataType, Interval, ScalarImpl};
 use risingwave_common::util::value_encoding::serialize_datum;
 use risingwave_pb::data::data_type::TypeName;
-use risingwave_pb::data::{DataType as ProstDataType, Datum as ProstDatum};
+use risingwave_pb::data::{PbDataType, PbDatum};
 use risingwave_pb::expr::expr_node::Type::{Field, InputRef};
 use risingwave_pb::expr::expr_node::{self, RexNode, Type};
 use risingwave_pb::expr::{ExprNode, FunctionCall};
 
-use super::expr_ternary::new_tumble_start_offset;
-use super::{
-    new_binary_expr, BoxedExpression, Expression, InputRefExpression, LiteralExpression, Result,
-};
+use super::{build_from_prost, BoxedExpression, Result};
 use crate::ExprError;
 
-pub fn make_expression(kind: Type, rets: &[TypeName], indices: &[usize]) -> ExprNode {
-    let mut exprs = Vec::new();
-    for (idx, ret) in indices.iter().zip_eq_fast(rets.iter()) {
-        exprs.push(make_input_ref(*idx, *ret));
-    }
-    let function_call = FunctionCall { children: exprs };
-    let return_type = ProstDataType {
-        type_name: TypeName::Timestamp as i32,
-        ..Default::default()
-    };
+pub fn make_expression(kind: Type, ret: TypeName, children: Vec<ExprNode>) -> ExprNode {
     ExprNode {
         expr_type: kind as i32,
-        return_type: Some(return_type),
-        rex_node: Some(RexNode::FuncCall(function_call)),
+        return_type: Some(PbDataType {
+            type_name: ret as i32,
+            ..Default::default()
+        }),
+        rex_node: Some(RexNode::FuncCall(FunctionCall { children })),
     }
 }
 
 pub fn make_input_ref(idx: usize, ret: TypeName) -> ExprNode {
     ExprNode {
         expr_type: InputRef as i32,
-        return_type: Some(ProstDataType {
+        return_type: Some(PbDataType {
             type_name: ret as i32,
             ..Default::default()
         }),
@@ -63,25 +53,25 @@ pub fn make_input_ref(idx: usize, ret: TypeName) -> ExprNode {
 pub fn make_i32_literal(data: i32) -> ExprNode {
     ExprNode {
         expr_type: Type::ConstantValue as i32,
-        return_type: Some(ProstDataType {
+        return_type: Some(PbDataType {
             type_name: TypeName::Int32 as i32,
             ..Default::default()
         }),
-        rex_node: Some(RexNode::Constant(ProstDatum {
+        rex_node: Some(RexNode::Constant(PbDatum {
             body: serialize_datum(Some(ScalarImpl::Int32(data)).as_ref()),
         })),
     }
 }
 
-pub fn make_string_literal(data: &str) -> ExprNode {
+fn make_interval_literal(data: Interval) -> ExprNode {
     ExprNode {
         expr_type: Type::ConstantValue as i32,
-        return_type: Some(ProstDataType {
-            type_name: TypeName::Varchar as i32,
+        return_type: Some(PbDataType {
+            type_name: TypeName::Interval as i32,
             ..Default::default()
         }),
-        rex_node: Some(RexNode::Constant(ProstDatum {
-            body: serialize_datum(Some(ScalarImpl::Utf8(data.into())).as_ref()),
+        rex_node: Some(RexNode::Constant(PbDatum {
+            body: serialize_datum(Some(ScalarImpl::Interval(data)).as_ref()),
         })),
     }
 }
@@ -89,7 +79,7 @@ pub fn make_string_literal(data: &str) -> ExprNode {
 pub fn make_field_function(children: Vec<ExprNode>, ret: TypeName) -> ExprNode {
     ExprNode {
         expr_type: Field as i32,
-        return_type: Some(ProstDataType {
+        return_type: Some(PbDataType {
             type_name: ret as i32,
             ..Default::default()
         }),
@@ -100,9 +90,9 @@ pub fn make_field_function(children: Vec<ExprNode>, ret: TypeName) -> ExprNode {
 pub fn make_hop_window_expression(
     time_col_data_type: DataType,
     time_col_idx: usize,
-    window_size: IntervalUnit,
-    window_slide: IntervalUnit,
-    window_offset: IntervalUnit,
+    window_size: Interval,
+    window_slide: Interval,
+    window_offset: Interval,
 ) -> Result<(Vec<BoxedExpression>, Vec<BoxedExpression>)> {
     let units = window_size
         .exact_div(&window_slide)
@@ -116,52 +106,40 @@ pub fn make_hop_window_expression(
         })?
         .get();
 
-    let output_type = DataType::window_of(&time_col_data_type).unwrap();
-    let get_hop_window_start = || -> Result<BoxedExpression> {
-        let time_col_ref = InputRefExpression::new(time_col_data_type, time_col_idx).boxed();
+    let output_type = DataType::window_of(&time_col_data_type)
+        .unwrap()
+        .to_protobuf()
+        .type_name();
 
-        let window_slide_expr =
-            LiteralExpression::new(DataType::Interval, Some(ScalarImpl::Interval(window_slide)))
-                .boxed();
-        let window_offset_expr = LiteralExpression::new(
-            DataType::Interval,
-            Some(ScalarImpl::Interval(window_offset)),
-        )
-        .boxed();
-
-        // The first window_start of hop window should be:
-        // tumble_start(`time_col` - (`window_size` - `window_slide`), `window_slide`,
-        // `window_offset`). Let's pre calculate (`window_size` - `window_slide`).
-        let window_size_sub_slide =
-            window_size
-                .checked_sub(&window_slide)
-                .ok_or_else(|| ExprError::InvalidParam {
-                    name: "window",
-                    reason: format!(
-                        "window_size {} cannot be subtracted by window_slide {}",
-                        window_size, window_slide
-                    ),
-                })?;
-        let window_size_sub_slide_expr = LiteralExpression::new(
-            DataType::Interval,
-            Some(ScalarImpl::Interval(window_size_sub_slide)),
-        )
-        .boxed();
+    let time_col_ref = make_input_ref(time_col_idx, time_col_data_type.to_protobuf().type_name());
 
-        let hop_start = new_tumble_start_offset(
-            new_binary_expr(
+    // The first window_start of hop window should be:
+    // tumble_start(`time_col` - (`window_size` - `window_slide`), `window_slide`, `window_offset`).
+    // Let's pre calculate (`window_size` - `window_slide`).
+    let window_size_sub_slide = window_size
+        .checked_sub(&window_slide)
+        .ok_or_else(|| ExprError::InvalidParam {
+            name: "window",
+            reason: format!(
+                "window_size {} cannot be subtracted by window_slide {}",
+                window_size, window_slide
+            ),
+        })
+        .unwrap();
+
+    let hop_window_start = make_expression(
+        expr_node::Type::TumbleStart,
+        output_type,
+        vec![
+            make_expression(
                 expr_node::Type::Subtract,
-                output_type.clone(),
-                time_col_ref,
-                window_size_sub_slide_expr,
-            )?,
-            window_slide_expr,
-            window_offset_expr,
-            output_type.clone(),
-        )?;
-
-        Ok(hop_start)
-    };
+                output_type,
+                vec![time_col_ref, make_interval_literal(window_size_sub_slide)],
+            ),
+            make_interval_literal(window_slide),
+            make_interval_literal(window_offset),
+        ],
+    );
 
     let mut window_start_exprs = Vec::with_capacity(units);
     let mut window_end_exprs = Vec::with_capacity(units);
@@ -176,11 +154,6 @@ pub fn make_hop_window_expression(
                         window_slide, i
                     ),
                 })?;
-        let window_start_offset_expr = LiteralExpression::new(
-            DataType::Interval,
-            Some(ScalarImpl::Interval(window_start_offset)),
-        )
-        .boxed();
         let window_end_offset =
             window_slide
                 .checked_mul_int(i + units)
@@ -191,25 +164,24 @@ pub fn make_hop_window_expression(
                         window_slide, i
                     ),
                 })?;
-        let window_end_offset_expr = LiteralExpression::new(
-            DataType::Interval,
-            Some(ScalarImpl::Interval(window_end_offset)),
-        )
-        .boxed();
-        let window_start_expr = new_binary_expr(
+        let window_start_expr = make_expression(
             expr_node::Type::Add,
-            output_type.clone(),
-            get_hop_window_start.clone()()?,
-            window_start_offset_expr,
-        )?;
-        window_start_exprs.push(window_start_expr);
-        let window_end_expr = new_binary_expr(
+            output_type,
+            vec![
+                hop_window_start.clone(),
+                make_interval_literal(window_start_offset),
+            ],
+        );
+        window_start_exprs.push(build_from_prost(&window_start_expr).unwrap());
+        let window_end_expr = make_expression(
             expr_node::Type::Add,
-            output_type.clone(),
-            get_hop_window_start.clone()()?,
-            window_end_offset_expr,
-        )?;
-        window_end_exprs.push(window_end_expr);
+            output_type,
+            vec![
+                hop_window_start.clone(),
+                make_interval_literal(window_end_offset),
+            ],
+        );
+        window_end_exprs.push(build_from_prost(&window_end_expr).unwrap());
     }
     Ok((window_start_exprs, window_end_exprs))
 }
diff --git a/src/expr/src/sig/cast.rs b/src/expr/src/sig/cast.rs
index e5f85fd7d0fb4..705e27d58d8b2 100644
--- a/src/expr/src/sig/cast.rs
+++ b/src/expr/src/sig/cast.rs
@@ -36,13 +36,6 @@ pub enum CastContext {
     Explicit,
 }
 
-impl CastSig {
-    /// Returns a string describing the cast.
-    pub fn to_string_no_return(&self) -> String {
-        format!("cast({:?}->{:?})", self.from_type, self.to_type).to_lowercase()
-    }
-}
-
 pub type CastMap = BTreeMap<(DataTypeName, DataTypeName), CastContext>;
 
 pub fn cast_sigs() -> impl Iterator<Item = CastSig> {
diff --git a/src/expr/src/sig/func.rs b/src/expr/src/sig/func.rs
index 24dcbf383871c..498f97c5d42c4 100644
--- a/src/expr/src/sig/func.rs
+++ b/src/expr/src/sig/func.rs
@@ -15,356 +15,95 @@
 //! Function signatures.
 
 use std::collections::HashMap;
+use std::fmt;
 use std::ops::Deref;
 use std::sync::LazyLock;
 
-use itertools::iproduct;
-use risingwave_common::types::DataTypeName;
-use risingwave_pb::expr::expr_node::Type as ExprType;
+use itertools::Itertools;
+use risingwave_common::types::{DataType, DataTypeName};
+use risingwave_pb::expr::expr_node::PbType;
 
-pub static FUNC_SIG_MAP: LazyLock<FuncSigMap> = LazyLock::new(build_type_derive_map);
+use crate::error::Result;
+use crate::expr::BoxedExpression;
+
+pub static FUNC_SIG_MAP: LazyLock<FuncSigMap> = LazyLock::new(|| unsafe {
+    let mut map = FuncSigMap::default();
+    tracing::info!("{} function signatures loaded.", FUNC_SIG_MAP_INIT.len());
+    for desc in FUNC_SIG_MAP_INIT.drain(..) {
+        map.insert(desc);
+    }
+    map
+});
 
 /// The table of function signatures.
 pub fn func_sigs() -> impl Iterator<Item = &'static FuncSign> {
     FUNC_SIG_MAP.0.values().flatten()
 }
 
-/// A function signature.
-#[derive(PartialEq, Eq, Hash, Clone, Debug)]
-pub struct FuncSign {
-    pub func: ExprType,
-    pub inputs_type: Vec<DataTypeName>,
-    pub ret_type: DataTypeName,
-}
-
-impl FuncSign {
-    /// Returns a string describing the function without return type.
-    pub fn to_string_no_return(&self) -> String {
-        format!(
-            "{}({})",
-            self.func.as_str_name(),
-            self.inputs_type
-                .iter()
-                .map(|t| format!("{t:?}"))
-                .collect::<Vec<_>>()
-                .join(",")
-        )
-        .to_lowercase()
-    }
-}
-
-#[derive(Default)]
-pub struct FuncSigMap(HashMap<(ExprType, usize), Vec<FuncSign>>);
-
-impl Deref for FuncSigMap {
-    type Target = HashMap<(ExprType, usize), Vec<FuncSign>>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
+#[derive(Default, Clone, Debug)]
+pub struct FuncSigMap(HashMap<(PbType, usize), Vec<FuncSign>>);
 
 impl FuncSigMap {
-    pub fn insert(
-        &mut self,
-        func: ExprType,
-        param_types: Vec<DataTypeName>,
-        ret_type: DataTypeName,
-    ) {
-        let arity = param_types.len();
-        let inputs_type = param_types.into_iter().map(Into::into).collect();
-        let sig = FuncSign {
-            func,
-            inputs_type,
-            ret_type,
-        };
-        self.0.entry((func, arity)).or_default().push(sig)
-    }
-}
-
-/// This function builds type derived map for all built-in functions that take a fixed number
-/// of arguments.  They can be determined to have one or more type signatures since some are
-/// compatible with more than one type.
-/// Type signatures and arities of variadic functions are checked
-/// [elsewhere](crate::expr::FunctionCall::new).
-fn build_type_derive_map() -> FuncSigMap {
-    use {DataTypeName as T, ExprType as E};
-    let mut map = FuncSigMap::default();
-    let all_types = [
-        T::Boolean,
-        T::Int16,
-        T::Int32,
-        T::Int64,
-        T::Decimal,
-        T::Float32,
-        T::Float64,
-        T::Varchar,
-        T::Date,
-        T::Timestamp,
-        T::Timestamptz,
-        T::Time,
-        T::Interval,
-        T::Jsonb,
-    ];
-    let num_types = [
-        T::Int16,
-        T::Int32,
-        T::Int64,
-        T::Decimal,
-        T::Float32,
-        T::Float64,
-    ];
-
-    // logical expressions
-    for e in [E::Not, E::IsTrue, E::IsNotTrue, E::IsFalse, E::IsNotFalse] {
-        map.insert(e, vec![T::Boolean], T::Boolean);
-    }
-    for e in [E::And, E::Or] {
-        map.insert(e, vec![T::Boolean, T::Boolean], T::Boolean);
+    /// Inserts a function signature.
+    pub fn insert(&mut self, desc: FuncSign) {
+        self.0
+            .entry((desc.func, desc.inputs_type.len()))
+            .or_default()
+            .push(desc)
     }
-    map.insert(E::BoolOut, vec![T::Boolean], T::Varchar);
 
-    // comparison expressions
-    for e in [E::IsNull, E::IsNotNull] {
-        for t in all_types {
-            map.insert(e, vec![t], T::Boolean);
-        }
+    /// Returns a function signature with the same type, argument types and return type.
+    pub fn get(&self, ty: PbType, args: &[DataTypeName], ret: DataTypeName) -> Option<&FuncSign> {
+        let v = self.0.get(&(ty, args.len()))?;
+        v.iter()
+            .find(|d| d.inputs_type == args && d.ret_type == ret)
     }
-    let cmp_exprs = &[
-        E::Equal,
-        E::NotEqual,
-        E::LessThan,
-        E::LessThanOrEqual,
-        E::GreaterThan,
-        E::GreaterThanOrEqual,
-        E::IsDistinctFrom,
-        E::IsNotDistinctFrom,
-    ];
-    build_binary_cmp_funcs(&mut map, cmp_exprs, &num_types);
-    build_binary_cmp_funcs(&mut map, cmp_exprs, &[T::Struct]);
-    build_binary_cmp_funcs(
-        &mut map,
-        cmp_exprs,
-        &[T::Date, T::Timestamp, T::Timestamptz],
-    );
-    build_binary_cmp_funcs(&mut map, cmp_exprs, &[T::Time, T::Interval]);
-    for e in cmp_exprs {
-        for t in [T::Boolean, T::Varchar] {
-            map.insert(*e, vec![t, t], T::Boolean);
-        }
-    }
-
-    let unary_atm_exprs = &[E::Abs, E::Neg];
-
-    build_unary_atm_funcs(&mut map, unary_atm_exprs, &num_types);
-    build_binary_atm_funcs(
-        &mut map,
-        &[E::Add, E::Subtract, E::Multiply, E::Divide],
-        &[T::Int16, T::Int32, T::Int64, T::Decimal],
-    );
-    build_binary_atm_funcs(
-        &mut map,
-        &[E::Add, E::Subtract, E::Multiply, E::Divide],
-        &[T::Float32, T::Float64],
-    );
-    build_binary_atm_funcs(
-        &mut map,
-        &[E::Modulus],
-        &[T::Int16, T::Int32, T::Int64, T::Decimal],
-    );
-    map.insert(E::RoundDigit, vec![T::Decimal, T::Int32], T::Decimal);
-    map.insert(E::Pow, vec![T::Float64, T::Float64], T::Float64);
-    map.insert(E::Exp, vec![T::Float64], T::Float64);
-
-    // build bitwise operator
-    // bitwise operator
-    let integral_types = [T::Int16, T::Int32, T::Int64]; // reusable for and/or/xor/not
-
-    build_binary_atm_funcs(
-        &mut map,
-        &[E::BitwiseAnd, E::BitwiseOr, E::BitwiseXor],
-        &integral_types,
-    );
 
-    // Shift Operator is not using `build_binary_atm_funcs` because
-    // allowed rhs is different from allowed lhs
-    // return type is lhs rather than larger of the two
-    for (e, lt, rt) in iproduct!(
-        &[E::BitwiseShiftLeft, E::BitwiseShiftRight],
-        &integral_types,
-        &[T::Int16, T::Int32]
-    ) {
-        map.insert(*e, vec![*lt, *rt], *lt);
-    }
-
-    build_unary_atm_funcs(&mut map, &[E::BitwiseNot], &[T::Int16, T::Int32, T::Int64]);
-
-    build_round_funcs(&mut map, E::Round);
-    build_round_funcs(&mut map, E::Ceil);
-    build_round_funcs(&mut map, E::Floor);
-
-    // temporal expressions
-    for (base, delta) in [
-        (T::Date, T::Int32),
-        (T::Timestamp, T::Interval),
-        (T::Timestamptz, T::Interval),
-        (T::Time, T::Interval),
-    ] {
-        build_commutative_funcs(&mut map, E::Add, base, delta, base);
-        map.insert(E::Subtract, vec![base, delta], base);
-        map.insert(E::Subtract, vec![base, base], delta);
-    }
-    map.insert(E::Add, vec![T::Interval, T::Interval], T::Interval);
-    map.insert(E::Subtract, vec![T::Interval, T::Interval], T::Interval);
-
-    // date + interval = timestamp, date - interval = timestamp
-    build_commutative_funcs(&mut map, E::Add, T::Date, T::Interval, T::Timestamp);
-    map.insert(E::Subtract, vec![T::Date, T::Interval], T::Timestamp);
-    // date + time = timestamp
-    build_commutative_funcs(&mut map, E::Add, T::Date, T::Time, T::Timestamp);
-    // interval * float8 = interval, interval / float8 = interval
-    for t in num_types {
-        build_commutative_funcs(&mut map, E::Multiply, T::Interval, t, T::Interval);
-        map.insert(E::Divide, vec![T::Interval, t], T::Interval);
-    }
-
-    for t in [T::Timestamptz, T::Timestamp, T::Time, T::Date] {
-        map.insert(E::Extract, vec![T::Varchar, t], T::Decimal);
-    }
-    for t in [T::Timestamp, T::Date] {
-        map.insert(E::TumbleStart, vec![t, T::Interval], T::Timestamp);
-        map.insert(
-            E::TumbleStart,
-            vec![t, T::Interval, T::Interval],
-            T::Timestamp,
-        );
-    }
-    map.insert(
-        E::TumbleStart,
-        vec![T::Timestamptz, T::Interval],
-        T::Timestamptz,
-    );
-    map.insert(
-        E::TumbleStart,
-        vec![T::Timestamptz, T::Interval, T::Interval],
-        T::Timestamptz,
-    );
-    map.insert(E::ToTimestamp, vec![T::Float64], T::Timestamptz);
-    map.insert(E::ToTimestamp1, vec![T::Varchar, T::Varchar], T::Timestamp);
-    map.insert(
-        E::AtTimeZone,
-        vec![T::Timestamp, T::Varchar],
-        T::Timestamptz,
-    );
-    map.insert(
-        E::AtTimeZone,
-        vec![T::Timestamptz, T::Varchar],
-        T::Timestamp,
-    );
-    map.insert(E::DateTrunc, vec![T::Varchar, T::Timestamp], T::Timestamp);
-    map.insert(
-        E::DateTrunc,
-        vec![T::Varchar, T::Timestamptz, T::Varchar],
-        T::Timestamptz,
-    );
-    map.insert(E::DateTrunc, vec![T::Varchar, T::Interval], T::Interval);
-
-    // string expressions
-    for e in [E::Trim, E::Ltrim, E::Rtrim, E::Lower, E::Upper, E::Md5] {
-        map.insert(e, vec![T::Varchar], T::Varchar);
-    }
-    for e in [E::Trim, E::Ltrim, E::Rtrim] {
-        map.insert(e, vec![T::Varchar, T::Varchar], T::Varchar);
-    }
-    for e in [E::Repeat, E::Substr] {
-        map.insert(e, vec![T::Varchar, T::Int32], T::Varchar);
-    }
-    map.insert(E::Substr, vec![T::Varchar, T::Int32, T::Int32], T::Varchar);
-    for e in [E::Replace, E::Translate] {
-        map.insert(e, vec![T::Varchar, T::Varchar, T::Varchar], T::Varchar);
-    }
-    map.insert(E::FormatType, vec![T::Int32, T::Int32], T::Varchar);
-    map.insert(
-        E::Overlay,
-        vec![T::Varchar, T::Varchar, T::Int32],
-        T::Varchar,
-    );
-    map.insert(
-        E::Overlay,
-        vec![T::Varchar, T::Varchar, T::Int32, T::Int32],
-        T::Varchar,
-    );
-    for e in [
-        E::Length,
-        E::Ascii,
-        E::CharLength,
-        E::OctetLength,
-        E::BitLength,
-    ] {
-        map.insert(e, vec![T::Varchar], T::Int32);
-    }
-    map.insert(E::Position, vec![T::Varchar, T::Varchar], T::Int32);
-    map.insert(E::Like, vec![T::Varchar, T::Varchar], T::Boolean);
-    map.insert(
-        E::SplitPart,
-        vec![T::Varchar, T::Varchar, T::Int32],
-        T::Varchar,
-    );
-    // TODO: Support more `to_char` types.
-    map.insert(E::ToChar, vec![T::Timestamp, T::Varchar], T::Varchar);
-    // array_to_string
-    map.insert(E::ArrayToString, vec![T::List, T::Varchar], T::Varchar);
-    map.insert(
-        E::ArrayToString,
-        vec![T::List, T::Varchar, T::Varchar],
-        T::Varchar,
-    );
-
-    map.insert(E::JsonbAccessInner, vec![T::Jsonb, T::Int32], T::Jsonb);
-    map.insert(E::JsonbAccessInner, vec![T::Jsonb, T::Varchar], T::Jsonb);
-    map.insert(E::JsonbAccessStr, vec![T::Jsonb, T::Int32], T::Varchar);
-    map.insert(E::JsonbAccessStr, vec![T::Jsonb, T::Varchar], T::Varchar);
-    map.insert(E::JsonbTypeof, vec![T::Jsonb], T::Varchar);
-    map.insert(E::JsonbArrayLength, vec![T::Jsonb], T::Int32);
-
-    map
-}
-
-fn build_binary_cmp_funcs(map: &mut FuncSigMap, exprs: &[ExprType], args: &[DataTypeName]) {
-    for (e, lt, rt) in iproduct!(exprs, args, args) {
-        map.insert(*e, vec![*lt, *rt], DataTypeName::Boolean);
+    /// Returns all function signatures with the same type and number of arguments.
+    pub fn get_with_arg_nums(&self, ty: PbType, nargs: usize) -> &[FuncSign] {
+        self.0.get(&(ty, nargs)).map_or(&[], Deref::deref)
     }
 }
 
-fn build_binary_atm_funcs(map: &mut FuncSigMap, exprs: &[ExprType], args: &[DataTypeName]) {
-    for e in exprs {
-        for (li, lt) in args.iter().enumerate() {
-            for (ri, rt) in args.iter().enumerate() {
-                let ret = if li <= ri { rt } else { lt };
-                map.insert(*e, vec![*lt, *rt], *ret);
-            }
-        }
-    }
+/// A function signature.
+#[derive(Clone)]
+pub struct FuncSign {
+    pub name: &'static str,
+    pub func: PbType,
+    pub inputs_type: &'static [DataTypeName],
+    pub ret_type: DataTypeName,
+    pub build: fn(return_type: DataType, children: Vec<BoxedExpression>) -> Result<BoxedExpression>,
 }
 
-fn build_unary_atm_funcs(map: &mut FuncSigMap, exprs: &[ExprType], args: &[DataTypeName]) {
-    for (e, arg) in iproduct!(exprs, args) {
-        map.insert(*e, vec![*arg], *arg);
+impl fmt::Debug for FuncSign {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let s = format!(
+            "{}({})->{:?}",
+            self.func.as_str_name(),
+            self.inputs_type.iter().map(|t| format!("{t:?}")).join(","),
+            self.ret_type
+        )
+        .to_lowercase();
+        f.write_str(&s)
     }
 }
 
-fn build_commutative_funcs(
-    map: &mut FuncSigMap,
-    expr: ExprType,
-    arg0: DataTypeName,
-    arg1: DataTypeName,
-    ret: DataTypeName,
-) {
-    map.insert(expr, vec![arg0, arg1], ret);
-    map.insert(expr, vec![arg1, arg0], ret);
+/// Register a function into global registry.
+///
+/// # Safety
+///
+/// This function must be called sequentially.
+///
+/// It is designed to be used by `#[function]` macro.
+/// Users SHOULD NOT call this function.
+#[doc(hidden)]
+pub unsafe fn _register(desc: FuncSign) {
+    FUNC_SIG_MAP_INIT.push(desc)
 }
 
-fn build_round_funcs(map: &mut FuncSigMap, expr: ExprType) {
-    map.insert(expr, vec![DataTypeName::Float64], DataTypeName::Float64);
-    map.insert(expr, vec![DataTypeName::Decimal], DataTypeName::Decimal);
-}
+/// The global registry of function signatures on initialization.
+///
+/// `#[function]` macro will generate a `#[ctor]` function to register the signature into this
+/// vector. The calls are guaranteed to be sequential. The vector will be drained and moved into
+/// `FUNC_SIG_MAP` on the first access of `FUNC_SIG_MAP`.
+static mut FUNC_SIG_MAP_INIT: Vec<FuncSign> = Vec::new();
diff --git a/src/expr/src/table_function/generate_series.rs b/src/expr/src/table_function/generate_series.rs
index 96e67ffe7c57f..723bc18156f0f 100644
--- a/src/expr/src/table_function/generate_series.rs
+++ b/src/expr/src/table_function/generate_series.rs
@@ -18,8 +18,7 @@ use anyhow::anyhow;
 use itertools::multizip;
 use num_traits::Zero;
 use risingwave_common::array::{
-    Array, ArrayBuilder, ArrayImpl, ArrayRef, DataChunk, I32Array, IntervalArray,
-    NaiveDateTimeArray,
+    Array, ArrayBuilder, ArrayImpl, ArrayRef, DataChunk, I32Array, IntervalArray, TimestampArray,
 };
 use risingwave_common::types::{CheckedAdd, IsNegative, Scalar, ScalarRef};
 use risingwave_common::util::iter_util::ZipEqDebug;
@@ -154,7 +153,7 @@ where
 }
 
 pub fn new_generate_series<const STOP_INCLUSIVE: bool>(
-    prost: &TableFunctionProst,
+    prost: &TableFunctionPb,
     chunk_size: usize,
 ) -> Result<BoxedTableFunction> {
     let return_type = DataType::from(prost.get_return_type().unwrap());
@@ -162,12 +161,12 @@ pub fn new_generate_series<const STOP_INCLUSIVE: bool>(
     let [start, stop, step]: [_; 3] = args.try_into().unwrap();
 
     match return_type {
-        DataType::Timestamp => Ok(GenerateSeries::<
-            NaiveDateTimeArray,
-            IntervalArray,
-            STOP_INCLUSIVE,
-        >::new(start, stop, step, chunk_size)
-        .boxed()),
+        DataType::Timestamp => Ok(
+            GenerateSeries::<TimestampArray, IntervalArray, STOP_INCLUSIVE>::new(
+                start, stop, step, chunk_size,
+            )
+            .boxed(),
+        ),
         DataType::Int32 => Ok(GenerateSeries::<I32Array, I32Array, STOP_INCLUSIVE>::new(
             start, stop, step, chunk_size,
         )
@@ -180,8 +179,8 @@ pub fn new_generate_series<const STOP_INCLUSIVE: bool>(
 
 #[cfg(test)]
 mod tests {
-    use risingwave_common::types::test_utils::IntervalUnitTestExt;
-    use risingwave_common::types::{DataType, IntervalUnit, NaiveDateTimeWrapper, ScalarImpl};
+    use risingwave_common::types::test_utils::IntervalTestExt;
+    use risingwave_common::types::{DataType, Interval, ScalarImpl, Timestamp};
 
     use super::*;
     use crate::expr::{Expression, LiteralExpression};
@@ -222,9 +221,9 @@ mod tests {
     async fn test_generate_time_series() {
         let start_time = str_to_timestamp("2008-03-01 00:00:00").unwrap();
         let stop_time = str_to_timestamp("2008-03-09 00:00:00").unwrap();
-        let one_minute_step = IntervalUnit::from_minutes(1);
-        let one_hour_step = IntervalUnit::from_minutes(60);
-        let one_day_step = IntervalUnit::from_days(1);
+        let one_minute_step = Interval::from_minutes(1);
+        let one_hour_step = Interval::from_minutes(60);
+        let one_day_step = Interval::from_days(1);
         generate_time_series_test_case(start_time, stop_time, one_minute_step, 60 * 24 * 8 + 1)
             .await;
         generate_time_series_test_case(start_time, stop_time, one_hour_step, 24 * 8 + 1).await;
@@ -233,16 +232,16 @@ mod tests {
     }
 
     async fn generate_time_series_test_case(
-        start: NaiveDateTimeWrapper,
-        stop: NaiveDateTimeWrapper,
-        step: IntervalUnit,
+        start: Timestamp,
+        stop: Timestamp,
+        step: Interval,
         expect_cnt: usize,
     ) {
         fn to_lit_expr(ty: DataType, v: ScalarImpl) -> BoxedExpression {
             LiteralExpression::new(ty, Some(v)).boxed()
         }
 
-        let function = GenerateSeries::<NaiveDateTimeArray, IntervalArray, true>::new(
+        let function = GenerateSeries::<TimestampArray, IntervalArray, true>::new(
             to_lit_expr(DataType::Timestamp, start.into()),
             to_lit_expr(DataType::Timestamp, stop.into()),
             to_lit_expr(DataType::Interval, step.into()),
@@ -289,9 +288,9 @@ mod tests {
     async fn test_time_range() {
         let start_time = str_to_timestamp("2008-03-01 00:00:00").unwrap();
         let stop_time = str_to_timestamp("2008-03-09 00:00:00").unwrap();
-        let one_minute_step = IntervalUnit::from_minutes(1);
-        let one_hour_step = IntervalUnit::from_minutes(60);
-        let one_day_step = IntervalUnit::from_days(1);
+        let one_minute_step = Interval::from_minutes(1);
+        let one_hour_step = Interval::from_minutes(60);
+        let one_day_step = Interval::from_days(1);
         time_range_test_case(start_time, stop_time, one_minute_step, 60 * 24 * 8).await;
         time_range_test_case(start_time, stop_time, one_hour_step, 24 * 8).await;
         time_range_test_case(start_time, stop_time, one_day_step, 8).await;
@@ -299,16 +298,16 @@ mod tests {
     }
 
     async fn time_range_test_case(
-        start: NaiveDateTimeWrapper,
-        stop: NaiveDateTimeWrapper,
-        step: IntervalUnit,
+        start: Timestamp,
+        stop: Timestamp,
+        step: Interval,
         expect_cnt: usize,
     ) {
         fn to_lit_expr(ty: DataType, v: ScalarImpl) -> BoxedExpression {
             LiteralExpression::new(ty, Some(v)).boxed()
         }
 
-        let function = GenerateSeries::<NaiveDateTimeArray, IntervalArray, false>::new(
+        let function = GenerateSeries::<TimestampArray, IntervalArray, false>::new(
             to_lit_expr(DataType::Timestamp, start.into()),
             to_lit_expr(DataType::Timestamp, stop.into()),
             to_lit_expr(DataType::Interval, step.into()),
diff --git a/src/expr/src/table_function/mod.rs b/src/expr/src/table_function/mod.rs
index fa947f80dc2fc..14595a09a0e5b 100644
--- a/src/expr/src/table_function/mod.rs
+++ b/src/expr/src/table_function/mod.rs
@@ -19,9 +19,7 @@ use itertools::Itertools;
 use risingwave_common::array::{ArrayRef, DataChunk};
 use risingwave_common::types::DataType;
 use risingwave_pb::expr::project_set_select_item::SelectItem;
-use risingwave_pb::expr::{
-    ProjectSetSelectItem as SelectItemProst, TableFunction as TableFunctionProst,
-};
+use risingwave_pb::expr::{ProjectSetSelectItem as SelectItemPb, TableFunction as TableFunctionPb};
 
 use super::Result;
 use crate::expr::{build_from_prost as expr_build_from_prost, BoxedExpression};
@@ -56,10 +54,7 @@ pub trait TableFunction: std::fmt::Debug + Sync + Send {
 
 pub type BoxedTableFunction = Box<dyn TableFunction>;
 
-pub fn build_from_prost(
-    prost: &TableFunctionProst,
-    chunk_size: usize,
-) -> Result<BoxedTableFunction> {
+pub fn build_from_prost(prost: &TableFunctionPb, chunk_size: usize) -> Result<BoxedTableFunction> {
     use risingwave_pb::expr::table_function::Type::*;
 
     match prost.get_function_type().unwrap() {
@@ -110,7 +105,7 @@ pub fn repeat_tf(expr: BoxedExpression, n: usize) -> BoxedTableFunction {
     Mock { expr, n }.boxed()
 }
 
-/// See also [`SelectItemProst`]
+/// See also [`SelectItemPb`]
 #[derive(Debug)]
 pub enum ProjectSetSelectItem {
     TableFunction(BoxedTableFunction),
@@ -130,7 +125,7 @@ impl From<BoxedExpression> for ProjectSetSelectItem {
 }
 
 impl ProjectSetSelectItem {
-    pub fn from_prost(prost: &SelectItemProst, chunk_size: usize) -> Result<Self> {
+    pub fn from_prost(prost: &SelectItemPb, chunk_size: usize) -> Result<Self> {
         match prost.select_item.as_ref().unwrap() {
             SelectItem::Expr(expr) => expr_build_from_prost(expr).map(Into::into),
             SelectItem::TableFunction(tf) => build_from_prost(tf, chunk_size).map(Into::into),
diff --git a/src/expr/src/table_function/regexp_matches.rs b/src/expr/src/table_function/regexp_matches.rs
index 5347e2aa532d8..1f1c1744c8d82 100644
--- a/src/expr/src/table_function/regexp_matches.rs
+++ b/src/expr/src/table_function/regexp_matches.rs
@@ -103,7 +103,7 @@ impl TableFunction for RegexpMatches {
 }
 
 pub fn new_regexp_matches(
-    prost: &TableFunctionProst,
+    prost: &TableFunctionPb,
     chunk_size: usize,
 ) -> Result<BoxedTableFunction> {
     ensure!(
diff --git a/src/expr/src/table_function/unnest.rs b/src/expr/src/table_function/unnest.rs
index ef3fe02f168a6..80266675e2ab7 100644
--- a/src/expr/src/table_function/unnest.rs
+++ b/src/expr/src/table_function/unnest.rs
@@ -78,7 +78,7 @@ impl TableFunction for Unnest {
     }
 }
 
-pub fn new_unnest(prost: &TableFunctionProst, chunk_size: usize) -> Result<BoxedTableFunction> {
+pub fn new_unnest(prost: &TableFunctionPb, chunk_size: usize) -> Result<BoxedTableFunction> {
     let return_type = DataType::from(prost.get_return_type().unwrap());
     let args: Vec<_> = prost.args.iter().map(expr_build_from_prost).try_collect()?;
     let [list]: [_; 1] = args.try_into().unwrap();
diff --git a/src/expr/src/table_function/user_defined.rs b/src/expr/src/table_function/user_defined.rs
index 38a5f7be2d16b..364940a7430fb 100644
--- a/src/expr/src/table_function/user_defined.rs
+++ b/src/expr/src/table_function/user_defined.rs
@@ -51,23 +51,19 @@ impl TableFunction for UserDefinedTableFunction {
         let input =
             arrow_array::RecordBatch::try_new_with_options(self.arg_schema.clone(), columns, &opts)
                 .expect("failed to build record batch");
-        let output = tokio::task::block_in_place(|| {
-            tokio::runtime::Handle::current().block_on(self.client.call(&self.identifier, input))
-        })?;
+        let output = self.client.call(&self.identifier, input).await?;
+        let array: arrow_array::ArrayRef = if output.num_columns() == 1 {
+            output.column(0).clone()
+        } else {
+            Arc::new(arrow_array::StructArray::from(output))
+        };
         // TODO: split by chunk_size
-        Ok(output
-            .columns()
-            .iter()
-            .map(|a| Arc::new(ArrayImpl::from(a)))
-            .collect())
+        Ok(vec![Arc::new(ArrayImpl::from(&array))])
     }
 }
 
 #[cfg(not(madsim))]
-pub fn new_user_defined(
-    prost: &TableFunctionProst,
-    chunk_size: usize,
-) -> Result<BoxedTableFunction> {
+pub fn new_user_defined(prost: &TableFunctionPb, chunk_size: usize) -> Result<BoxedTableFunction> {
     let Some(udtf) = &prost.udtf else {
         bail!("expect UDTF");
     };
@@ -108,7 +104,7 @@ impl TableFunction for UserDefinedTableFunction {
 
 #[cfg(madsim)]
 pub fn new_user_defined(
-    _prost: &TableFunctionProst,
+    _prost: &TableFunctionPb,
     _chunk_size: usize,
 ) -> Result<BoxedTableFunction> {
     panic!("UDF is not supported in simulation yet");
diff --git a/src/expr/src/vector_op/agg/aggregator.rs b/src/expr/src/vector_op/agg/aggregator.rs
index aff68f1e930ce..75b5eee93e55b 100644
--- a/src/expr/src/vector_op/agg/aggregator.rs
+++ b/src/expr/src/vector_op/agg/aggregator.rs
@@ -77,8 +77,6 @@ impl AggStateFactory {
             .map(|col_order| {
                 let col_idx = col_order.get_column_index() as usize;
                 let order_type = OrderType::from_protobuf(col_order.get_order_type().unwrap());
-                // TODO(yuchao): `nulls first/last` is not supported yet, so it's ignore here,
-                // see also `risingwave_common::util::sort_util::compare_values`
                 ColumnOrder::new(col_idx, order_type)
             })
             .collect();
diff --git a/src/expr/src/vector_op/agg/array_agg.rs b/src/expr/src/vector_op/agg/array_agg.rs
index f810149b74ab9..b3d475b0602c5 100644
--- a/src/expr/src/vector_op/agg/array_agg.rs
+++ b/src/expr/src/vector_op/agg/array_agg.rs
@@ -14,10 +14,10 @@
 
 use risingwave_common::array::{ArrayBuilder, ArrayBuilderImpl, DataChunk, ListValue, RowRef};
 use risingwave_common::bail;
-use risingwave_common::row::{Row, RowExt};
+use risingwave_common::row::Row;
 use risingwave_common::types::{DataType, Datum, Scalar, ToOwnedDatum};
-use risingwave_common::util::ordered::OrderedRow;
-use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
+use risingwave_common::util::memcmp_encoding;
+use risingwave_common::util::sort_util::ColumnOrder;
 
 use crate::vector_op::agg::aggregator::Aggregator;
 use crate::Result;
@@ -91,43 +91,36 @@ impl Aggregator for ArrayAggUnordered {
     }
 }
 
+type OrderKey = Vec<u8>;
+
 #[derive(Clone)]
 struct ArrayAggOrdered {
     return_type: DataType,
     agg_col_idx: usize,
-    order_col_indices: Vec<usize>,
-    order_types: Vec<OrderType>,
-    unordered_values: Vec<(OrderedRow, Datum)>,
+    column_orders: Vec<ColumnOrder>,
+    unordered_values: Vec<(OrderKey, Datum)>,
 }
 
 impl ArrayAggOrdered {
     fn new(return_type: DataType, agg_col_idx: usize, column_orders: Vec<ColumnOrder>) -> Self {
-        debug_assert!(matches!(return_type, DataType::List { datatype: _ }));
-        let (order_col_indices, order_types) = column_orders
-            .into_iter()
-            .map(|p| (p.column_index, p.order_type))
-            .unzip();
+        assert!(matches!(return_type, DataType::List { datatype: _ }));
         ArrayAggOrdered {
             return_type,
             agg_col_idx,
-            order_col_indices,
-            order_types,
+            column_orders,
             unordered_values: vec![],
         }
     }
 
     fn push_row(&mut self, row: RowRef<'_>) {
-        let key = OrderedRow::new(
-            row.project(&self.order_col_indices).into_owned_row(),
-            &self.order_types,
-        );
+        let key = memcmp_encoding::encode_row(row, &self.column_orders);
         let datum = row.datum_at(self.agg_col_idx).to_owned_datum();
         self.unordered_values.push((key, datum));
     }
 
     fn get_result_and_reset(&mut self) -> ListValue {
         let mut rows = std::mem::take(&mut self.unordered_values);
-        rows.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+        rows.sort_unstable_by(|(key_a, _), (key_b, _)| key_a.cmp(key_b));
         ListValue::new(rows.into_iter().map(|(_, datum)| datum).collect())
     }
 }
@@ -190,6 +183,7 @@ mod tests {
     use risingwave_common::array::Array;
     use risingwave_common::test_prelude::DataChunkTestExt;
     use risingwave_common::types::ScalarRef;
+    use risingwave_common::util::sort_util::OrderType;
 
     use super::*;
 
diff --git a/src/expr/src/vector_op/agg/filter.rs b/src/expr/src/vector_op/agg/filter.rs
index 4295d9d3a6c73..d700713862858 100644
--- a/src/expr/src/vector_op/agg/filter.rs
+++ b/src/expr/src/vector_op/agg/filter.rs
@@ -114,10 +114,9 @@ mod tests {
     use std::sync::Arc;
 
     use risingwave_common::test_prelude::DataChunkTestExt;
-    use risingwave_pb::expr::expr_node::Type as ProstType;
 
     use super::*;
-    use crate::expr::{new_binary_expr, Expression, InputRefExpression, LiteralExpression};
+    use crate::expr::{build_from_pretty, Expression, LiteralExpression};
 
     #[derive(Clone)]
     struct MockAgg {
@@ -185,16 +184,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_selective_agg() -> Result<()> {
-        // filter (where $1 > 5)
-        let condition = Arc::from(
-            new_binary_expr(
-                ProstType::GreaterThan,
-                DataType::Boolean,
-                InputRefExpression::new(DataType::Int64, 0).boxed(),
-                LiteralExpression::new(DataType::Int64, Some((5_i64).into())).boxed(),
-            )
-            .unwrap(),
-        );
+        let expr = build_from_pretty("(greater_than:boolean $0:int8 5:int8)");
+        let condition = Arc::from(expr);
         let agg_count = Arc::new(AtomicUsize::new(0));
         let mut agg = Filter::new(
             condition,
@@ -228,18 +219,10 @@ mod tests {
 
     #[tokio::test]
     async fn test_selective_agg_null_condition() -> Result<()> {
-        let condition = Arc::from(
-            new_binary_expr(
-                ProstType::Equal,
-                DataType::Boolean,
-                InputRefExpression::new(DataType::Int64, 0).boxed(),
-                LiteralExpression::new(DataType::Int64, None).boxed(),
-            )
-            .unwrap(),
-        );
+        let expr = build_from_pretty("(equal:boolean $0:int8 null:int8)");
         let agg_count = Arc::new(AtomicUsize::new(0));
         let mut agg = Filter::new(
-            condition,
+            Arc::from(expr),
             Box::new(MockAgg {
                 count: agg_count.clone(),
             }),
diff --git a/src/expr/src/vector_op/agg/general_agg.rs b/src/expr/src/vector_op/agg/general_agg.rs
index d68f8f97ac9ff..757a383e64652 100644
--- a/src/expr/src/vector_op/agg/general_agg.rs
+++ b/src/expr/src/vector_op/agg/general_agg.rs
@@ -155,9 +155,9 @@ impl_aggregator! { BoolArray, Bool, BoolArray, Bool } // TODO(#359): remove once
 impl_aggregator! { StructArray, Struct, StructArray, Struct }
 impl_aggregator! { ListArray, List, ListArray, List }
 impl_aggregator! { IntervalArray, Interval, IntervalArray, Interval }
-impl_aggregator! { NaiveTimeArray, NaiveTime, NaiveTimeArray, NaiveTime }
-impl_aggregator! { NaiveDateArray, NaiveDate, NaiveDateArray, NaiveDate }
-impl_aggregator! { NaiveDateTimeArray, NaiveDateTime, NaiveDateTimeArray, NaiveDateTime }
+impl_aggregator! { TimeArray, Time, TimeArray, Time }
+impl_aggregator! { DateArray, Date, DateArray, Date }
+impl_aggregator! { TimestampArray, Timestamp, TimestampArray, Timestamp }
 
 // count
 impl_aggregator! { I16Array, Int16, I64Array, Int64 } // sum
@@ -170,9 +170,9 @@ impl_aggregator! { BoolArray, Bool, I64Array, Int64 }
 impl_aggregator! { StructArray, Struct, I64Array, Int64 }
 impl_aggregator! { ListArray, List, I64Array, Int64 }
 impl_aggregator! { IntervalArray, Interval, I64Array, Int64 }
-impl_aggregator! { NaiveTimeArray, NaiveTime, I64Array, Int64 }
-impl_aggregator! { NaiveDateArray, NaiveDate, I64Array, Int64 }
-impl_aggregator! { NaiveDateTimeArray, NaiveDateTime, I64Array, Int64 }
+impl_aggregator! { TimeArray, Time, I64Array, Int64 }
+impl_aggregator! { DateArray, Date, I64Array, Int64 }
+impl_aggregator! { TimestampArray, Timestamp, I64Array, Int64 }
 
 // sum
 impl_aggregator! { I64Array, Int64, DecimalArray, Decimal }
diff --git a/src/expr/src/vector_op/agg/general_distinct_agg.rs b/src/expr/src/vector_op/agg/general_distinct_agg.rs
index 298b5d9d06817..ba4e047ad1045 100644
--- a/src/expr/src/vector_op/agg/general_distinct_agg.rs
+++ b/src/expr/src/vector_op/agg/general_distinct_agg.rs
@@ -166,9 +166,9 @@ impl_aggregator! { BoolArray, Bool, BoolArray, Bool } // TODO(#359): remove once
 impl_aggregator! { StructArray, Struct, StructArray, Struct }
 impl_aggregator! { ListArray, List, ListArray, List }
 impl_aggregator! { IntervalArray, Interval, IntervalArray, Interval }
-impl_aggregator! { NaiveTimeArray, NaiveTime, NaiveTimeArray, NaiveTime }
-impl_aggregator! { NaiveDateArray, NaiveDate, NaiveDateArray, NaiveDate }
-impl_aggregator! { NaiveDateTimeArray, NaiveDateTime, NaiveDateTimeArray, NaiveDateTime }
+impl_aggregator! { TimeArray, Time, TimeArray, Time }
+impl_aggregator! { DateArray, Date, DateArray, Date }
+impl_aggregator! { TimestampArray, Timestamp, TimestampArray, Timestamp }
 
 // count
 impl_aggregator! { I16Array, Int16, I64Array, Int64 } // sum
@@ -181,9 +181,9 @@ impl_aggregator! { BoolArray, Bool, I64Array, Int64 }
 impl_aggregator! { StructArray, Struct, I64Array, Int64 }
 impl_aggregator! { ListArray, List, I64Array, Int64 }
 impl_aggregator! { IntervalArray, Interval, I64Array, Int64 }
-impl_aggregator! { NaiveTimeArray, NaiveTime, I64Array, Int64 }
-impl_aggregator! { NaiveDateArray, NaiveDate, I64Array, Int64 }
-impl_aggregator! { NaiveDateTimeArray, NaiveDateTime, I64Array, Int64 }
+impl_aggregator! { TimeArray, Time, I64Array, Int64 }
+impl_aggregator! { DateArray, Date, I64Array, Int64 }
+impl_aggregator! { TimestampArray, Timestamp, I64Array, Int64 }
 
 // sum
 impl_aggregator! { I64Array, Int64, DecimalArray, Decimal }
diff --git a/src/expr/src/vector_op/agg/string_agg.rs b/src/expr/src/vector_op/agg/string_agg.rs
index bf829f34dfeab..32ef9330d1d70 100644
--- a/src/expr/src/vector_op/agg/string_agg.rs
+++ b/src/expr/src/vector_op/agg/string_agg.rs
@@ -16,11 +16,10 @@ use risingwave_common::array::{
     Array, ArrayBuilder, ArrayBuilderImpl, ArrayImpl, DataChunk, RowRef,
 };
 use risingwave_common::bail;
-use risingwave_common::row::{Row, RowExt};
 use risingwave_common::types::DataType;
 use risingwave_common::util::iter_util::ZipEqFast;
-use risingwave_common::util::ordered::OrderedRow;
-use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
+use risingwave_common::util::memcmp_encoding;
+use risingwave_common::util::sort_util::ColumnOrder;
 
 use crate::vector_op::agg::aggregator::Aggregator;
 use crate::Result;
@@ -113,6 +112,8 @@ impl Aggregator for StringAggUnordered {
     }
 }
 
+type OrderKey = Vec<u8>;
+
 #[derive(Clone)]
 struct StringAggData {
     value: String,
@@ -123,31 +124,22 @@ struct StringAggData {
 struct StringAggOrdered {
     agg_col_idx: usize,
     delim_col_idx: usize,
-    order_col_indices: Vec<usize>,
-    order_types: Vec<OrderType>,
-    unordered_values: Vec<(OrderedRow, StringAggData)>,
+    column_orders: Vec<ColumnOrder>,
+    unordered_values: Vec<(OrderKey, StringAggData)>,
 }
 
 impl StringAggOrdered {
     fn new(agg_col_idx: usize, delim_col_idx: usize, column_orders: Vec<ColumnOrder>) -> Self {
-        let (order_col_indices, order_types) = column_orders
-            .into_iter()
-            .map(|p| (p.column_index, p.order_type))
-            .unzip();
         Self {
             agg_col_idx,
             delim_col_idx,
-            order_col_indices,
-            order_types,
+            column_orders,
             unordered_values: vec![],
         }
     }
 
     fn push_row(&mut self, value: &str, delim: &str, row: RowRef<'_>) {
-        let key = OrderedRow::new(
-            row.project(&self.order_col_indices).into_owned_row(),
-            &self.order_types,
-        );
+        let key = memcmp_encoding::encode_row(row, &self.column_orders);
         self.unordered_values.push((
             key,
             StringAggData {
@@ -162,7 +154,7 @@ impl StringAggOrdered {
         if rows.is_empty() {
             return None;
         }
-        rows.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+        rows.sort_unstable_by(|(key_a, _), (key_b, _)| key_a.cmp(key_b));
         let mut rows_iter = rows.into_iter();
         let mut result = rows_iter.next().unwrap().1.value;
         for (_, data) in rows_iter {
diff --git a/src/expr/src/vector_op/arithmetic_op.rs b/src/expr/src/vector_op/arithmetic_op.rs
index 13be501bbea5d..fe89cab3a043b 100644
--- a/src/expr/src/vector_op/arithmetic_op.rs
+++ b/src/expr/src/vector_op/arithmetic_op.rs
@@ -12,22 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![expect(clippy::extra_unused_type_parameters, reason = "used by macro")]
-
 use std::convert::TryInto;
 use std::fmt::Debug;
 
 use chrono::{Duration, NaiveDateTime};
 use num_traits::real::Real;
 use num_traits::{CheckedDiv, CheckedMul, CheckedNeg, CheckedRem, CheckedSub, Signed, Zero};
-use risingwave_common::types::{
-    CheckedAdd, Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper,
-    OrderedF64,
-};
+use risingwave_common::types::{CheckedAdd, Date, Decimal, Interval, Time, Timestamp, F64};
+use risingwave_expr_macro::function;
 
 use crate::{ExprError, Result};
 
-#[inline(always)]
+#[function("add(*number, *number) -> auto")]
+#[function("add(interval, interval) -> interval")]
 pub fn general_add<T1, T2, T3>(l: T1, r: T2) -> Result<T3>
 where
     T1: Into<T3> + Debug,
@@ -39,7 +36,8 @@ where
     })
 }
 
-#[inline(always)]
+#[function("subtract(*number, *number) -> auto")]
+#[function("subtract(interval, interval) -> interval")]
 pub fn general_sub<T1, T2, T3>(l: T1, r: T2) -> Result<T3>
 where
     T1: Into<T3> + Debug,
@@ -51,7 +49,7 @@ where
     })
 }
 
-#[inline(always)]
+#[function("multiply(*number, *number) -> auto")]
 pub fn general_mul<T1, T2, T3>(l: T1, r: T2) -> Result<T3>
 where
     T1: Into<T3> + Debug,
@@ -63,7 +61,7 @@ where
     })
 }
 
-#[inline(always)]
+#[function("divide(*number, *number) -> auto")]
 pub fn general_div<T1, T2, T3>(l: T1, r: T2) -> Result<T3>
 where
     T1: Into<T3> + Debug,
@@ -81,7 +79,7 @@ where
     })
 }
 
-#[inline(always)]
+#[function("modulus(*number, *number) -> auto")]
 pub fn general_mod<T1, T2, T3>(l: T1, r: T2) -> Result<T3>
 where
     T1: Into<T3> + Debug,
@@ -93,12 +91,21 @@ where
     })
 }
 
-#[inline(always)]
+#[function("neg(int16) -> int16")]
+#[function("neg(int32) -> int32")]
+#[function("neg(int64) -> int64")]
+#[function("neg(float32) -> float32")]
+#[function("neg(float64) -> float64")]
+#[function("neg(decimal) -> decimal")]
 pub fn general_neg<T1: CheckedNeg>(expr: T1) -> Result<T1> {
     expr.checked_neg().ok_or(ExprError::NumericOutOfRange)
 }
 
-#[inline(always)]
+#[function("abs(int16) -> int16")]
+#[function("abs(int32) -> int32")]
+#[function("abs(int64) -> int64")]
+#[function("abs(float32) -> float32")]
+#[function("abs(float64) -> float64")]
 pub fn general_abs<T1: Signed + CheckedNeg>(expr: T1) -> Result<T1> {
     if expr.is_negative() {
         general_neg(expr)
@@ -107,11 +114,13 @@ pub fn general_abs<T1: Signed + CheckedNeg>(expr: T1) -> Result<T1> {
     }
 }
 
+#[function("abs(decimal) -> decimal")]
 pub fn decimal_abs(decimal: Decimal) -> Result<Decimal> {
     Ok(Decimal::abs(&decimal))
 }
 
-pub fn pow_f64(l: OrderedF64, r: OrderedF64) -> Result<OrderedF64> {
+#[function("pow(float64, float64) -> float64")]
+pub fn pow_f64(l: F64, r: F64) -> Result<F64> {
     let res = l.powf(r);
     if res.is_infinite() {
         Err(ExprError::NumericOutOfRange)
@@ -121,7 +130,7 @@ pub fn pow_f64(l: OrderedF64, r: OrderedF64) -> Result<OrderedF64> {
 }
 
 #[inline(always)]
-pub fn general_atm<T1, T2, T3, F>(l: T1, r: T2, atm: F) -> Result<T3>
+fn general_atm<T1, T2, T3, F>(l: T1, r: T2, atm: F) -> Result<T3>
 where
     T1: Into<T3> + Debug,
     T2: Into<T3> + Debug,
@@ -130,128 +139,100 @@ where
     atm(l.into(), r.into())
 }
 
-#[inline(always)]
-pub fn timestamp_timestamp_sub<T1, T2, T3>(
-    l: NaiveDateTimeWrapper,
-    r: NaiveDateTimeWrapper,
-) -> Result<IntervalUnit> {
+#[function("subtract(timestamp, timestamp) -> interval")]
+pub fn timestamp_timestamp_sub(l: Timestamp, r: Timestamp) -> Result<Interval> {
     let tmp = l.0 - r.0; // this does not overflow or underflow
     let days = tmp.num_days();
     let usecs = (tmp - Duration::days(tmp.num_days()))
         .num_microseconds()
         .ok_or_else(|| ExprError::NumericOutOfRange)?;
-    Ok(IntervalUnit::from_month_day_usec(0, days as i32, usecs))
+    Ok(Interval::from_month_day_usec(0, days as i32, usecs))
 }
 
-#[inline(always)]
-pub fn date_date_sub<T1, T2, T3>(l: NaiveDateWrapper, r: NaiveDateWrapper) -> Result<i32> {
+#[function("subtract(date, date) -> int32")]
+pub fn date_date_sub(l: Date, r: Date) -> Result<i32> {
     Ok((l.0 - r.0).num_days() as i32) // this does not overflow or underflow
 }
 
-#[inline(always)]
-pub fn interval_timestamp_add<T1, T2, T3>(
-    l: IntervalUnit,
-    r: NaiveDateTimeWrapper,
-) -> Result<NaiveDateTimeWrapper> {
+#[function("add(interval, timestamp) -> timestamp")]
+pub fn interval_timestamp_add(l: Interval, r: Timestamp) -> Result<Timestamp> {
     r.checked_add(l).ok_or(ExprError::NumericOutOfRange)
 }
 
-#[inline(always)]
-pub fn interval_date_add<T1, T2, T3>(
-    l: IntervalUnit,
-    r: NaiveDateWrapper,
-) -> Result<NaiveDateTimeWrapper> {
-    interval_timestamp_add::<T1, T2, T3>(l, r.into())
+#[function("add(interval, date) -> timestamp")]
+pub fn interval_date_add(l: Interval, r: Date) -> Result<Timestamp> {
+    interval_timestamp_add(l, r.into())
 }
 
-#[inline(always)]
-pub fn interval_time_add<T1, T2, T3>(
-    l: IntervalUnit,
-    r: NaiveTimeWrapper,
-) -> Result<NaiveTimeWrapper> {
-    time_interval_add::<T2, T1, T3>(r, l)
+#[function("add(interval, time) -> time")]
+pub fn interval_time_add(l: Interval, r: Time) -> Result<Time> {
+    time_interval_add(r, l)
 }
 
-#[inline(always)]
-pub fn date_interval_add<T2, T1, T3>(
-    l: NaiveDateWrapper,
-    r: IntervalUnit,
-) -> Result<NaiveDateTimeWrapper> {
-    interval_date_add::<T1, T2, T3>(r, l)
+#[function("add(date, interval) -> timestamp")]
+pub fn date_interval_add(l: Date, r: Interval) -> Result<Timestamp> {
+    interval_date_add(r, l)
 }
 
-#[inline(always)]
-pub fn date_interval_sub<T2, T1, T3>(
-    l: NaiveDateWrapper,
-    r: IntervalUnit,
-) -> Result<NaiveDateTimeWrapper> {
-    // TODO: implement `checked_sub` for `NaiveDateTimeWrapper` to handle the edge case of negation
+#[function("subtract(date, interval) -> timestamp")]
+pub fn date_interval_sub(l: Date, r: Interval) -> Result<Timestamp> {
+    // TODO: implement `checked_sub` for `Timestamp` to handle the edge case of negation
     // overflowing.
-    interval_date_add::<T1, T2, T3>(r.checked_neg().ok_or(ExprError::NumericOutOfRange)?, l)
+    interval_date_add(r.checked_neg().ok_or(ExprError::NumericOutOfRange)?, l)
 }
 
-#[inline(always)]
-pub fn date_int_add<T1, T2, T3>(l: NaiveDateWrapper, r: i32) -> Result<NaiveDateWrapper> {
+#[function("add(date, int32) -> date")]
+pub fn date_int_add(l: Date, r: i32) -> Result<Date> {
     let date = l.0;
     let date_wrapper = date
         .checked_add_signed(chrono::Duration::days(r as i64))
-        .map(NaiveDateWrapper::new);
+        .map(Date::new);
 
     date_wrapper.ok_or(ExprError::NumericOutOfRange)
 }
 
-#[inline(always)]
-pub fn int_date_add<T1, T2, T3>(l: i32, r: NaiveDateWrapper) -> Result<NaiveDateWrapper> {
-    date_int_add::<T2, T1, T3>(r, l)
+#[function("add(int32, date) -> date")]
+pub fn int_date_add(l: i32, r: Date) -> Result<Date> {
+    date_int_add(r, l)
 }
 
-#[inline(always)]
-pub fn date_int_sub<T1, T2, T3>(l: NaiveDateWrapper, r: i32) -> Result<NaiveDateWrapper> {
+#[function("subtract(date, int32) -> date")]
+pub fn date_int_sub(l: Date, r: i32) -> Result<Date> {
     let date = l.0;
     let date_wrapper = date
         .checked_sub_signed(chrono::Duration::days(r as i64))
-        .map(NaiveDateWrapper::new);
+        .map(Date::new);
 
     date_wrapper.ok_or(ExprError::NumericOutOfRange)
 }
 
-#[inline(always)]
-pub fn timestamp_interval_add<T1, T2, T3>(
-    l: NaiveDateTimeWrapper,
-    r: IntervalUnit,
-) -> Result<NaiveDateTimeWrapper> {
-    interval_timestamp_add::<T1, T2, T3>(r, l)
+#[function("add(timestamp, interval) -> timestamp")]
+pub fn timestamp_interval_add(l: Timestamp, r: Interval) -> Result<Timestamp> {
+    interval_timestamp_add(r, l)
 }
 
-#[inline(always)]
-pub fn timestamp_interval_sub<T1, T2, T3>(
-    l: NaiveDateTimeWrapper,
-    r: IntervalUnit,
-) -> Result<NaiveDateTimeWrapper> {
-    interval_timestamp_add::<T1, T2, T3>(r.checked_neg().ok_or(ExprError::NumericOutOfRange)?, l)
+#[function("subtract(timestamp, interval) -> timestamp")]
+pub fn timestamp_interval_sub(l: Timestamp, r: Interval) -> Result<Timestamp> {
+    interval_timestamp_add(r.checked_neg().ok_or(ExprError::NumericOutOfRange)?, l)
 }
 
-#[inline(always)]
-pub fn timestamptz_interval_add<T1, T2, T3>(l: i64, r: IntervalUnit) -> Result<i64> {
+#[function("add(timestamptz, interval) -> timestamptz")]
+pub fn timestamptz_interval_add(l: i64, r: Interval) -> Result<i64> {
     timestamptz_interval_inner(l, r, i64::checked_add)
 }
 
-#[inline(always)]
-pub fn timestamptz_interval_sub<T1, T2, T3>(l: i64, r: IntervalUnit) -> Result<i64> {
+#[function("subtract(timestamptz, interval) -> timestamptz")]
+pub fn timestamptz_interval_sub(l: i64, r: Interval) -> Result<i64> {
     timestamptz_interval_inner(l, r, i64::checked_sub)
 }
 
-#[inline(always)]
-pub fn interval_timestamptz_add<T1, T2, T3>(l: IntervalUnit, r: i64) -> Result<i64> {
-    timestamptz_interval_add::<T1, T2, T3>(r, l)
+#[function("add(interval, timestamptz) -> timestamptz")]
+pub fn interval_timestamptz_add(l: Interval, r: i64) -> Result<i64> {
+    timestamptz_interval_add(r, l)
 }
 
 #[inline(always)]
-fn timestamptz_interval_inner(
-    l: i64,
-    r: IntervalUnit,
-    f: fn(i64, i64) -> Option<i64>,
-) -> Result<i64> {
+fn timestamptz_interval_inner(l: i64, r: Interval, f: fn(i64, i64) -> Option<i64>) -> Result<i64> {
     // Without session TimeZone, we cannot add month/day in local time. See #5826.
     if r.get_months() != 0 || r.get_days() != 0 {
         return Err(ExprError::UnsupportedFunction(
@@ -267,96 +248,81 @@ fn timestamptz_interval_inner(
     result.ok_or(ExprError::NumericOutOfRange)
 }
 
-#[inline(always)]
-pub fn interval_int_mul<T1, T2, T3>(l: IntervalUnit, r: T2) -> Result<IntervalUnit>
-where
-    T2: TryInto<i32> + Debug,
-{
+#[function("multiply(interval, *int) -> interval")]
+pub fn interval_int_mul(l: Interval, r: impl TryInto<i32> + Debug) -> Result<Interval> {
     l.checked_mul_int(r).ok_or(ExprError::NumericOutOfRange)
 }
 
-#[inline(always)]
-pub fn int_interval_mul<T1, T2, T3>(l: T1, r: IntervalUnit) -> Result<IntervalUnit>
-where
-    T1: TryInto<i32> + Debug,
-{
-    interval_int_mul::<T2, T1, T3>(r, l)
+#[function("multiply(*int, interval) -> interval")]
+pub fn int_interval_mul(l: impl TryInto<i32> + Debug, r: Interval) -> Result<Interval> {
+    interval_int_mul(r, l)
 }
 
-#[inline(always)]
-pub fn date_time_add<T1, T2, T3>(
-    l: NaiveDateWrapper,
-    r: NaiveTimeWrapper,
-) -> Result<NaiveDateTimeWrapper> {
-    let date_time = NaiveDateTime::new(l.0, r.0);
-    Ok(NaiveDateTimeWrapper::new(date_time))
+#[function("add(date, time) -> timestamp")]
+pub fn date_time_add(l: Date, r: Time) -> Result<Timestamp> {
+    Ok(Timestamp::new(NaiveDateTime::new(l.0, r.0)))
 }
 
-#[inline(always)]
-pub fn time_date_add<T1, T2, T3>(
-    l: NaiveTimeWrapper,
-    r: NaiveDateWrapper,
-) -> Result<NaiveDateTimeWrapper> {
-    date_time_add::<T2, T1, T3>(r, l)
+#[function("add(time, date) -> timestamp")]
+pub fn time_date_add(l: Time, r: Date) -> Result<Timestamp> {
+    date_time_add(r, l)
 }
 
-#[inline(always)]
-pub fn time_time_sub<T1, T2, T3>(l: NaiveTimeWrapper, r: NaiveTimeWrapper) -> Result<IntervalUnit> {
+#[function("subtract(time, time) -> interval")]
+pub fn time_time_sub(l: Time, r: Time) -> Result<Interval> {
     let tmp = l.0 - r.0; // this does not overflow or underflow
     let usecs = tmp
         .num_microseconds()
         .ok_or_else(|| ExprError::NumericOutOfRange)?;
-    Ok(IntervalUnit::from_month_day_usec(0, 0, usecs))
+    Ok(Interval::from_month_day_usec(0, 0, usecs))
 }
 
-#[inline(always)]
-pub fn time_interval_sub<T1, T2, T3>(
-    l: NaiveTimeWrapper,
-    r: IntervalUnit,
-) -> Result<NaiveTimeWrapper> {
+#[function("subtract(time, interval) -> time")]
+pub fn time_interval_sub(l: Time, r: Interval) -> Result<Time> {
     let time = l.0;
     let (new_time, ignored) = time.overflowing_sub_signed(Duration::microseconds(r.get_usecs()));
     if ignored == 0 {
-        Ok(NaiveTimeWrapper::new(new_time))
+        Ok(Time::new(new_time))
     } else {
         Err(ExprError::NumericOutOfRange)
     }
 }
 
-#[inline(always)]
-pub fn time_interval_add<T1, T2, T3>(
-    l: NaiveTimeWrapper,
-    r: IntervalUnit,
-) -> Result<NaiveTimeWrapper> {
+#[function("add(time, interval) -> time")]
+pub fn time_interval_add(l: Time, r: Interval) -> Result<Time> {
     let time = l.0;
     let (new_time, ignored) = time.overflowing_add_signed(Duration::microseconds(r.get_usecs()));
     if ignored == 0 {
-        Ok(NaiveTimeWrapper::new(new_time))
+        Ok(Time::new(new_time))
     } else {
         Err(ExprError::NumericOutOfRange)
     }
 }
 
-#[inline(always)]
-pub fn interval_float_div<T1, T2, T3>(l: IntervalUnit, r: T2) -> Result<IntervalUnit>
+#[function("divide(interval, *number) -> interval")]
+pub fn interval_float_div<T2>(l: Interval, r: T2) -> Result<Interval>
 where
-    T2: TryInto<OrderedF64> + Debug,
+    T2: TryInto<F64> + Debug,
 {
     l.div_float(r).ok_or(ExprError::NumericOutOfRange)
 }
 
-#[inline(always)]
-pub fn interval_float_mul<T1, T2, T3>(l: IntervalUnit, r: T2) -> Result<IntervalUnit>
+#[function("multiply(interval, float32) -> interval")]
+#[function("multiply(interval, float64) -> interval")]
+#[function("multiply(interval, decimal) -> interval")]
+pub fn interval_float_mul<T2>(l: Interval, r: T2) -> Result<Interval>
 where
-    T2: TryInto<OrderedF64> + Debug,
+    T2: TryInto<F64> + Debug,
 {
     l.mul_float(r).ok_or(ExprError::NumericOutOfRange)
 }
 
-#[inline(always)]
-pub fn float_interval_mul<T1, T2, T3>(l: T1, r: IntervalUnit) -> Result<IntervalUnit>
+#[function("multiply(float32, interval) -> interval")]
+#[function("multiply(float64, interval) -> interval")]
+#[function("multiply(decimal, interval) -> interval")]
+pub fn float_interval_mul<T1>(l: T1, r: Interval) -> Result<Interval>
 where
-    T1: TryInto<OrderedF64> + Debug,
+    T1: TryInto<F64> + Debug,
 {
     r.mul_float(l).ok_or(ExprError::NumericOutOfRange)
 }
@@ -365,9 +331,10 @@ where
 mod tests {
     use std::str::FromStr;
 
-    use risingwave_common::types::Decimal;
+    use risingwave_common::types::test_utils::IntervalTestExt;
+    use risingwave_common::types::{Date, Decimal, Interval, Timestamp, F32, F64};
 
-    use crate::vector_op::arithmetic_op::general_add;
+    use super::*;
 
     #[test]
     fn test() {
@@ -376,4 +343,94 @@ mod tests {
             Decimal::from_str("2").unwrap()
         );
     }
+
+    #[test]
+    fn test_arithmetic() {
+        assert_eq!(
+            general_add::<Decimal, i32, Decimal>(dec("1.0"), 1).unwrap(),
+            dec("2.0")
+        );
+        assert_eq!(
+            general_sub::<Decimal, i32, Decimal>(dec("1.0"), 2).unwrap(),
+            dec("-1.0")
+        );
+        assert_eq!(
+            general_mul::<Decimal, i32, Decimal>(dec("1.0"), 2).unwrap(),
+            dec("2.0")
+        );
+        assert_eq!(
+            general_div::<Decimal, i32, Decimal>(dec("2.0"), 2).unwrap(),
+            dec("1.0")
+        );
+        assert_eq!(
+            general_mod::<Decimal, i32, Decimal>(dec("2.0"), 2).unwrap(),
+            dec("0")
+        );
+        assert_eq!(general_neg::<Decimal>(dec("1.0")).unwrap(), dec("-1.0"));
+        assert_eq!(general_add::<i16, i32, i32>(1i16, 1i32).unwrap(), 2i32);
+        assert_eq!(general_sub::<i16, i32, i32>(1i16, 1i32).unwrap(), 0i32);
+        assert_eq!(general_mul::<i16, i32, i32>(1i16, 1i32).unwrap(), 1i32);
+        assert_eq!(general_div::<i16, i32, i32>(1i16, 1i32).unwrap(), 1i32);
+        assert_eq!(general_mod::<i16, i32, i32>(1i16, 1i32).unwrap(), 0i32);
+        assert_eq!(general_neg::<i16>(1i16).unwrap(), -1i16);
+
+        assert_eq!(
+            general_add::<Decimal, f32, Decimal>(dec("1.0"), -1f32).unwrap(),
+            dec("0.0")
+        );
+        assert_eq!(
+            general_sub::<Decimal, f32, Decimal>(dec("1.0"), 1f32).unwrap(),
+            dec("0.0")
+        );
+        assert_eq!(
+            general_div::<Decimal, f32, Decimal>(dec("0.0"), 1f32).unwrap(),
+            dec("0.0")
+        );
+        assert_eq!(
+            general_mul::<Decimal, f32, Decimal>(dec("0.0"), 1f32).unwrap(),
+            dec("0.0")
+        );
+        assert_eq!(
+            general_mod::<Decimal, f32, Decimal>(dec("0.0"), 1f32).unwrap(),
+            dec("0.0")
+        );
+        assert!(general_add::<i32, F32, F64>(-1i32, 1f32.into())
+            .unwrap()
+            .is_zero());
+        assert!(general_sub::<i32, F32, F64>(1i32, 1f32.into())
+            .unwrap()
+            .is_zero());
+        assert!(general_mul::<i32, F32, F64>(0i32, 1f32.into())
+            .unwrap()
+            .is_zero());
+        assert!(general_div::<i32, F32, F64>(0i32, 1f32.into())
+            .unwrap()
+            .is_zero());
+        assert_eq!(general_neg::<F32>(1f32.into()).unwrap(), F32::from(-1f32));
+        assert_eq!(
+            date_interval_add(Date::from_ymd_uncheck(1994, 1, 1), Interval::from_month(12))
+                .unwrap(),
+            Timestamp::new(
+                NaiveDateTime::parse_from_str("1995-1-1 0:0:0", "%Y-%m-%d %H:%M:%S").unwrap()
+            )
+        );
+        assert_eq!(
+            interval_date_add(Interval::from_month(12), Date::from_ymd_uncheck(1994, 1, 1))
+                .unwrap(),
+            Timestamp::new(
+                NaiveDateTime::parse_from_str("1995-1-1 0:0:0", "%Y-%m-%d %H:%M:%S").unwrap()
+            )
+        );
+        assert_eq!(
+            date_interval_sub(Date::from_ymd_uncheck(1994, 1, 1), Interval::from_month(12))
+                .unwrap(),
+            Timestamp::new(
+                NaiveDateTime::parse_from_str("1993-1-1 0:0:0", "%Y-%m-%d %H:%M:%S").unwrap()
+            )
+        );
+    }
+
+    fn dec(s: &str) -> Decimal {
+        Decimal::from_str(s).unwrap()
+    }
 }
diff --git a/src/expr/src/vector_op/array_access.rs b/src/expr/src/vector_op/array_access.rs
index 1e460acfddb9d..41101c6d13229 100644
--- a/src/expr/src/vector_op/array_access.rs
+++ b/src/expr/src/vector_op/array_access.rs
@@ -14,22 +14,21 @@
 
 use risingwave_common::array::ListRef;
 use risingwave_common::types::{Scalar, ToOwnedDatum};
+use risingwave_expr_macro::function;
 
 use crate::Result;
 
-#[inline(always)]
-pub fn array_access<T: Scalar>(l: Option<ListRef<'_>>, r: Option<i32>) -> Result<Option<T>> {
-    match (l, r) {
-        // index must be greater than 0 following a one-based numbering convention for arrays
-        (Some(list), Some(index)) if index > 0 => {
-            let datumref = list.value_at(index as usize)?;
-            if let Some(scalar) = datumref.to_owned_datum() {
-                Ok(Some(scalar.try_into()?))
-            } else {
-                Ok(None)
-            }
-        }
-        _ => Ok(None),
+#[function("array_access(list, int32) -> *")]
+pub fn array_access<T: Scalar>(list: ListRef<'_>, index: i32) -> Result<Option<T>> {
+    // index must be greater than 0 following a one-based numbering convention for arrays
+    if index < 1 {
+        return Ok(None);
+    }
+    let datumref = list.value_at(index as usize)?;
+    if let Some(scalar) = datumref.to_owned_datum() {
+        Ok(Some(scalar.try_into()?))
+    } else {
+        Ok(None)
     }
 }
 
@@ -50,10 +49,10 @@ mod tests {
         ]);
         let l1 = ListRef::ValueRef { val: &v1 };
 
-        assert_eq!(array_access::<i32>(Some(l1), Some(1)).unwrap(), Some(1));
-        assert_eq!(array_access::<i32>(Some(l1), Some(-1)).unwrap(), None);
-        assert_eq!(array_access::<i32>(Some(l1), Some(0)).unwrap(), None);
-        assert_eq!(array_access::<i32>(Some(l1), Some(4)).unwrap(), None);
+        assert_eq!(array_access::<i32>(l1, 1).unwrap(), Some(1));
+        assert_eq!(array_access::<i32>(l1, -1).unwrap(), None);
+        assert_eq!(array_access::<i32>(l1, 0).unwrap(), None);
+        assert_eq!(array_access::<i32>(l1, 4).unwrap(), None);
     }
 
     #[test]
@@ -75,15 +74,15 @@ mod tests {
         let l3 = ListRef::ValueRef { val: &v3 };
 
         assert_eq!(
-            array_access::<Box<str>>(Some(l1), Some(1)).unwrap(),
+            array_access::<Box<str>>(l1, 1).unwrap(),
             Some("来自".into())
         );
         assert_eq!(
-            array_access::<Box<str>>(Some(l2), Some(2)).unwrap(),
+            array_access::<Box<str>>(l2, 2).unwrap(),
             Some("荷兰".into())
         );
         assert_eq!(
-            array_access::<Box<str>>(Some(l3), Some(3)).unwrap(),
+            array_access::<Box<str>>(l3, 3).unwrap(),
             Some("的爱".into())
         );
     }
@@ -102,7 +101,7 @@ mod tests {
         ]);
         let l = ListRef::ValueRef { val: &v };
         assert_eq!(
-            array_access::<ListValue>(Some(l), Some(1)).unwrap(),
+            array_access::<ListValue>(l, 1).unwrap(),
             Some(ListValue::new(vec![
                 Some(ScalarImpl::Utf8("foo".into())),
                 Some(ScalarImpl::Utf8("bar".into())),
diff --git a/src/expr/src/vector_op/ascii.rs b/src/expr/src/vector_op/ascii.rs
index e0421d39e0952..0f902f740fd2d 100644
--- a/src/expr/src/vector_op/ascii.rs
+++ b/src/expr/src/vector_op/ascii.rs
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn ascii(s: &str) -> Result<i32> {
-    Ok(s.as_bytes().first().map(|x| *x as i32).unwrap_or(0))
+#[function("ascii(varchar) -> int32")]
+pub fn ascii(s: &str) -> i32 {
+    s.as_bytes().first().map(|x| *x as i32).unwrap_or(0)
 }
 
 #[cfg(test)]
@@ -27,7 +27,7 @@ mod tests {
     fn test_ascii() {
         let cases = [("hello", 104), ("你好", 228), ("", 0)];
         for (s, expected) in cases {
-            assert_eq!(ascii(s).unwrap(), expected)
+            assert_eq!(ascii(s), expected)
         }
     }
 }
diff --git a/src/expr/src/vector_op/bitwise_op.rs b/src/expr/src/vector_op/bitwise_op.rs
index 9e45cc8e3fa21..b89a0d1bae0b9 100644
--- a/src/expr/src/vector_op/bitwise_op.rs
+++ b/src/expr/src/vector_op/bitwise_op.rs
@@ -17,6 +17,7 @@ use std::fmt::Debug;
 use std::ops::{BitAnd, BitOr, BitXor, Not};
 
 use num_traits::{CheckedShl, CheckedShr};
+use risingwave_expr_macro::function;
 
 use crate::{ExprError, Result};
 
@@ -25,7 +26,12 @@ use crate::{ExprError, Result};
 // undefined behaviour. If the RHS is negative, instead of having an unexpected answer, we return an
 // error. If PG had clearly defined behavior rather than relying on UB of C, we would follow it even
 // when it is different from rust std.
-#[inline(always)]
+#[function("bitwise_shift_left(int16, int16) -> int16")]
+#[function("bitwise_shift_left(int16, int32) -> int16")]
+#[function("bitwise_shift_left(int32, int16) -> int32")]
+#[function("bitwise_shift_left(int32, int32) -> int32")]
+#[function("bitwise_shift_left(int64, int16) -> int64")]
+#[function("bitwise_shift_left(int64, int32) -> int64")]
 pub fn general_shl<T1, T2>(l: T1, r: T2) -> Result<T1>
 where
     T1: CheckedShl + Debug,
@@ -36,7 +42,12 @@ where
     })
 }
 
-#[inline(always)]
+#[function("bitwise_shift_right(int16, int16) -> int16")]
+#[function("bitwise_shift_right(int16, int32) -> int16")]
+#[function("bitwise_shift_right(int32, int16) -> int32")]
+#[function("bitwise_shift_right(int32, int32) -> int32")]
+#[function("bitwise_shift_right(int64, int16) -> int64")]
+#[function("bitwise_shift_right(int64, int32) -> int64")]
 pub fn general_shr<T1, T2>(l: T1, r: T2) -> Result<T1>
 where
     T1: CheckedShr + Debug,
@@ -48,7 +59,7 @@ where
 }
 
 #[inline(always)]
-pub fn general_shift<T1, T2, F>(l: T1, r: T2, atm: F) -> Result<T1>
+fn general_shift<T1, T2, F>(l: T1, r: T2, atm: F) -> Result<T1>
 where
     T1: Debug,
     T2: TryInto<u32> + Debug,
@@ -61,7 +72,7 @@ where
     atm(l, r)
 }
 
-#[inline(always)]
+#[function("bitwise_and(*int, *int) -> auto")]
 pub fn general_bitand<T1, T2, T3>(l: T1, r: T2) -> T3
 where
     T1: Into<T3> + Debug,
@@ -71,7 +82,7 @@ where
     l.into() & r.into()
 }
 
-#[inline(always)]
+#[function("bitwise_or(*int, *int) -> auto")]
 pub fn general_bitor<T1, T2, T3>(l: T1, r: T2) -> T3
 where
     T1: Into<T3> + Debug,
@@ -81,7 +92,7 @@ where
     l.into() | r.into()
 }
 
-#[inline(always)]
+#[function("bitwise_xor(*int, *int) -> auto")]
 pub fn general_bitxor<T1, T2, T3>(l: T1, r: T2) -> T3
 where
     T1: Into<T3> + Debug,
@@ -91,7 +102,44 @@ where
     l.into() ^ r.into()
 }
 
-#[inline(always)]
+#[function("bitwise_not(*int) -> auto")]
 pub fn general_bitnot<T1: Not<Output = T1>>(expr: T1) -> T1 {
     !expr
 }
+
+#[cfg(test)]
+mod tests {
+    use std::assert_matches::assert_matches;
+
+    use super::*;
+
+    #[test]
+    fn test_bitwise() {
+        // check the boundary
+        assert_eq!(general_shl::<i32, i32>(1i32, 0i32).unwrap(), 1i32);
+        assert_eq!(general_shl::<i64, i32>(1i64, 31i32).unwrap(), 2147483648i64);
+        assert_matches!(
+            general_shl::<i32, i32>(1i32, 32i32).unwrap_err(),
+            ExprError::NumericOutOfRange,
+        );
+        assert_eq!(
+            general_shr::<i64, i32>(-2147483648i64, 31i32).unwrap(),
+            -1i64
+        );
+        assert_eq!(general_shr::<i64, i32>(1i64, 0i32).unwrap(), 1i64);
+        // truth table
+        assert_eq!(
+            general_bitand::<u32, u32, u64>(0b0011u32, 0b0101u32),
+            0b1u64
+        );
+        assert_eq!(
+            general_bitor::<u32, u32, u64>(0b0011u32, 0b0101u32),
+            0b0111u64
+        );
+        assert_eq!(
+            general_bitxor::<u32, u32, u64>(0b0011u32, 0b0101u32),
+            0b0110u64
+        );
+        assert_eq!(general_bitnot::<i32>(0b01i32), -2i32);
+    }
+}
diff --git a/src/expr/src/vector_op/cast.rs b/src/expr/src/vector_op/cast.rs
index 4681de4136f11..599df1e0b9d8d 100644
--- a/src/expr/src/vector_op/cast.rs
+++ b/src/expr/src/vector_op/cast.rs
@@ -13,22 +13,29 @@
 // limitations under the License.
 
 use std::any::type_name;
-use std::fmt::Write;
+use std::fmt::{Debug, Write};
 use std::str::FromStr;
 
 use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
+use futures_util::FutureExt;
 use itertools::Itertools;
 use num_traits::ToPrimitive;
-use risingwave_common::array::{Array, JsonbRef, ListRef, ListValue, StructRef, StructValue};
+use risingwave_common::array::{
+    JsonbRef, ListArray, ListRef, ListValue, StructArray, StructRef, StructValue, Utf8Array,
+};
+use risingwave_common::row::OwnedRow;
 use risingwave_common::types::struct_type::StructType;
 use risingwave_common::types::to_text::ToText;
 use risingwave_common::types::{
-    DataType, Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper,
-    OrderedF32, OrderedF64, Scalar, ScalarImpl, ScalarRefImpl,
+    DataType, Date, Decimal, Interval, ScalarImpl, Time, Timestamp, F32, F64,
 };
 use risingwave_common::util::iter_util::ZipEqFast;
+use risingwave_expr_macro::{build_function, function};
+use risingwave_pb::expr::expr_node::PbType;
 use speedate::{Date as SpeedDate, DateTime as SpeedDateTime, Time as SpeedTime};
 
+use crate::expr::template::UnaryExpression;
+use crate::expr::{build, BoxedExpression, Expression, InputRefExpression};
 use crate::{ExprError, Result};
 
 /// String literals for bool type.
@@ -49,25 +56,25 @@ const PARSE_ERROR_STR_TO_TIME: &str =
 const PARSE_ERROR_STR_TO_DATE: &str = "Can't cast string to date (expected format is YYYY-MM-DD)";
 const PARSE_ERROR_STR_TO_BYTEA: &str = "Invalid Bytea syntax";
 
-#[inline(always)]
-pub fn str_to_date(elem: &str) -> Result<NaiveDateWrapper> {
-    Ok(NaiveDateWrapper::new(parse_naive_date(elem)?))
+#[function("cast(varchar) -> date")]
+pub fn str_to_date(elem: &str) -> Result<Date> {
+    Ok(Date::new(parse_naive_date(elem)?))
 }
 
-#[inline(always)]
-pub fn str_to_time(elem: &str) -> Result<NaiveTimeWrapper> {
-    Ok(NaiveTimeWrapper::new(parse_naive_time(elem)?))
+#[function("cast(varchar) -> time")]
+pub fn str_to_time(elem: &str) -> Result<Time> {
+    Ok(Time::new(parse_naive_time(elem)?))
 }
 
-#[inline(always)]
-pub fn str_to_timestamp(elem: &str) -> Result<NaiveDateTimeWrapper> {
-    Ok(NaiveDateTimeWrapper::new(parse_naive_datetime(elem)?))
+#[function("cast(varchar) -> timestamp")]
+pub fn str_to_timestamp(elem: &str) -> Result<Timestamp> {
+    Ok(Timestamp::new(parse_naive_datetime(elem)?))
 }
 
 #[inline]
 fn parse_naive_datetime(s: &str) -> Result<NaiveDateTime> {
     if let Ok(res) = SpeedDateTime::parse_str(s) {
-        Ok(NaiveDateWrapper::from_ymd_uncheck(
+        Ok(Date::from_ymd_uncheck(
             res.date.year as i32,
             res.date.month as u32,
             res.date.day as u32,
@@ -83,7 +90,7 @@ fn parse_naive_datetime(s: &str) -> Result<NaiveDateTime> {
         let res = SpeedDate::parse_str(s)
             .map_err(|_| ExprError::Parse(PARSE_ERROR_STR_TO_TIMESTAMP.into()))?;
         Ok(
-            NaiveDateWrapper::from_ymd_uncheck(res.year as i32, res.month as u32, res.day as u32)
+            Date::from_ymd_uncheck(res.year as i32, res.month as u32, res.day as u32)
                 .and_hms_micro_uncheck(0, 0, 0, 0)
                 .0,
         )
@@ -125,9 +132,9 @@ fn parse_naive_datetime(s: &str) -> Result<NaiveDateTime> {
 /// );
 /// ```
 #[inline]
-pub fn i64_to_timestamp(t: i64) -> Result<NaiveDateTimeWrapper> {
+pub fn i64_to_timestamp(t: i64) -> Result<Timestamp> {
     let us = i64_to_timestamptz(t)?;
-    Ok(NaiveDateTimeWrapper::from_timestamp_uncheck(
+    Ok(Timestamp::from_timestamp_uncheck(
         us / 1_000_000,
         (us % 1_000_000) as u32 * 1000,
     ))
@@ -137,14 +144,14 @@ pub fn i64_to_timestamp(t: i64) -> Result<NaiveDateTimeWrapper> {
 fn parse_naive_date(s: &str) -> Result<NaiveDate> {
     let res =
         SpeedDate::parse_str(s).map_err(|_| ExprError::Parse(PARSE_ERROR_STR_TO_DATE.into()))?;
-    Ok(NaiveDateWrapper::from_ymd_uncheck(res.year as i32, res.month as u32, res.day as u32).0)
+    Ok(Date::from_ymd_uncheck(res.year as i32, res.month as u32, res.day as u32).0)
 }
 
 #[inline]
 fn parse_naive_time(s: &str) -> Result<NaiveTime> {
     let res =
         SpeedTime::parse_str(s).map_err(|_| ExprError::Parse(PARSE_ERROR_STR_TO_TIME.into()))?;
-    Ok(NaiveTimeWrapper::from_hms_micro_uncheck(
+    Ok(Time::from_hms_micro_uncheck(
         res.hour as u32,
         res.minute as u32,
         res.second as u32,
@@ -184,7 +191,7 @@ pub fn i64_to_timestamptz(t: i64) -> Result<i64> {
     }
 }
 
-#[inline(always)]
+#[function("cast(varchar) -> bytea")]
 pub fn str_to_bytea(elem: &str) -> Result<Box<[u8]>> {
     // Padded with whitespace str is not allowed.
     if elem.starts_with(' ') && elem.trim().starts_with("\\x") {
@@ -250,7 +257,9 @@ pub fn parse_bytes_traditional(s: &str) -> Result<Vec<u8>> {
     Ok(out)
 }
 
-#[inline(always)]
+#[function("cast(varchar) -> *number")]
+#[function("cast(varchar) -> interval")]
+#[function("cast(varchar) -> jsonb")]
 pub fn str_parse<T>(elem: &str) -> Result<T>
 where
     T: FromStr,
@@ -261,67 +270,74 @@ where
         .map_err(|_| ExprError::Parse(type_name::<T>().into()))
 }
 
-/// Define the cast function to primitive types.
-///
-/// Due to the orphan rule, some data can't implement `TryFrom` trait for basic type.
-/// We can only use [`ToPrimitive`] trait.
-///
-/// Note: this might be lossy according to the docs from [`ToPrimitive`]:
-/// > On the other hand, conversions with possible precision loss or truncation
-/// are admitted, like an `f32` with a decimal part to an integer type, or
-/// even a large `f64` saturating to `f32` infinity.
-macro_rules! define_cast_to_primitive {
-    ($ty:ty) => {
-        define_cast_to_primitive! { $ty, $ty }
-    };
-    ($ty:ty, $wrapper_ty:ty) => {
-        paste::paste! {
-            #[inline(always)]
-            pub fn [<to_ $ty>]<T>(elem: T) -> Result<$wrapper_ty>
-            where
-                T: ToPrimitive + std::fmt::Debug,
-            {
-                elem.[<to_ $ty>]()
-                    .ok_or_else(|| {
-                        ExprError::CastOutOfRange(
-                            std::any::type_name::<$ty>()
-                        )
-                    })
-                    .map(Into::into)
-            }
-        }
-    };
+// Define the cast function to primitive types.
+//
+// Due to the orphan rule, some data can't implement `TryFrom` trait for basic type.
+// We can only use [`ToPrimitive`] trait.
+//
+// Note: this might be lossy according to the docs from [`ToPrimitive`]:
+// > On the other hand, conversions with possible precision loss or truncation
+// are admitted, like an `f32` with a decimal part to an integer type, or
+// even a large `f64` saturating to `f32` infinity.
+
+#[function("cast(float32) -> int16")]
+#[function("cast(float64) -> int16")]
+pub fn to_i16<T: ToPrimitive + Debug>(elem: T) -> Result<i16> {
+    elem.to_i16().ok_or(ExprError::CastOutOfRange("i16"))
 }
 
-define_cast_to_primitive! { i16 }
-define_cast_to_primitive! { i32 }
-define_cast_to_primitive! { i64 }
-define_cast_to_primitive! { f32, OrderedF32 }
-define_cast_to_primitive! { f64, OrderedF64 }
+#[function("cast(float32) -> int32")]
+#[function("cast(float64) -> int32")]
+pub fn to_i32<T: ToPrimitive + Debug>(elem: T) -> Result<i32> {
+    elem.to_i32().ok_or(ExprError::CastOutOfRange("i32"))
+}
+
+#[function("cast(float32) -> int64")]
+#[function("cast(float64) -> int64")]
+pub fn to_i64<T: ToPrimitive + Debug>(elem: T) -> Result<i64> {
+    elem.to_i64().ok_or(ExprError::CastOutOfRange("i64"))
+}
+
+#[function("cast(int32) -> float32")]
+#[function("cast(int64) -> float32")]
+#[function("cast(float64) -> float32")]
+#[function("cast(decimal) -> float32")]
+pub fn to_f32<T: ToPrimitive + Debug>(elem: T) -> Result<F32> {
+    elem.to_f32()
+        .map(Into::into)
+        .ok_or(ExprError::CastOutOfRange("f32"))
+}
+
+#[function("cast(decimal) -> float64")]
+pub fn to_f64<T: ToPrimitive + Debug>(elem: T) -> Result<F64> {
+    elem.to_f64()
+        .map(Into::into)
+        .ok_or(ExprError::CastOutOfRange("f64"))
+}
 
 // In postgresSql, the behavior of casting decimal to integer is rounding.
 // We should write them separately
-#[inline(always)]
+#[function("cast(decimal) -> int16")]
 pub fn dec_to_i16(elem: Decimal) -> Result<i16> {
     to_i16(elem.round_dp(0))
 }
 
-#[inline(always)]
+#[function("cast(decimal) -> int32")]
 pub fn dec_to_i32(elem: Decimal) -> Result<i32> {
     to_i32(elem.round_dp(0))
 }
 
-#[inline(always)]
+#[function("cast(decimal) -> int64")]
 pub fn dec_to_i64(elem: Decimal) -> Result<i64> {
     to_i64(elem.round_dp(0))
 }
 
-#[inline(always)]
+#[function("cast(jsonb) -> boolean")]
 pub fn jsonb_to_bool(v: JsonbRef<'_>) -> Result<bool> {
     v.as_bool().map_err(|e| ExprError::Parse(e.into()))
 }
 
-#[inline(always)]
+#[function("cast(jsonb) -> decimal")]
 pub fn jsonb_to_dec(v: JsonbRef<'_>) -> Result<Decimal> {
     v.as_number()
         .map_err(|e| ExprError::Parse(e.into()))
@@ -335,46 +351,50 @@ pub fn jsonb_to_dec(v: JsonbRef<'_>) -> Result<Decimal> {
 /// Note that PostgreSQL casts JSON numbers from arbitrary precision `numeric` but we use `f64`.
 /// This is less powerful but still meets RFC 8259 interoperability.
 macro_rules! define_jsonb_to_number {
-    ($ty:ty) => {
-        define_jsonb_to_number! { $ty, $ty }
+    ($ty:ty, $sig:literal) => {
+        define_jsonb_to_number! { $ty, $ty, $sig }
     };
-    ($ty:ty, $wrapper_ty:ty) => {
+    ($ty:ty, $wrapper_ty:ty, $sig:literal) => {
         paste::paste! {
-            #[inline(always)]
+            #[function($sig)]
             pub fn [<jsonb_to_ $ty>](v: JsonbRef<'_>) -> Result<$wrapper_ty> {
                 v.as_number().map_err(|e| ExprError::Parse(e.into())).and_then([<to_ $ty>])
             }
         }
     };
 }
-define_jsonb_to_number! { i16 }
-define_jsonb_to_number! { i32 }
-define_jsonb_to_number! { i64 }
-define_jsonb_to_number! { f32, OrderedF32 }
-define_jsonb_to_number! { f64, OrderedF64 }
+define_jsonb_to_number! { i16, "cast(jsonb) -> int16" }
+define_jsonb_to_number! { i32, "cast(jsonb) -> int32" }
+define_jsonb_to_number! { i64, "cast(jsonb) -> int64" }
+define_jsonb_to_number! { f32, F32, "cast(jsonb) -> float32" }
+define_jsonb_to_number! { f64, F64, "cast(jsonb) -> float64" }
 
 /// In `PostgreSQL`, casting from timestamp to date discards the time part.
-#[inline(always)]
-pub fn timestamp_to_date(elem: NaiveDateTimeWrapper) -> NaiveDateWrapper {
-    NaiveDateWrapper(elem.0.date())
+#[function("cast(timestamp) -> date")]
+pub fn timestamp_to_date(elem: Timestamp) -> Date {
+    Date(elem.0.date())
 }
 
 /// In `PostgreSQL`, casting from timestamp to time discards the date part.
-#[inline(always)]
-pub fn timestamp_to_time(elem: NaiveDateTimeWrapper) -> NaiveTimeWrapper {
-    NaiveTimeWrapper(elem.0.time())
+#[function("cast(timestamp) -> time")]
+pub fn timestamp_to_time(elem: Timestamp) -> Time {
+    Time(elem.0.time())
 }
 
 /// In `PostgreSQL`, casting from interval to time discards the days part.
-#[inline(always)]
-pub fn interval_to_time(elem: IntervalUnit) -> NaiveTimeWrapper {
+#[function("cast(interval) -> time")]
+pub fn interval_to_time(elem: Interval) -> Time {
     let usecs = elem.get_usecs_of_day();
     let secs = (usecs / 1_000_000) as u32;
     let nano = (usecs % 1_000_000 * 1000) as u32;
-    NaiveTimeWrapper::from_num_seconds_from_midnight_uncheck(secs, nano)
+    Time::from_num_seconds_from_midnight_uncheck(secs, nano)
 }
 
-#[inline(always)]
+#[function("cast(boolean) -> int32")]
+#[function("cast(int32) -> int16")]
+#[function("cast(int64) -> int16")]
+#[function("cast(int64) -> int32")]
+#[function("cast(int64) -> float64")]
 pub fn try_cast<T1, T2>(elem: T1) -> Result<T2>
 where
     T1: TryInto<T2> + std::fmt::Debug + Copy,
@@ -384,7 +404,21 @@ where
         .map_err(|_| ExprError::CastOutOfRange(std::any::type_name::<T2>()))
 }
 
-#[inline(always)]
+#[function("cast(int16) -> int32")]
+#[function("cast(int16) -> int64")]
+#[function("cast(int16) -> float32")]
+#[function("cast(int16) -> float64")]
+#[function("cast(int16) -> decimal")]
+#[function("cast(int32) -> int64")]
+#[function("cast(int32) -> float64")]
+#[function("cast(int32) -> decimal")]
+#[function("cast(int64) -> decimal")]
+#[function("cast(float32) -> float64")]
+#[function("cast(float32) -> decimal")]
+#[function("cast(float64) -> decimal")]
+#[function("cast(date) -> timestamp")]
+#[function("cast(time) -> interval")]
+#[function("cast(varchar) -> varchar")]
 pub fn cast<T1, T2>(elem: T1) -> T2
 where
     T1: Into<T2>,
@@ -392,7 +426,7 @@ where
     elem.into()
 }
 
-#[inline(always)]
+#[function("cast(varchar) -> boolean")]
 pub fn str_to_bool(input: &str) -> Result<bool> {
     let trimmed_input = input.trim();
     if TRUE_BOOL_LITERALS
@@ -410,17 +444,26 @@ pub fn str_to_bool(input: &str) -> Result<bool> {
     }
 }
 
+#[function("cast(int32) -> boolean")]
 pub fn int32_to_bool(input: i32) -> Result<bool> {
     Ok(input != 0)
 }
 
 // For most of the types, cast them to varchar is similar to return their text format.
 // So we use this function to cast type to varchar.
+#[function("cast(*number) -> varchar")]
+#[function("cast(time) -> varchar")]
+#[function("cast(date) -> varchar")]
+#[function("cast(interval) -> varchar")]
+#[function("cast(timestamp) -> varchar")]
+#[function("cast(jsonb) -> varchar")]
+#[function("cast(list) -> varchar")]
 pub fn general_to_text(elem: impl ToText, mut writer: &mut dyn Write) -> Result<()> {
     elem.write(&mut writer).unwrap();
     Ok(())
 }
 
+#[function("cast(boolean) -> varchar")]
 pub fn bool_to_varchar(input: bool, writer: &mut dyn Write) -> Result<()> {
     writer
         .write_str(if input { "true" } else { "false" })
@@ -430,6 +473,7 @@ pub fn bool_to_varchar(input: bool, writer: &mut dyn Write) -> Result<()> {
 
 /// `bool_out` is different from `general_to_string<bool>` to produce a single char. `PostgreSQL`
 /// uses different variants of bool-to-string in different situations.
+#[function("bool_out(boolean) -> varchar")]
 pub fn bool_out(input: bool, writer: &mut dyn Write) -> Result<()> {
     writer.write_str(if input { "t" } else { "f" }).unwrap();
     Ok(())
@@ -451,8 +495,8 @@ pub fn literal_parsing(
         DataType::Int64 => str_parse::<i64>(s)?.into(),
         DataType::Serial => return Err(None),
         DataType::Decimal => str_parse::<Decimal>(s)?.into(),
-        DataType::Float32 => str_parse::<OrderedF32>(s)?.into(),
-        DataType::Float64 => str_parse::<OrderedF64>(s)?.into(),
+        DataType::Float32 => str_parse::<F32>(s)?.into(),
+        DataType::Float64 => str_parse::<F64>(s)?.into(),
         DataType::Varchar => return Err(None),
         DataType::Date => str_to_date(s)?.into(),
         DataType::Timestamp => str_to_timestamp(s)?.into(),
@@ -460,7 +504,7 @@ pub fn literal_parsing(
         // for later phase.
         DataType::Timestamptz => str_with_time_zone_to_timestamptz(s)?.into(),
         DataType::Time => str_to_time(s)?.into(),
-        DataType::Interval => str_parse::<IntervalUnit>(s)?.into(),
+        DataType::Interval => str_parse::<Interval>(s)?.into(),
         // Not processing list or struct literal right now. Leave it for later phase (normal backend
         // evaluation).
         DataType::List { .. } => return Err(None),
@@ -471,292 +515,184 @@ pub fn literal_parsing(
     Ok(scalar)
 }
 
-/// It accepts a macro whose input is `{ $input:ident, $cast:ident, $func:expr }` tuples
-///
-/// * `$input`: input type
-/// * `$cast`: The cast type in that the operation will calculate
-/// * `$func`: The scalar function for expression, it's a generic function and specialized by the
-///   type of `$input, $cast`
-/// * `$infallible`: Whether the cast is infallible
-#[macro_export]
-macro_rules! for_all_cast_variants {
-    ($macro:ident) => {
-        $macro! {
-            { varchar, date, str_to_date, false },
-            { varchar, time, str_to_time, false },
-            { varchar, interval, str_parse, false },
-            { varchar, timestamp, str_to_timestamp, false },
-            { varchar, int16, str_parse, false },
-            { varchar, int32, str_parse, false },
-            { varchar, int64, str_parse, false },
-            { varchar, float32, str_parse, false },
-            { varchar, float64, str_parse, false },
-            { varchar, decimal, str_parse, false },
-            { varchar, boolean, str_to_bool, false },
-            { varchar, bytea, str_to_bytea, false },
-            { varchar, jsonb, str_parse, false },
-            // `str_to_list` requires `target_elem_type` and is handled elsewhere
-
-            { boolean, varchar, bool_to_varchar, false },
-            { int16, varchar, general_to_text, false },
-            { int32, varchar, general_to_text, false },
-            { int64, varchar, general_to_text, false },
-            { float32, varchar, general_to_text, false },
-            { float64, varchar, general_to_text, false },
-            { decimal, varchar, general_to_text, false },
-            { time, varchar, general_to_text, false },
-            { interval, varchar, general_to_text, false },
-            { date, varchar, general_to_text, false },
-            { timestamp, varchar, general_to_text, false },
-            { jsonb, varchar, |x, w| general_to_text(x, w), false },
-            { list, varchar, |x, w| general_to_text(x, w), false },
-
-            { jsonb, boolean, jsonb_to_bool, false },
-            { jsonb, int16, jsonb_to_i16, false },
-            { jsonb, int32, jsonb_to_i32, false },
-            { jsonb, int64, jsonb_to_i64, false },
-            { jsonb, decimal, jsonb_to_dec, false },
-            { jsonb, float32, jsonb_to_f32, false },
-            { jsonb, float64, jsonb_to_f64, false },
-
-            { boolean, int32, try_cast, false },
-            { int32, boolean, int32_to_bool, false },
-
-            { int16, int32, cast::<i16, i32>, true },
-            { int16, int64, cast::<i16, i64>, true },
-            { int16, float32, cast::<i16, OrderedF32>, true },
-            { int16, float64, cast::<i16, OrderedF64>, true },
-            { int16, decimal, cast::<i16, Decimal>, true },
-            { int32, int16, try_cast, false },
-            { int32, int64, cast::<i32, i64>, true },
-            { int32, float32, to_f32, false }, // lossy
-            { int32, float64, cast::<i32, OrderedF64>, true },
-            { int32, decimal, cast::<i32, Decimal>, true },
-            { int64, int16, try_cast, false },
-            { int64, int32, try_cast, false },
-            { int64, float32, to_f32, false }, // lossy
-            { int64, float64, to_f64, false }, // lossy
-            { int64, decimal, cast::<i64, Decimal>, true },
-
-            { float32, float64, cast::<OrderedF32, OrderedF64>, true },
-            { float32, decimal, cast::<OrderedF32, Decimal>, true },
-            { float32, int16, to_i16, false },
-            { float32, int32, to_i32, false },
-            { float32, int64, to_i64, false },
-            { float64, decimal, cast::<OrderedF64, Decimal>, true },
-            { float64, int16, to_i16, false },
-            { float64, int32, to_i32, false },
-            { float64, int64, to_i64, false },
-            { float64, float32, to_f32, false }, // lossy
-
-            { decimal, int16, dec_to_i16, false },
-            { decimal, int32, dec_to_i32, false },
-            { decimal, int64, dec_to_i64, false },
-            { decimal, float32, to_f32, false },
-            { decimal, float64, to_f64, false },
-
-            { date, timestamp, cast::<NaiveDateWrapper, NaiveDateTimeWrapper>, true },
-            { time, interval, cast::<NaiveTimeWrapper, IntervalUnit>, true },
-            { timestamp, date, timestamp_to_date, true },
-            { timestamp, time, timestamp_to_time, true },
-            { interval, time, interval_to_time, true }
-        }
-    };
-}
-
 // TODO(nanderstabel): optimize for multidimensional List. Depth can be given as a parameter to this
 // function.
-fn unnest(input: &str) -> Result<Vec<String>> {
-    // Trim input
+/// Takes a string input in the form of a comma-separated list enclosed in braces, and returns a
+/// vector of strings containing the list items.
+///
+/// # Examples
+/// - "{1, 2, 3}" => ["1", "2", "3"]
+/// - "{1, {2, 3}}" => ["1", "{2, 3}"]
+fn unnest(input: &str) -> Result<Vec<&str>> {
     let trimmed = input.trim();
-
-    let mut chars = trimmed.chars();
-    if chars.next() != Some('{') || chars.next_back() != Some('}') {
+    if !trimmed.starts_with('{') || !trimmed.ends_with('}') {
         return Err(ExprError::Parse("Input must be braced".into()));
     }
+    let trimmed = &trimmed[1..trimmed.len() - 1];
 
     let mut items = Vec::new();
-    while let Some(c) = chars.next() {
+    let mut depth = 0;
+    let mut start = 0;
+    for (i, c) in trimmed.chars().enumerate() {
         match c {
-            '{' => {
-                let mut string = String::from(c);
-                let mut depth = 1;
-                while depth != 0 {
-                    let c = match chars.next() {
-                        Some(c) => {
-                            if c == '{' {
-                                depth += 1;
-                            } else if c == '}' {
-                                depth -= 1;
-                            }
-                            c
-                        }
-                        None => {
-                            return Err(ExprError::Parse(
-                                "Missing closing brace '}}' character".into(),
-                            ))
-                        }
-                    };
-                    string.push(c);
-                }
-                items.push(string);
-            }
-            '}' => {
-                return Err(ExprError::Parse(
-                    "Unexpected closing brace '}}' character".into(),
-                ))
+            '{' => depth += 1,
+            '}' => depth -= 1,
+            ',' if depth == 0 => {
+                let item = trimmed[start..i].trim();
+                items.push(item);
+                start = i + 1;
             }
-            ',' => {}
-            c if c.is_whitespace() => {}
-            c => items.push(format!(
-                "{}{}",
-                c,
-                chars.take_while_ref(|&c| c != ',').collect::<String>()
-            )),
+            _ => {}
         }
     }
+    if depth != 0 {
+        return Err(ExprError::Parse("Unbalanced braces".into()));
+    }
+    let last = trimmed[start..].trim();
+    if !last.is_empty() {
+        items.push(last);
+    }
     Ok(items)
 }
 
-#[inline(always)]
-pub fn str_to_list(input: &str, target_elem_type: &DataType) -> Result<ListValue> {
-    // Return a new ListValue.
-    // For each &str in the comma separated input a ScalarRefImpl is initialized which in turn
-    // is cast into the target DataType. If the target DataType is of type Varchar, then
-    // no casting is needed.
-    Ok(ListValue::new(
-        unnest(input)?
-            .iter()
-            .map(|s| {
-                Some(ScalarRefImpl::Utf8(s.trim()))
-                    .map(|scalar_ref| match target_elem_type {
-                        DataType::Varchar => Ok(scalar_ref.into_scalar_impl()),
-                        _ => scalar_cast(scalar_ref, &DataType::Varchar, target_elem_type),
-                    })
-                    .transpose()
-            })
-            .try_collect()?,
-    ))
+#[build_function("cast(varchar) -> list")]
+fn build_cast_str_to_list(
+    return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let elem_type = match &return_type {
+        DataType::List { datatype } => (**datatype).clone(),
+        _ => panic!("expected list type"),
+    };
+    let child = children.into_iter().next().unwrap();
+    Ok(Box::new(UnaryExpression::<Utf8Array, ListArray, _>::new(
+        child,
+        return_type,
+        move |x| str_to_list(x, &elem_type),
+    )))
+}
+
+fn str_to_list(input: &str, target_elem_type: &DataType) -> Result<ListValue> {
+    let cast = build(
+        PbType::Cast,
+        target_elem_type.clone(),
+        vec![InputRefExpression::new(DataType::Varchar, 0).boxed()],
+    )
+    .unwrap();
+    let mut values = vec![];
+    for item in unnest(input)? {
+        let v = cast
+            .eval_row(&OwnedRow::new(vec![Some(item.to_string().into())])) // TODO: optimize
+            .now_or_never()
+            .unwrap()?;
+        values.push(v);
+    }
+    Ok(ListValue::new(values))
+}
+
+#[build_function("cast(list) -> list")]
+fn build_cast_list_to_list(
+    return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let child = children.into_iter().next().unwrap();
+    let source_elem_type = match child.return_type() {
+        DataType::List { datatype } => (*datatype).clone(),
+        _ => panic!("expected list type"),
+    };
+    let target_elem_type = match &return_type {
+        DataType::List { datatype } => (**datatype).clone(),
+        _ => panic!("expected list type"),
+    };
+    Ok(Box::new(UnaryExpression::<ListArray, ListArray, _>::new(
+        child,
+        return_type,
+        move |x| list_cast(x, &source_elem_type, &target_elem_type),
+    )))
 }
 
 /// Cast array with `source_elem_type` into array with `target_elem_type` by casting each element.
-///
-/// TODO: `.map(scalar_cast)` is not a preferred pattern and we should avoid it if possible.
-pub fn list_cast(
+fn list_cast(
     input: ListRef<'_>,
     source_elem_type: &DataType,
     target_elem_type: &DataType,
 ) -> Result<ListValue> {
-    Ok(ListValue::new(
-        input
-            .values_ref()
-            .into_iter()
-            .map(|datum_ref| {
-                datum_ref
-                    .map(|scalar_ref| scalar_cast(scalar_ref, source_elem_type, target_elem_type))
-                    .transpose()
-            })
-            .try_collect()?,
+    let cast = build(
+        PbType::Cast,
+        target_elem_type.clone(),
+        vec![InputRefExpression::new(source_elem_type.clone(), 0).boxed()],
+    )
+    .unwrap();
+    let elements = input.values_ref();
+    let mut values = Vec::with_capacity(elements.len());
+    for item in elements {
+        let v = cast
+            .eval_row(&OwnedRow::new(vec![item.map(|s| s.into_scalar_impl())])) // TODO: optimize
+            .now_or_never()
+            .unwrap()?;
+        values.push(v);
+    }
+    Ok(ListValue::new(values))
+}
+
+#[build_function("cast(struct) -> struct")]
+fn build_cast_struct_to_struct(
+    return_type: DataType,
+    children: Vec<BoxedExpression>,
+) -> Result<BoxedExpression> {
+    let child = children.into_iter().next().unwrap();
+    let source_elem_type = match child.return_type() {
+        DataType::Struct(s) => (*s).clone(),
+        _ => panic!("expected struct type"),
+    };
+    let target_elem_type = match &return_type {
+        DataType::Struct(s) => (**s).clone(),
+        _ => panic!("expected struct type"),
+    };
+    Ok(Box::new(
+        UnaryExpression::<StructArray, StructArray, _>::new(child, return_type, move |x| {
+            struct_cast(x, &source_elem_type, &target_elem_type)
+        }),
     ))
 }
 
 /// Cast struct of `source_elem_type` to `target_elem_type` by casting each element.
-pub fn struct_cast(
+fn struct_cast(
     input: StructRef<'_>,
     source_elem_type: &StructType,
     target_elem_type: &StructType,
 ) -> Result<StructValue> {
-    Ok(StructValue::new(
-        input
-            .fields_ref()
-            .into_iter()
-            .zip_eq_fast(source_elem_type.fields.iter())
-            .zip_eq_fast(target_elem_type.fields.iter())
-            .map(|((datum_ref, source_elem_type), target_elem_type)| {
-                if source_elem_type == target_elem_type {
-                    return Ok(datum_ref.map(|scalar_ref| scalar_ref.into_scalar_impl()));
-                }
-                datum_ref
-                    .map(|scalar_ref| scalar_cast(scalar_ref, source_elem_type, target_elem_type))
-                    .transpose()
-            })
-            .try_collect()?,
-    ))
-}
-
-/// Cast scalar ref with `source_type` into owned scalar with `target_type`. This function forms a
-/// mutual recursion with `list_cast` so that we can cast nested lists (e.g., varchar[][] to
-/// int[][]).
-fn scalar_cast(
-    source: ScalarRefImpl<'_>,
-    source_type: &DataType,
-    target_type: &DataType,
-) -> Result<ScalarImpl> {
-    use crate::expr::data_types::*;
-
-    match (source_type, target_type) {
-        (DataType::Struct(source_type), DataType::Struct(target_type)) => {
-            Ok(struct_cast(source.try_into()?, source_type, target_type)?.to_scalar_value())
-        }
-        (
-            DataType::List {
-                datatype: source_elem_type,
-            },
-            DataType::List {
-                datatype: target_elem_type,
-            },
-        ) => list_cast(source.try_into()?, source_elem_type, target_elem_type)
-            .map(Scalar::to_scalar_value),
-        (
-            DataType::Varchar,
-            DataType::List {
-                datatype: target_elem_type,
-            },
-        ) => str_to_list(source.try_into()?, target_elem_type).map(Scalar::to_scalar_value),
-        (source_type, target_type) => {
-            macro_rules! gen_cast_impl {
-                ($( { $input:ident, $cast:ident, $func:expr, $infallible:ident } ),*) => {
-                    match (source_type, target_type) {
-                        $(
-                            ($input! { type_match_pattern }, $cast! { type_match_pattern }) => gen_cast_impl!(arm: $input, $cast, $func, $infallible),
-                        )*
-                        _ => {
-                            return Err(ExprError::UnsupportedCast(source_type.clone(), target_type.clone()));
-                        }
-                    }
-                };
-                (arm: $input:ident, varchar, $func:expr, false) => {
-                    {
-                        let source: <$input! { type_array } as Array>::RefItem<'_> = source.try_into()?;
-                        let mut writer = String::new();
-                        let target: Result<()> = $func(source, &mut writer);
-                        target.map(|_| Scalar::to_scalar_value(writer.into_boxed_str()))
-                    }
-                };
-                (arm: $input:ident, $cast:ident, $func:expr, false) => {
-                    {
-                        let source: <$input! { type_array } as Array>::RefItem<'_> = source.try_into()?;
-                        let target: Result<<$cast! { type_array } as Array>::OwnedItem> = $func(source);
-                        target.map(Scalar::to_scalar_value)
-                    }
-                };
-                (arm: $input:ident, $cast:ident, $func:expr, true) => {
-                    {
-                        let source: <$input! { type_array } as Array>::RefItem<'_> = source.try_into()?;
-                        let target: Result<<$cast! { type_array } as Array>::OwnedItem> = Ok($func(source));
-                        target.map(Scalar::to_scalar_value)
-                    }
-                };
+    let fields = (input.fields_ref().into_iter())
+        .zip_eq_fast(source_elem_type.fields.iter())
+        .zip_eq_fast(target_elem_type.fields.iter())
+        .map(|((datum_ref, source_field_type), target_field_type)| {
+            if source_field_type == target_field_type {
+                return Ok(datum_ref.map(|scalar_ref| scalar_ref.into_scalar_impl()));
             }
-            for_all_cast_variants!(gen_cast_impl)
-        }
-    }
+            let cast = build(
+                PbType::Cast,
+                target_field_type.clone(),
+                vec![InputRefExpression::new(source_field_type.clone(), 0).boxed()],
+            )
+            .unwrap();
+            let value = match datum_ref {
+                Some(scalar_ref) => cast
+                    .eval_row(&OwnedRow::new(vec![Some(scalar_ref.into_scalar_impl())]))
+                    .now_or_never()
+                    .unwrap()?,
+                None => None,
+            };
+            Ok(value) as Result<_>
+        })
+        .try_collect()?;
+    Ok(StructValue::new(fields))
 }
 
 #[cfg(test)]
 mod tests {
 
     use num_traits::FromPrimitive;
+    use risingwave_common::types::Scalar;
 
     use super::*;
 
@@ -833,11 +769,11 @@ mod tests {
         test!(general_to_text(i64::MIN), "-9223372036854775808");
         test!(general_to_text(i64::MAX), "9223372036854775807");
 
-        test!(general_to_text(OrderedF64::from(32.12)), "32.12");
-        test!(general_to_text(OrderedF64::from(-32.14)), "-32.14");
+        test!(general_to_text(F64::from(32.12)), "32.12");
+        test!(general_to_text(F64::from(-32.14)), "-32.14");
 
-        test!(general_to_text(OrderedF32::from(32.12_f32)), "32.12");
-        test!(general_to_text(OrderedF32::from(-32.14_f32)), "-32.14");
+        test!(general_to_text(F32::from(32.12_f32)), "32.12");
+        test!(general_to_text(F32::from(-32.14_f32)), "-32.14");
 
         test!(general_to_text(Decimal::from_f64(1.222).unwrap()), "1.222");
 
@@ -855,17 +791,18 @@ mod tests {
             str_to_time("04:02").unwrap(),
         );
         assert_eq!(
-            interval_to_time(IntervalUnit::from_month_day_usec(1, 2, 61000003)),
+            interval_to_time(Interval::from_month_day_usec(1, 2, 61000003)),
             str_to_time("00:01:01.000003").unwrap(),
         );
         assert_eq!(
-            interval_to_time(IntervalUnit::from_month_day_usec(0, 0, -61000003)),
+            interval_to_time(Interval::from_month_day_usec(0, 0, -61000003)),
             str_to_time("23:58:58.999997").unwrap(),
         );
     }
 
     #[test]
     fn test_unnest() {
+        assert_eq!(unnest("{ }").unwrap(), vec![] as Vec<String>);
         assert_eq!(
             unnest("{1, 2, 3}").unwrap(),
             vec!["1".to_string(), "2".to_string(), "3".to_string()]
@@ -1046,7 +983,7 @@ mod tests {
             struct_cast(
                 StructValue::new(vec![
                     Some("1".into()),
-                    Some(OrderedF32::from(0.0).to_scalar_value()),
+                    Some(F32::from(0.0).to_scalar_value()),
                 ])
                 .as_scalar_ref(),
                 &StructType::new(vec![
@@ -1076,4 +1013,14 @@ mod tests {
         let timestamp2 = str_to_timestamp(str2).unwrap();
         assert_eq!(timestamp2.0.timestamp_micros(), -1);
     }
+
+    #[test]
+    fn test_timestamp() {
+        assert_eq!(
+            try_cast::<_, Timestamp>(Date::from_ymd_uncheck(1994, 1, 1)).unwrap(),
+            Timestamp::new(
+                NaiveDateTime::parse_from_str("1994-1-1 0:0:0", "%Y-%m-%d %H:%M:%S").unwrap()
+            )
+        )
+    }
 }
diff --git a/src/expr/src/vector_op/cmp.rs b/src/expr/src/vector_op/cmp.rs
index f329595b4d8e3..e491851413a6c 100644
--- a/src/expr/src/vector_op/cmp.rs
+++ b/src/expr/src/vector_op/cmp.rs
@@ -14,11 +14,24 @@
 
 use std::fmt::Debug;
 
-use risingwave_common::array::{ListRef, StructRef};
+use risingwave_common::array::{Array, BoolArray};
+use risingwave_common::buffer::Bitmap;
+use risingwave_expr_macro::function;
 
-use crate::Result;
-
-#[inline(always)]
+#[function("equal(*number, *number) -> boolean")]
+#[function("equal(serial, serial) -> boolean")]
+#[function("equal(date, date) -> boolean")]
+#[function("equal(time, time) -> boolean")]
+#[function("equal(interval, interval) -> boolean")]
+#[function("equal(timestamp, timestamp) -> boolean")]
+#[function("equal(timestamptz, timestamptz) -> boolean")]
+#[function("equal(date, timestamp) -> boolean")]
+#[function("equal(timestamp, date) -> boolean")]
+#[function("equal(time, interval) -> boolean")]
+#[function("equal(interval, time) -> boolean")]
+#[function("equal(varchar, varchar) -> boolean")]
+#[function("equal(list, list) -> boolean")]
+#[function("equal(struct, struct) -> boolean")]
 pub fn general_eq<T1, T2, T3>(l: T1, r: T2) -> bool
 where
     T1: Into<T3> + Debug,
@@ -28,7 +41,20 @@ where
     l.into() == r.into()
 }
 
-#[inline(always)]
+#[function("not_equal(*number, *number) -> boolean")]
+#[function("not_equal(serial, serial) -> boolean")]
+#[function("not_equal(date, date) -> boolean")]
+#[function("not_equal(time, time) -> boolean")]
+#[function("not_equal(interval, interval) -> boolean")]
+#[function("not_equal(timestamp, timestamp) -> boolean")]
+#[function("not_equal(timestamptz, timestamptz) -> boolean")]
+#[function("not_equal(date, timestamp) -> boolean")]
+#[function("not_equal(timestamp, date) -> boolean")]
+#[function("not_equal(time, interval) -> boolean")]
+#[function("not_equal(interval, time) -> boolean")]
+#[function("not_equal(varchar, varchar) -> boolean")]
+#[function("not_equal(list, list) -> boolean")]
+#[function("not_equal(struct, struct) -> boolean")]
 pub fn general_ne<T1, T2, T3>(l: T1, r: T2) -> bool
 where
     T1: Into<T3> + Debug,
@@ -38,7 +64,20 @@ where
     l.into() != r.into()
 }
 
-#[inline(always)]
+#[function("greater_than_or_equal(*number, *number) -> boolean")]
+#[function("greater_than_or_equal(serial, serial) -> boolean")]
+#[function("greater_than_or_equal(date, date) -> boolean")]
+#[function("greater_than_or_equal(time, time) -> boolean")]
+#[function("greater_than_or_equal(interval, interval) -> boolean")]
+#[function("greater_than_or_equal(timestamp, timestamp) -> boolean")]
+#[function("greater_than_or_equal(timestamptz, timestamptz) -> boolean")]
+#[function("greater_than_or_equal(date, timestamp) -> boolean")]
+#[function("greater_than_or_equal(timestamp, date) -> boolean")]
+#[function("greater_than_or_equal(time, interval) -> boolean")]
+#[function("greater_than_or_equal(interval, time) -> boolean")]
+#[function("greater_than_or_equal(varchar, varchar) -> boolean")]
+#[function("greater_than_or_equal(list, list) -> boolean")]
+#[function("greater_than_or_equal(struct, struct) -> boolean")]
 pub fn general_ge<T1, T2, T3>(l: T1, r: T2) -> bool
 where
     T1: Into<T3> + Debug,
@@ -48,7 +87,20 @@ where
     l.into() >= r.into()
 }
 
-#[inline(always)]
+#[function("greater_than(*number, *number) -> boolean")]
+#[function("greater_than(serial, serial) -> boolean")]
+#[function("greater_than(date, date) -> boolean")]
+#[function("greater_than(time, time) -> boolean")]
+#[function("greater_than(interval, interval) -> boolean")]
+#[function("greater_than(timestamp, timestamp) -> boolean")]
+#[function("greater_than(timestamptz, timestamptz) -> boolean")]
+#[function("greater_than(date, timestamp) -> boolean")]
+#[function("greater_than(timestamp, date) -> boolean")]
+#[function("greater_than(time, interval) -> boolean")]
+#[function("greater_than(interval, time) -> boolean")]
+#[function("greater_than(varchar, varchar) -> boolean")]
+#[function("greater_than(list, list) -> boolean")]
+#[function("greater_than(struct, struct) -> boolean")]
 pub fn general_gt<T1, T2, T3>(l: T1, r: T2) -> bool
 where
     T1: Into<T3> + Debug,
@@ -58,7 +110,20 @@ where
     l.into() > r.into()
 }
 
-#[inline(always)]
+#[function("less_than_or_equal(*number, *number) -> boolean")]
+#[function("less_than_or_equal(serial, serial) -> boolean")]
+#[function("less_than_or_equal(date, date) -> boolean")]
+#[function("less_than_or_equal(time, time) -> boolean")]
+#[function("less_than_or_equal(interval, interval) -> boolean")]
+#[function("less_than_or_equal(timestamp, timestamp) -> boolean")]
+#[function("less_than_or_equal(timestamptz, timestamptz) -> boolean")]
+#[function("less_than_or_equal(date, timestamp) -> boolean")]
+#[function("less_than_or_equal(timestamp, date) -> boolean")]
+#[function("less_than_or_equal(time, interval) -> boolean")]
+#[function("less_than_or_equal(interval, time) -> boolean")]
+#[function("less_than_or_equal(varchar, varchar) -> boolean")]
+#[function("less_than_or_equal(list, list) -> boolean")]
+#[function("less_than_or_equal(struct, struct) -> boolean")]
 pub fn general_le<T1, T2, T3>(l: T1, r: T2) -> bool
 where
     T1: Into<T3> + Debug,
@@ -68,7 +133,20 @@ where
     l.into() <= r.into()
 }
 
-#[inline(always)]
+#[function("less_than(*number, *number) -> boolean")]
+#[function("less_than(serial, serial) -> boolean")]
+#[function("less_than(date, date) -> boolean")]
+#[function("less_than(time, time) -> boolean")]
+#[function("less_than(interval, interval) -> boolean")]
+#[function("less_than(timestamp, timestamp) -> boolean")]
+#[function("less_than(timestamptz, timestamptz) -> boolean")]
+#[function("less_than(date, timestamp) -> boolean")]
+#[function("less_than(timestamp, date) -> boolean")]
+#[function("less_than(time, interval) -> boolean")]
+#[function("less_than(interval, time) -> boolean")]
+#[function("less_than(varchar, varchar) -> boolean")]
+#[function("less_than(list, list) -> boolean")]
+#[function("less_than(struct, struct) -> boolean")]
 pub fn general_lt<T1, T2, T3>(l: T1, r: T2) -> bool
 where
     T1: Into<T3> + Debug,
@@ -78,136 +156,197 @@ where
     l.into() < r.into()
 }
 
+#[function("is_distinct_from(*number, *number) -> boolean")]
+#[function("is_distinct_from(serial, serial) -> boolean")]
+#[function("is_distinct_from(date, date) -> boolean")]
+#[function("is_distinct_from(time, time) -> boolean")]
+#[function("is_distinct_from(interval, interval) -> boolean")]
+#[function("is_distinct_from(timestamp, timestamp) -> boolean")]
+#[function("is_distinct_from(timestamptz, timestamptz) -> boolean")]
+#[function("is_distinct_from(date, timestamp) -> boolean")]
+#[function("is_distinct_from(timestamp, date) -> boolean")]
+#[function("is_distinct_from(time, interval) -> boolean")]
+#[function("is_distinct_from(interval, time) -> boolean")]
+#[function("is_distinct_from(varchar, varchar) -> boolean")]
+#[function("is_distinct_from(list, list) -> boolean")]
+#[function("is_distinct_from(struct, struct) -> boolean")]
 pub fn general_is_distinct_from<T1, T2, T3>(l: Option<T1>, r: Option<T2>) -> bool
 where
     T1: Into<T3> + Debug,
     T2: Into<T3> + Debug,
     T3: Ord,
 {
-    match (l, r) {
-        (Some(lv), Some(rv)) => general_ne::<T1, T2, T3>(lv, rv),
-        (Some(_), None) => true,
-        (None, Some(_)) => true,
-        (None, None) => false,
-    }
+    l.map(Into::into) != r.map(Into::into)
 }
 
+#[function("is_not_distinct_from(*number, *number) -> boolean")]
+#[function("is_not_distinct_from(serial, serial) -> boolean")]
+#[function("is_not_distinct_from(date, date) -> boolean")]
+#[function("is_not_distinct_from(time, time) -> boolean")]
+#[function("is_not_distinct_from(interval, interval) -> boolean")]
+#[function("is_not_distinct_from(timestamp, timestamp) -> boolean")]
+#[function("is_not_distinct_from(timestamptz, timestamptz) -> boolean")]
+#[function("is_not_distinct_from(date, timestamp) -> boolean")]
+#[function("is_not_distinct_from(timestamp, date) -> boolean")]
+#[function("is_not_distinct_from(time, interval) -> boolean")]
+#[function("is_not_distinct_from(interval, time) -> boolean")]
+#[function("is_not_distinct_from(varchar, varchar) -> boolean")]
+#[function("is_not_distinct_from(list, list) -> boolean")]
+#[function("is_not_distinct_from(struct, struct) -> boolean")]
 pub fn general_is_not_distinct_from<T1, T2, T3>(l: Option<T1>, r: Option<T2>) -> bool
 where
     T1: Into<T3> + Debug,
     T2: Into<T3> + Debug,
     T3: Ord,
 {
-    match (l, r) {
-        (Some(lv), Some(rv)) => general_eq::<T1, T2, T3>(lv, rv),
-        (Some(_), None) => false,
-        (None, Some(_)) => false,
-        (None, None) => true,
-    }
+    l.map(Into::into) == r.map(Into::into)
 }
 
-#[derive(Clone, Copy, Debug)]
-pub enum Comparison {
-    Eq,
-    Ne,
-    Lt,
-    Gt,
-    Le,
-    Ge,
-}
-
-pub(crate) static EQ: Comparison = Comparison::Eq;
-pub(crate) static NE: Comparison = Comparison::Ne;
-pub(crate) static LT: Comparison = Comparison::Lt;
-pub(crate) static GT: Comparison = Comparison::Gt;
-pub(crate) static LE: Comparison = Comparison::Le;
-pub(crate) static GE: Comparison = Comparison::Ge;
-
-#[inline(always)]
-pub fn gen_struct_cmp(op: Comparison) -> fn(StructRef<'_>, StructRef<'_>) -> Result<bool> {
-    use crate::gen_cmp;
-    gen_cmp!(op)
-}
-
-#[inline(always)]
-pub fn gen_list_cmp(op: Comparison) -> fn(ListRef<'_>, ListRef<'_>) -> Result<bool> {
-    use crate::gen_cmp;
-    gen_cmp!(op)
-}
-
-#[inline(always)]
-pub fn gen_str_cmp(op: Comparison) -> fn(&str, &str) -> Result<bool> {
-    use crate::gen_cmp;
-    gen_cmp!(op)
-}
-
-#[macro_export]
-macro_rules! gen_cmp {
-    ($op:expr) => {
-        match $op {
-            Comparison::Eq => |l, r| Ok(l == r),
-            Comparison::Ne => |l, r| Ok(l != r),
-            Comparison::Lt => |l, r| Ok(l < r),
-            Comparison::Gt => |l, r| Ok(l > r),
-            Comparison::Le => |l, r| Ok(l <= r),
-            Comparison::Ge => |l, r| Ok(l >= r),
-        }
-    };
-}
-
-pub fn str_is_distinct_from(l: Option<&str>, r: Option<&str>) -> Result<Option<bool>> {
-    match (l, r) {
-        (Some(lv), Some(rv)) => Ok(Some(lv != rv)),
-        (Some(_), None) => Ok(Some(true)),
-        (None, Some(_)) => Ok(Some(true)),
-        (None, None) => Ok(Some(false)),
-    }
+#[function("equal(boolean, boolean) -> boolean", batch = "boolarray_eq")]
+pub fn boolean_eq(l: bool, r: bool) -> bool {
+    l == r
 }
 
-pub fn str_is_not_distinct_from(l: Option<&str>, r: Option<&str>) -> Result<Option<bool>> {
-    match (l, r) {
-        (Some(lv), Some(rv)) => Ok(Some(lv == rv)),
-        (Some(_), None) => Ok(Some(false)),
-        (None, Some(_)) => Ok(Some(false)),
-        (None, None) => Ok(Some(true)),
-    }
+#[function("not_equal(boolean, boolean) -> boolean", batch = "boolarray_ne")]
+pub fn boolean_ne(l: bool, r: bool) -> bool {
+    l != r
+}
+
+#[function(
+    "greater_than_or_equal(boolean, boolean) -> boolean",
+    batch = "boolarray_ge"
+)]
+pub fn boolean_ge(l: bool, r: bool) -> bool {
+    l >= r
+}
+
+#[allow(clippy::bool_comparison)]
+#[function("greater_than(boolean, boolean) -> boolean", batch = "boolarray_gt")]
+pub fn boolean_gt(l: bool, r: bool) -> bool {
+    l > r
+}
+
+#[function(
+    "less_than_or_equal(boolean, boolean) -> boolean",
+    batch = "boolarray_le"
+)]
+pub fn boolean_le(l: bool, r: bool) -> bool {
+    l <= r
 }
 
-#[inline(always)]
-pub fn is_true(v: Option<bool>) -> Option<bool> {
-    Some(v == Some(true))
+#[allow(clippy::bool_comparison)]
+#[function("less_than(boolean, boolean) -> boolean", batch = "boolarray_lt")]
+pub fn boolean_lt(l: bool, r: bool) -> bool {
+    l < r
 }
 
-#[inline(always)]
-pub fn is_not_true(v: Option<bool>) -> Option<bool> {
-    Some(v != Some(true))
+#[function(
+    "is_distinct_from(boolean, boolean) -> boolean",
+    batch = "boolarray_is_distinct_from"
+)]
+pub fn boolean_is_distinct_from(l: Option<bool>, r: Option<bool>) -> bool {
+    l != r
 }
 
-#[inline(always)]
-pub fn is_false(v: Option<bool>) -> Option<bool> {
-    Some(v == Some(false))
+#[function(
+    "is_not_distinct_from(boolean, boolean) -> boolean",
+    batch = "boolarray_is_not_distinct_from"
+)]
+pub fn boolean_is_not_distinct_from(l: Option<bool>, r: Option<bool>) -> bool {
+    l == r
+}
+
+#[function("is_true(boolean) -> boolean", batch = "boolarray_is_true")]
+pub fn is_true(v: Option<bool>) -> bool {
+    v == Some(true)
+}
+
+#[function("is_not_true(boolean) -> boolean", batch = "boolarray_is_not_true")]
+pub fn is_not_true(v: Option<bool>) -> bool {
+    v != Some(true)
+}
+
+#[function("is_false(boolean) -> boolean", batch = "boolarray_is_false")]
+pub fn is_false(v: Option<bool>) -> bool {
+    v == Some(false)
+}
+
+#[function("is_not_false(boolean) -> boolean", batch = "boolarray_is_not_false")]
+pub fn is_not_false(v: Option<bool>) -> bool {
+    v != Some(false)
+}
+
+// optimized functions for bool arrays
+
+fn boolarray_eq(l: &BoolArray, r: &BoolArray) -> BoolArray {
+    let data = !(l.data() ^ r.data());
+    let bitmap = l.null_bitmap() & r.null_bitmap();
+    BoolArray::new(data, bitmap)
 }
 
-#[inline(always)]
-pub fn is_not_false(v: Option<bool>) -> Option<bool> {
-    Some(v != Some(false))
+fn boolarray_ne(l: &BoolArray, r: &BoolArray) -> BoolArray {
+    let data = l.data() ^ r.data();
+    let bitmap = l.null_bitmap() & r.null_bitmap();
+    BoolArray::new(data, bitmap)
 }
 
-#[inline(always)]
-pub fn is_unknown(v: Option<bool>) -> Option<bool> {
-    Some(v.is_none())
+fn boolarray_gt(l: &BoolArray, r: &BoolArray) -> BoolArray {
+    let data = l.data() & !r.data();
+    let bitmap = l.null_bitmap() & r.null_bitmap();
+    BoolArray::new(data, bitmap)
 }
 
-#[inline(always)]
-pub fn is_not_unknown(v: Option<bool>) -> Option<bool> {
-    Some(v.is_some())
+fn boolarray_lt(l: &BoolArray, r: &BoolArray) -> BoolArray {
+    let data = !l.data() & r.data();
+    let bitmap = l.null_bitmap() & r.null_bitmap();
+    BoolArray::new(data, bitmap)
+}
+
+fn boolarray_ge(l: &BoolArray, r: &BoolArray) -> BoolArray {
+    let data = l.data() | !r.data();
+    let bitmap = l.null_bitmap() & r.null_bitmap();
+    BoolArray::new(data, bitmap)
+}
+
+fn boolarray_le(l: &BoolArray, r: &BoolArray) -> BoolArray {
+    let data = !l.data() | r.data();
+    let bitmap = l.null_bitmap() & r.null_bitmap();
+    BoolArray::new(data, bitmap)
+}
+
+fn boolarray_is_distinct_from(l: &BoolArray, r: &BoolArray) -> BoolArray {
+    let data = ((l.data() ^ r.data()) & (l.null_bitmap() & r.null_bitmap()))
+        | (l.null_bitmap() ^ r.null_bitmap());
+    BoolArray::new(data, Bitmap::ones(l.len()))
+}
+
+fn boolarray_is_not_distinct_from(l: &BoolArray, r: &BoolArray) -> BoolArray {
+    let data = !(((l.data() ^ r.data()) & (l.null_bitmap() & r.null_bitmap()))
+        | (l.null_bitmap() ^ r.null_bitmap()));
+    BoolArray::new(data, Bitmap::ones(l.len()))
+}
+
+fn boolarray_is_true(a: &BoolArray) -> BoolArray {
+    BoolArray::new(a.to_bitmap(), Bitmap::ones(a.len()))
+}
+
+fn boolarray_is_not_true(a: &BoolArray) -> BoolArray {
+    BoolArray::new(!a.to_bitmap(), Bitmap::ones(a.len()))
+}
+
+fn boolarray_is_false(a: &BoolArray) -> BoolArray {
+    BoolArray::new(!a.data() & a.null_bitmap(), Bitmap::ones(a.len()))
+}
+
+fn boolarray_is_not_false(a: &BoolArray) -> BoolArray {
+    BoolArray::new(a.data() | !a.null_bitmap(), Bitmap::ones(a.len()))
 }
 
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;
 
-    use risingwave_common::types::Decimal;
+    use risingwave_common::types::{Decimal, F32, F64};
 
     use super::*;
 
@@ -218,4 +357,71 @@ mod tests {
             1.1f32
         ))
     }
+
+    #[test]
+    fn test_comparison() {
+        assert!(general_eq::<Decimal, i32, Decimal>(dec("1.0"), 1));
+        assert!(general_eq::<Decimal, f32, Decimal>(dec("1.0"), 1.0));
+        assert!(!general_ne::<Decimal, i32, Decimal>(dec("1.0"), 1));
+        assert!(!general_ne::<Decimal, f32, Decimal>(dec("1.0"), 1.0));
+        assert!(!general_gt::<Decimal, i32, Decimal>(dec("1.0"), 2));
+        assert!(!general_gt::<Decimal, f32, Decimal>(dec("1.0"), 2.0));
+        assert!(general_le::<Decimal, i32, Decimal>(dec("1.0"), 2));
+        assert!(general_le::<Decimal, f32, Decimal>(dec("1.0"), 2.1));
+        assert!(!general_ge::<Decimal, i32, Decimal>(dec("1.0"), 2));
+        assert!(!general_ge::<Decimal, f32, Decimal>(dec("1.0"), 2.1));
+        assert!(general_lt::<Decimal, i32, Decimal>(dec("1.0"), 2));
+        assert!(general_lt::<Decimal, f32, Decimal>(dec("1.0"), 2.1));
+        assert!(general_is_distinct_from::<Decimal, i32, Decimal>(
+            Some(dec("1.0")),
+            Some(2)
+        ));
+        assert!(general_is_distinct_from::<Decimal, f32, Decimal>(
+            Some(dec("1.0")),
+            Some(2.0)
+        ));
+        assert!(general_is_distinct_from::<Decimal, f32, Decimal>(
+            Some(dec("1.0")),
+            None
+        ));
+        assert!(general_is_distinct_from::<Decimal, i32, Decimal>(
+            None,
+            Some(1)
+        ));
+        assert!(!general_is_distinct_from::<Decimal, i32, Decimal>(
+            Some(dec("1.0")),
+            Some(1)
+        ));
+        assert!(!general_is_distinct_from::<Decimal, f32, Decimal>(
+            Some(dec("1.0")),
+            Some(1.0)
+        ));
+        assert!(!general_is_distinct_from::<Decimal, f32, Decimal>(
+            None, None
+        ));
+        assert!(general_eq::<F32, i32, F64>(1.0.into(), 1));
+        assert!(!general_ne::<F32, i32, F64>(1.0.into(), 1));
+        assert!(!general_lt::<F32, i32, F64>(1.0.into(), 1));
+        assert!(general_le::<F32, i32, F64>(1.0.into(), 1));
+        assert!(!general_gt::<F32, i32, F64>(1.0.into(), 1));
+        assert!(general_ge::<F32, i32, F64>(1.0.into(), 1));
+        assert!(!general_is_distinct_from::<F32, i32, F64>(
+            Some(1.0.into()),
+            Some(1)
+        ));
+        assert!(general_eq::<i64, i32, i64>(1i64, 1));
+        assert!(!general_ne::<i64, i32, i64>(1i64, 1));
+        assert!(!general_lt::<i64, i32, i64>(1i64, 1));
+        assert!(general_le::<i64, i32, i64>(1i64, 1));
+        assert!(!general_gt::<i64, i32, i64>(1i64, 1));
+        assert!(general_ge::<i64, i32, i64>(1i64, 1));
+        assert!(!general_is_distinct_from::<i64, i32, i64>(
+            Some(1i64),
+            Some(1)
+        ));
+    }
+
+    fn dec(s: &str) -> Decimal {
+        Decimal::from_str(s).unwrap()
+    }
 }
diff --git a/src/expr/src/vector_op/concat_op.rs b/src/expr/src/vector_op/concat_op.rs
index 0dc6da2e3f138..b6d362538a51f 100644
--- a/src/expr/src/vector_op/concat_op.rs
+++ b/src/expr/src/vector_op/concat_op.rs
@@ -14,13 +14,12 @@
 
 use std::fmt::Write;
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn concat_op(left: &str, right: &str, writer: &mut dyn Write) -> Result<()> {
+#[function("concat_op(varchar, varchar) -> varchar")]
+pub fn concat_op(left: &str, right: &str, writer: &mut dyn Write) {
     writer.write_str(left).unwrap();
     writer.write_str(right).unwrap();
-    Ok(())
 }
 
 #[cfg(test)]
@@ -30,7 +29,7 @@ mod tests {
     #[test]
     fn test_concat_op() {
         let mut s = String::new();
-        concat_op("114", "514", &mut s).unwrap();
+        concat_op("114", "514", &mut s);
         assert_eq!(s, "114514")
     }
 }
diff --git a/src/expr/src/vector_op/conjunction.rs b/src/expr/src/vector_op/conjunction.rs
index 2cf0f6c5eda33..c644b4bfba0fa 100644
--- a/src/expr/src/vector_op/conjunction.rs
+++ b/src/expr/src/vector_op/conjunction.rs
@@ -12,58 +12,66 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn and(l: Option<bool>, r: Option<bool>) -> Result<Option<bool>> {
+// see BinaryShortCircuitExpression
+// #[function("and(boolean, boolean) -> boolean")]
+pub fn and(l: Option<bool>, r: Option<bool>) -> Option<bool> {
     match (l, r) {
-        (Some(lb), Some(lr)) => Ok(Some(lb & lr)),
-        (Some(true), None) => Ok(None),
-        (None, Some(true)) => Ok(None),
-        (Some(false), None) => Ok(Some(false)),
-        (None, Some(false)) => Ok(Some(false)),
-        (None, None) => Ok(None),
+        (Some(lb), Some(lr)) => Some(lb & lr),
+        (Some(true), None) => None,
+        (None, Some(true)) => None,
+        (Some(false), None) => Some(false),
+        (None, Some(false)) => Some(false),
+        (None, None) => None,
     }
 }
 
-#[inline(always)]
-pub fn or(l: Option<bool>, r: Option<bool>) -> Result<Option<bool>> {
+// see BinaryShortCircuitExpression
+// #[function("or(boolean, boolean) -> boolean")]
+pub fn or(l: Option<bool>, r: Option<bool>) -> Option<bool> {
     match (l, r) {
-        (Some(lb), Some(lr)) => Ok(Some(lb | lr)),
-        (Some(true), None) => Ok(Some(true)),
-        (None, Some(true)) => Ok(Some(true)),
-        (Some(false), None) => Ok(None),
-        (None, Some(false)) => Ok(None),
-        (None, None) => Ok(None),
+        (Some(lb), Some(lr)) => Some(lb | lr),
+        (Some(true), None) => Some(true),
+        (None, Some(true)) => Some(true),
+        (Some(false), None) => None,
+        (None, Some(false)) => None,
+        (None, None) => None,
     }
 }
 
-#[inline(always)]
-pub fn not(l: Option<bool>) -> Option<bool> {
-    l.map(|v| !v)
+#[function("not(boolean) -> boolean")]
+pub fn not(v: bool) -> bool {
+    !v
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::vector_op::conjunction::{and, or};
+    use super::*;
 
     #[test]
     fn test_and() {
-        assert_eq!(Some(true), and(Some(true), Some(true)).unwrap());
-        assert_eq!(Some(false), and(Some(true), Some(false)).unwrap());
-        assert_eq!(Some(false), and(Some(false), Some(false)).unwrap());
-        assert_eq!(None, and(Some(true), None).unwrap());
-        assert_eq!(Some(false), and(Some(false), None).unwrap());
-        assert_eq!(None, and(None, None).unwrap());
+        assert_eq!(Some(true), and(Some(true), Some(true)));
+        assert_eq!(Some(false), and(Some(true), Some(false)));
+        assert_eq!(Some(false), and(Some(false), Some(false)));
+        assert_eq!(None, and(Some(true), None));
+        assert_eq!(Some(false), and(Some(false), None));
+        assert_eq!(None, and(None, None));
     }
 
     #[test]
     fn test_or() {
-        assert_eq!(Some(true), or(Some(true), Some(true)).unwrap());
-        assert_eq!(Some(true), or(Some(true), Some(false)).unwrap());
-        assert_eq!(Some(false), or(Some(false), Some(false)).unwrap());
-        assert_eq!(Some(true), or(Some(true), None).unwrap());
-        assert_eq!(None, or(Some(false), None).unwrap());
-        assert_eq!(None, or(None, None).unwrap());
+        assert_eq!(Some(true), or(Some(true), Some(true)));
+        assert_eq!(Some(true), or(Some(true), Some(false)));
+        assert_eq!(Some(false), or(Some(false), Some(false)));
+        assert_eq!(Some(true), or(Some(true), None));
+        assert_eq!(None, or(Some(false), None));
+        assert_eq!(None, or(None, None));
+    }
+
+    #[test]
+    fn test_not() {
+        assert!(!not(true));
+        assert!(not(false));
     }
 }
diff --git a/src/expr/src/vector_op/date_trunc.rs b/src/expr/src/vector_op/date_trunc.rs
index 0acb8f14a7453..c744d6cc8ad2a 100644
--- a/src/expr/src/vector_op/date_trunc.rs
+++ b/src/expr/src/vector_op/date_trunc.rs
@@ -12,12 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use risingwave_common::types::{IntervalUnit, NaiveDateTimeWrapper};
+use risingwave_common::types::{Interval, Timestamp};
+use risingwave_expr_macro::function;
 
+use super::timestamptz::{timestamp_at_time_zone, timestamptz_at_time_zone};
 use crate::{ExprError, Result};
 
-#[inline]
-pub fn date_trunc_timestamp(field: &str, ts: NaiveDateTimeWrapper) -> Result<NaiveDateTimeWrapper> {
+#[function("date_trunc(varchar, timestamp) -> timestamp")]
+pub fn date_trunc_timestamp(field: &str, ts: Timestamp) -> Result<Timestamp> {
     Ok(match field.to_ascii_lowercase().as_str() {
         "microseconds" => ts.truncate_micros(),
         "milliseconds" => ts.truncate_millis(),
@@ -36,8 +38,20 @@ pub fn date_trunc_timestamp(field: &str, ts: NaiveDateTimeWrapper) -> Result<Nai
     })
 }
 
-#[inline]
-pub fn date_trunc_interval(field: &str, interval: IntervalUnit) -> Result<IntervalUnit> {
+// #[function("date_trunc(varchar, timestamptz) -> timestamptz")]
+pub fn date_trunc_timestamptz(_field: &str, _ts: i64) -> Result<i64> {
+    todo!("date_trunc_timestamptz")
+}
+
+#[function("date_trunc(varchar, timestamptz, varchar) -> timestamptz")]
+pub fn date_trunc_timestamptz_at_timezone(field: &str, ts: i64, timezone: &str) -> Result<i64> {
+    let timestamp = timestamptz_at_time_zone(ts, timezone)?;
+    let truncated = date_trunc_timestamp(field, timestamp)?;
+    timestamp_at_time_zone(truncated, timezone)
+}
+
+#[function("date_trunc(varchar, interval) -> interval")]
+pub fn date_trunc_interval(field: &str, interval: Interval) -> Result<Interval> {
     Ok(match field.to_ascii_lowercase().as_str() {
         "microseconds" => interval,
         "milliseconds" => interval.truncate_millis(),
diff --git a/src/expr/src/vector_op/exp.rs b/src/expr/src/vector_op/exp.rs
index b9ae2fb8fc4da..e611a2ceee8c8 100644
--- a/src/expr/src/vector_op/exp.rs
+++ b/src/expr/src/vector_op/exp.rs
@@ -13,11 +13,13 @@
 // limitations under the License.
 
 use num_traits::{Float, Zero};
-use risingwave_common::types::OrderedF64;
+use risingwave_common::types::F64;
+use risingwave_expr_macro::function;
 
 use crate::{ExprError, Result};
 
-pub fn exp_f64(input: OrderedF64) -> Result<OrderedF64> {
+#[function("exp(float64) -> float64")]
+pub fn exp_f64(input: F64) -> Result<F64> {
     // The cases where the exponent value is Inf or NaN can be handled explicitly and without
     // evaluating the `exp` operation.
     if input.is_nan() {
@@ -46,7 +48,7 @@ pub fn exp_f64(input: OrderedF64) -> Result<OrderedF64> {
 
 #[cfg(test)]
 mod tests {
-    use risingwave_common::types::OrderedF64;
+    use risingwave_common::types::F64;
 
     use super::exp_f64;
     use crate::ExprError;
@@ -54,7 +56,7 @@ mod tests {
     #[test]
     fn legal_input() {
         let res = exp_f64(0.0.into()).unwrap();
-        assert_eq!(res, OrderedF64::from(1.0));
+        assert_eq!(res, F64::from(1.0));
     }
 
     #[test]
@@ -78,18 +80,18 @@ mod tests {
     #[test]
     fn nan() {
         let res = exp_f64(f64::NAN.into()).unwrap();
-        assert_eq!(res, OrderedF64::from(f64::NAN));
+        assert_eq!(res, F64::from(f64::NAN));
 
         let res = exp_f64((-f64::NAN).into()).unwrap();
-        assert_eq!(res, OrderedF64::from(-f64::NAN));
+        assert_eq!(res, F64::from(-f64::NAN));
     }
 
     #[test]
     fn infinity() {
         let res = exp_f64(f64::INFINITY.into()).unwrap();
-        assert_eq!(res, OrderedF64::from(f64::INFINITY));
+        assert_eq!(res, F64::from(f64::INFINITY));
 
         let res = exp_f64(f64::NEG_INFINITY.into()).unwrap();
-        assert_eq!(res, OrderedF64::from(0.0));
+        assert_eq!(res, F64::from(0.0));
     }
 }
diff --git a/src/expr/src/vector_op/extract.rs b/src/expr/src/vector_op/extract.rs
index a8605b36ba0ef..f69b22a2b4832 100644
--- a/src/expr/src/vector_op/extract.rs
+++ b/src/expr/src/vector_op/extract.rs
@@ -13,7 +13,8 @@
 // limitations under the License.
 
 use chrono::{Datelike, Timelike};
-use risingwave_common::types::{Decimal, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper};
+use risingwave_common::types::{Date, Decimal, Time, Timestamp};
+use risingwave_expr_macro::function;
 
 use crate::{ExprError, Result};
 
@@ -51,11 +52,13 @@ fn invalid_unit(name: &'static str, unit: &str) -> ExprError {
     }
 }
 
-pub fn extract_from_date(unit: &str, date: NaiveDateWrapper) -> Result<Decimal> {
+#[function("extract(varchar, date) -> decimal")]
+pub fn extract_from_date(unit: &str, date: Date) -> Result<Decimal> {
     extract_date(date.0, unit).ok_or_else(|| invalid_unit("date unit", unit))
 }
 
-pub fn extract_from_timestamp(unit: &str, timestamp: NaiveDateTimeWrapper) -> Result<Decimal> {
+#[function("extract(varchar, timestamp) -> decimal")]
+pub fn extract_from_timestamp(unit: &str, timestamp: Timestamp) -> Result<Decimal> {
     let time = timestamp.0;
 
     extract_date(time, unit)
@@ -63,6 +66,7 @@ pub fn extract_from_timestamp(unit: &str, timestamp: NaiveDateTimeWrapper) -> Re
         .ok_or_else(|| invalid_unit("timestamp unit", unit))
 }
 
+#[function("extract(varchar, timestamptz) -> decimal")]
 pub fn extract_from_timestamptz(unit: &str, usecs: i64) -> Result<Decimal> {
     match unit {
         "EPOCH" => Ok(Decimal::from(usecs) / 1_000_000.into()),
@@ -71,7 +75,8 @@ pub fn extract_from_timestamptz(unit: &str, usecs: i64) -> Result<Decimal> {
     }
 }
 
-pub fn extract_from_time(unit: &str, time: NaiveTimeWrapper) -> Result<Decimal> {
+#[function("extract(varchar, time) -> decimal")]
+pub fn extract_from_time(unit: &str, time: Time) -> Result<Decimal> {
     extract_time(time.0, unit).ok_or_else(|| invalid_unit("time unit", unit))
 }
 
@@ -83,8 +88,7 @@ mod tests {
 
     #[test]
     fn test_date() {
-        let date =
-            NaiveDateWrapper::new(NaiveDate::parse_from_str("2021-11-22", "%Y-%m-%d").unwrap());
+        let date = Date::new(NaiveDate::parse_from_str("2021-11-22", "%Y-%m-%d").unwrap());
         assert_eq!(extract_from_date("DAY", date).unwrap(), 22.into());
         assert_eq!(extract_from_date("MONTH", date).unwrap(), 11.into());
         assert_eq!(extract_from_date("YEAR", date).unwrap(), 2021.into());
@@ -94,7 +98,7 @@ mod tests {
 
     #[test]
     fn test_time() {
-        let time = NaiveDateTimeWrapper::new(
+        let time = Timestamp::new(
             NaiveDateTime::parse_from_str("2021-11-22 12:4:2", "%Y-%m-%d %H:%M:%S").unwrap(),
         );
         assert_eq!(extract_from_timestamp("HOUR", time).unwrap(), 12.into());
diff --git a/src/expr/src/vector_op/format_type.rs b/src/expr/src/vector_op/format_type.rs
index b18b734989cf6..a8e497e6aaacf 100644
--- a/src/expr/src/vector_op/format_type.rs
+++ b/src/expr/src/vector_op/format_type.rs
@@ -13,15 +13,14 @@
 // limitations under the License.
 
 use risingwave_common::types::DataType;
+use risingwave_expr_macro::function;
 
-use crate::Result;
-
-#[inline(always)]
-pub fn format_type(oid: Option<i32>, _typemod: Option<i32>) -> Result<Option<Box<str>>> {
+#[function("format_type(int32, int32) -> varchar")]
+pub fn format_type(oid: Option<i32>, _typemod: Option<i32>) -> Option<Box<str>> {
     // since we don't support type modifier, ignore it.
-    Ok(oid.map(|i| {
+    oid.map(|i| {
         DataType::from_oid(i)
             .map(|dt| format!("{}", dt).into_boxed_str())
             .unwrap_or("???".into())
-    }))
+    })
 }
diff --git a/src/expr/src/vector_op/jsonb_info.rs b/src/expr/src/vector_op/jsonb_info.rs
index 064e54959b3bd..68c96de378ef0 100644
--- a/src/expr/src/vector_op/jsonb_info.rs
+++ b/src/expr/src/vector_op/jsonb_info.rs
@@ -15,17 +15,16 @@
 use std::fmt::Write;
 
 use risingwave_common::array::JsonbRef;
+use risingwave_expr_macro::function;
 
 use crate::{ExprError, Result};
 
-#[inline(always)]
-pub fn jsonb_typeof(v: JsonbRef<'_>, writer: &mut dyn Write) -> Result<()> {
-    writer
-        .write_str(v.type_name())
-        .map_err(|e| ExprError::Internal(e.into()))
+#[function("jsonb_typeof(jsonb) -> varchar")]
+pub fn jsonb_typeof(v: JsonbRef<'_>, writer: &mut dyn Write) {
+    writer.write_str(v.type_name()).unwrap()
 }
 
-#[inline(always)]
+#[function("jsonb_array_length(jsonb) -> int32")]
 pub fn jsonb_array_length(v: JsonbRef<'_>) -> Result<i32> {
     v.array_len()
         .map(|n| n as i32)
diff --git a/src/expr/src/vector_op/length.rs b/src/expr/src/vector_op/length.rs
index dc071b807afb0..e0ea6ff69d8da 100644
--- a/src/expr/src/vector_op/length.rs
+++ b/src/expr/src/vector_op/length.rs
@@ -12,21 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn length_default(s: &str) -> Result<i32> {
-    Ok(s.chars().count() as i32)
+#[function("length(varchar) -> int32")]
+#[function("char_length(varchar) -> int32")]
+pub fn length(s: &str) -> i32 {
+    s.chars().count() as i32
 }
 
-#[inline(always)]
-pub fn octet_length(s: &str) -> Result<i32> {
-    Ok(s.as_bytes().len() as i32)
+#[function("octet_length(varchar) -> int32")]
+pub fn octet_length(s: &str) -> i32 {
+    s.as_bytes().len() as i32
 }
 
-#[inline(always)]
-pub fn bit_length(s: &str) -> Result<i32> {
-    octet_length(s).map(|n| n * 8)
+#[function("bit_length(varchar) -> int32")]
+pub fn bit_length(s: &str) -> i32 {
+    octet_length(s) * 8
 }
 
 #[cfg(test)]
@@ -39,7 +40,7 @@ mod tests {
         let cases = [("hello world", 11), ("hello rust", 10)];
 
         for (s, expected) in cases {
-            assert_eq!(length_default(s).unwrap(), expected)
+            assert_eq!(length(s), expected);
         }
     }
 
@@ -48,7 +49,7 @@ mod tests {
         let cases = [("hello world", 11), ("你好", 6), ("😇哈哈hhh", 13)];
 
         for (s, expected) in cases {
-            assert_eq!(octet_length(s).unwrap(), expected)
+            assert_eq!(octet_length(s), expected);
         }
     }
 
@@ -61,7 +62,7 @@ mod tests {
         ];
 
         for (s, expected) in cases {
-            assert_eq!(bit_length(s).unwrap(), expected)
+            assert_eq!(bit_length(s), expected);
         }
     }
 }
diff --git a/src/expr/src/vector_op/like.rs b/src/expr/src/vector_op/like.rs
index c6778ab3e1016..3b94990c68279 100644
--- a/src/expr/src/vector_op/like.rs
+++ b/src/expr/src/vector_op/like.rs
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn like_default(s: &str, p: &str) -> Result<bool> {
+#[function("like(varchar, varchar) -> boolean")]
+pub fn like_default(s: &str, p: &str) -> bool {
     let (mut px, mut sx) = (0, 0);
     let (mut next_px, mut next_sx) = (0, 0);
     let (pbytes, sbytes) = (p.as_bytes(), s.as_bytes());
@@ -50,9 +50,9 @@ pub fn like_default(s: &str, p: &str) -> Result<bool> {
             sx = next_sx;
             continue;
         }
-        return Ok(false);
+        return false;
     }
-    Ok(true)
+    true
 }
 
 #[cfg(test)]
@@ -84,7 +84,7 @@ mod tests {
     #[test]
     fn test_like() {
         for (target, pattern, expected) in CASES {
-            let output = like_default(target, pattern).unwrap();
+            let output = like_default(target, pattern);
             assert_eq!(
                 output,
                 expected.unwrap(),
diff --git a/src/expr/src/vector_op/lower.rs b/src/expr/src/vector_op/lower.rs
index c895c10c97f11..c76de5b129c27 100644
--- a/src/expr/src/vector_op/lower.rs
+++ b/src/expr/src/vector_op/lower.rs
@@ -14,14 +14,13 @@
 
 use std::fmt::Write;
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn lower(s: &str, writer: &mut dyn Write) -> Result<()> {
+#[function("lower(varchar) -> varchar")]
+pub fn lower(s: &str, writer: &mut dyn Write) {
     for c in s.chars() {
         writer.write_char(c.to_ascii_lowercase()).unwrap();
     }
-    Ok(())
 }
 
 #[cfg(test)]
@@ -29,7 +28,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_lower() -> Result<()> {
+    fn test_lower() {
         let cases = [
             ("HELLO WORLD", "hello world"),
             ("hello RUST", "hello rust"),
@@ -38,9 +37,8 @@ mod tests {
 
         for (s, expected) in cases {
             let mut writer = String::new();
-            lower(s, &mut writer)?;
+            lower(s, &mut writer);
             assert_eq!(writer, expected);
         }
-        Ok(())
     }
 }
diff --git a/src/expr/src/vector_op/ltrim.rs b/src/expr/src/vector_op/ltrim.rs
deleted file mode 100644
index c542d9039ffff..0000000000000
--- a/src/expr/src/vector_op/ltrim.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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::Write;
-
-use crate::Result;
-
-/// Note: the behavior of `ltrim` in `PostgreSQL` and `trim_start` (or `trim_left`) in Rust
-/// are actually different when the string is in right-to-left languages like Arabic or Hebrew.
-/// Since we would like to simplify the implementation, currently we omit this case.
-#[inline(always)]
-pub fn ltrim(s: &str, writer: &mut dyn Write) -> Result<()> {
-    writer.write_str(s.trim_start()).unwrap();
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-
-    #[test]
-    fn test_ltrim() -> Result<()> {
-        let cases = [
-            (" \tHello\tworld\t", "Hello\tworld\t"),
-            (" \t空I ❤️ databases空 ", "空I ❤️ databases空 "),
-        ];
-
-        for (s, expected) in cases {
-            let mut writer = String::new();
-            ltrim(s, &mut writer)?;
-            assert_eq!(writer, expected);
-        }
-        Ok(())
-    }
-}
diff --git a/src/expr/src/vector_op/md5.rs b/src/expr/src/vector_op/md5.rs
index 780526d893c84..44c6b4ea1a7eb 100644
--- a/src/expr/src/vector_op/md5.rs
+++ b/src/expr/src/vector_op/md5.rs
@@ -14,12 +14,11 @@
 
 use std::fmt::Write;
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn md5(s: &str, writer: &mut dyn Write) -> Result<()> {
+#[function("md5(varchar) -> varchar")]
+pub fn md5(s: &str, writer: &mut dyn Write) {
     write!(writer, "{:x}", ::md5::compute(s)).unwrap();
-    Ok(())
 }
 
 #[cfg(test)]
@@ -27,7 +26,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_md5() -> Result<()> {
+    fn test_md5() {
         let cases = [
             ("hello world", "5eb63bbbe01eeed093cb22bb8f5acdc3"),
             ("hello RUST", "917b821a0a5f23ab0cfdb36056d2eb9d"),
@@ -39,9 +38,8 @@ mod tests {
 
         for (s, expected) in cases {
             let mut writer = String::new();
-            md5(s, &mut writer)?;
+            md5(s, &mut writer);
             assert_eq!(writer, expected);
         }
-        Ok(())
     }
 }
diff --git a/src/expr/src/vector_op/mod.rs b/src/expr/src/vector_op/mod.rs
index 164e433ad9dde..4c25c1e88700d 100644
--- a/src/expr/src/vector_op/mod.rs
+++ b/src/expr/src/vector_op/mod.rs
@@ -29,24 +29,19 @@ pub mod jsonb_info;
 pub mod length;
 pub mod like;
 pub mod lower;
-pub mod ltrim;
 pub mod md5;
 pub mod overlay;
 pub mod position;
 pub mod repeat;
 pub mod replace;
 pub mod round;
-pub mod rtrim;
 pub mod split_part;
+pub mod string;
 pub mod substr;
 pub mod timestamptz;
 pub mod to_char;
 pub mod to_timestamp;
 pub mod translate;
 pub mod trim;
-pub mod trim_characters;
 pub mod tumble;
 pub mod upper;
-
-#[cfg(test)]
-mod tests;
diff --git a/src/expr/src/vector_op/overlay.rs b/src/expr/src/vector_op/overlay.rs
index e83251f7ff362..928d573c47485 100644
--- a/src/expr/src/vector_op/overlay.rs
+++ b/src/expr/src/vector_op/overlay.rs
@@ -14,15 +14,17 @@
 
 use std::fmt::Write;
 
+use risingwave_expr_macro::function;
+
 use crate::{ExprError, Result};
 
-#[inline(always)]
+#[function("overlay(varchar, varchar, int32) -> varchar")]
 pub fn overlay(s: &str, new_sub_str: &str, start: i32, writer: &mut dyn Write) -> Result<()> {
     // If count is omitted, it defaults to the length of new_sub_str.
     overlay_for(s, new_sub_str, start, new_sub_str.len() as i32, writer)
 }
 
-#[inline(always)]
+#[function("overlay(varchar, varchar, int32, int32) -> varchar")]
 pub fn overlay_for(
     s: &str,
     new_sub_str: &str,
diff --git a/src/expr/src/vector_op/position.rs b/src/expr/src/vector_op/position.rs
index 5e2721687f24e..9049e743a4f70 100644
--- a/src/expr/src/vector_op/position.rs
+++ b/src/expr/src/vector_op/position.rs
@@ -12,12 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use risingwave_expr_macro::function;
+
 use crate::Result;
 
-#[inline(always)]
 /// Location of specified substring
 ///
 /// Note: According to pgsql, position will return 0 rather -1 when substr is not in the target str
+#[function("position(varchar, varchar) -> int32")]
 pub fn position(str: &str, sub_str: &str) -> Result<i32> {
     match str.find(sub_str) {
         Some(byte_idx) => Ok((str[..byte_idx].chars().count() + 1) as i32),
diff --git a/src/expr/src/vector_op/repeat.rs b/src/expr/src/vector_op/repeat.rs
index bd5f490de6008..b46076b8eeefd 100644
--- a/src/expr/src/vector_op/repeat.rs
+++ b/src/expr/src/vector_op/repeat.rs
@@ -14,14 +14,13 @@
 
 use std::fmt::Write;
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn repeat(s: &str, count: i32, writer: &mut dyn Write) -> Result<()> {
+#[function("repeat(varchar, int32) -> varchar")]
+pub fn repeat(s: &str, count: i32, writer: &mut dyn Write) {
     for _ in 0..count {
         writer.write_str(s).unwrap();
     }
-    Ok(())
 }
 
 #[cfg(test)]
@@ -29,7 +28,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_repeat() -> Result<()> {
+    fn test_repeat() {
         let cases = vec![
             ("hello, world", 1, "hello, world"),
             ("114514", 3, "114514114514114514"),
@@ -39,9 +38,8 @@ mod tests {
 
         for (s, count, expected) in cases {
             let mut writer = String::new();
-            repeat(s, count, &mut writer)?;
+            repeat(s, count, &mut writer);
             assert_eq!(writer, expected);
         }
-        Ok(())
     }
 }
diff --git a/src/expr/src/vector_op/replace.rs b/src/expr/src/vector_op/replace.rs
index ef530d4ba02bb..02eeefdc8490e 100644
--- a/src/expr/src/vector_op/replace.rs
+++ b/src/expr/src/vector_op/replace.rs
@@ -14,13 +14,13 @@
 
 use std::fmt::Write;
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn replace(s: &str, from_str: &str, to_str: &str, writer: &mut dyn Write) -> Result<()> {
+#[function("replace(varchar, varchar, varchar) -> varchar")]
+pub fn replace(s: &str, from_str: &str, to_str: &str, writer: &mut dyn Write) {
     if from_str.is_empty() {
         writer.write_str(s).unwrap();
-        return Ok(());
+        return;
     }
     let mut last = 0;
     while let Some(mut start) = s[last..].find(from_str) {
@@ -30,7 +30,6 @@ pub fn replace(s: &str, from_str: &str, to_str: &str, writer: &mut dyn Write) ->
         last = start + from_str.len();
     }
     writer.write_str(&s[last..]).unwrap();
-    Ok(())
 }
 
 #[cfg(test)]
@@ -38,7 +37,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_replace() -> Result<()> {
+    fn test_replace() {
         let cases = vec![
             ("hello, word", "我的", "world", "hello, word"),
             ("hello, word", "", "world", "hello, word"),
@@ -50,9 +49,8 @@ mod tests {
 
         for (s, from_str, to_str, expected) in cases {
             let mut writer = String::new();
-            replace(s, from_str, to_str, &mut writer)?;
+            replace(s, from_str, to_str, &mut writer);
             assert_eq!(writer, expected);
         }
-        Ok(())
     }
 }
diff --git a/src/expr/src/vector_op/round.rs b/src/expr/src/vector_op/round.rs
index 307a47583816d..fddf2c3140873 100644
--- a/src/expr/src/vector_op/round.rs
+++ b/src/expr/src/vector_op/round.rs
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use risingwave_common::types::{Decimal, OrderedF64};
+use risingwave_common::types::{Decimal, F64};
+use risingwave_expr_macro::function;
 
-#[inline(always)]
+#[function("round_digit(decimal, int32) -> decimal")]
 pub fn round_digits<D: Into<i32>>(input: Decimal, digits: D) -> Decimal {
     let digits = digits.into();
     if digits < 0 {
@@ -25,43 +26,44 @@ pub fn round_digits<D: Into<i32>>(input: Decimal, digits: D) -> Decimal {
     }
 }
 
-#[inline(always)]
-pub fn ceil_f64(input: OrderedF64) -> OrderedF64 {
+#[function("ceil(float64) -> float64")]
+pub fn ceil_f64(input: F64) -> F64 {
     f64::ceil(input.0).into()
 }
 
-#[inline(always)]
+#[function("ceil(decimal) -> decimal")]
 pub fn ceil_decimal(input: Decimal) -> Decimal {
     input.ceil()
 }
 
-#[inline(always)]
-pub fn floor_f64(input: OrderedF64) -> OrderedF64 {
+#[function("floor(float64) -> float64")]
+pub fn floor_f64(input: F64) -> F64 {
     f64::floor(input.0).into()
 }
 
-#[inline(always)]
+#[function("floor(decimal) -> decimal")]
 pub fn floor_decimal(input: Decimal) -> Decimal {
     input.floor()
 }
 
 // Ties are broken by rounding away from zero
-#[inline(always)]
-pub fn round_f64(input: OrderedF64) -> OrderedF64 {
+#[function("round(float64) -> float64")]
+pub fn round_f64(input: F64) -> F64 {
     f64::round(input.0).into()
 }
 
 // Ties are broken by rounding away from zero
-#[inline(always)]
+#[function("round(decimal) -> decimal")]
 pub fn round_decimal(input: Decimal) -> Decimal {
     input.round_dp(0)
 }
+
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;
 
     use num_traits::FromPrimitive;
-    use risingwave_common::types::{Decimal, OrderedF64};
+    use risingwave_common::types::{Decimal, F64};
 
     use super::ceil_f64;
     use crate::vector_op::round::*;
@@ -86,15 +88,15 @@ mod tests {
 
     #[test]
     fn test_round_f64() {
-        assert_eq!(ceil_f64(OrderedF64::from(42.2)), OrderedF64::from(43.0));
-        assert_eq!(ceil_f64(OrderedF64::from(-42.8)), OrderedF64::from(-42.0));
+        assert_eq!(ceil_f64(F64::from(42.2)), F64::from(43.0));
+        assert_eq!(ceil_f64(F64::from(-42.8)), F64::from(-42.0));
 
-        assert_eq!(floor_f64(OrderedF64::from(42.8)), OrderedF64::from(42.0));
-        assert_eq!(floor_f64(OrderedF64::from(-42.8)), OrderedF64::from(-43.0));
+        assert_eq!(floor_f64(F64::from(42.8)), F64::from(42.0));
+        assert_eq!(floor_f64(F64::from(-42.8)), F64::from(-43.0));
 
-        assert_eq!(round_f64(OrderedF64::from(42.4)), OrderedF64::from(42.0));
-        assert_eq!(round_f64(OrderedF64::from(42.5)), OrderedF64::from(43.0));
-        assert_eq!(round_f64(OrderedF64::from(-6.5)), OrderedF64::from(-7.0));
+        assert_eq!(round_f64(F64::from(42.4)), F64::from(42.0));
+        assert_eq!(round_f64(F64::from(42.5)), F64::from(43.0));
+        assert_eq!(round_f64(F64::from(-6.5)), F64::from(-7.0));
     }
 
     #[test]
diff --git a/src/expr/src/vector_op/rtrim.rs b/src/expr/src/vector_op/rtrim.rs
deleted file mode 100644
index 3257044edeb5d..0000000000000
--- a/src/expr/src/vector_op/rtrim.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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::Write;
-
-use crate::Result;
-
-/// Note: the behavior of `rtrim` in `PostgreSQL` and `trim_end` (or `trim_right`) in Rust
-/// are actually different when the string is in right-to-left languages like Arabic or Hebrew.
-/// Since we would like to simplify the implementation, currently we omit this case.
-#[inline(always)]
-pub fn rtrim(s: &str, writer: &mut dyn Write) -> Result<()> {
-    writer.write_str(s.trim_end()).unwrap();
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_rtrim() -> Result<()> {
-        let cases = [
-            (" \tHello\tworld\t ", " \tHello\tworld"),
-            (" \t空I ❤️ databases空\t ", " \t空I ❤️ databases空"),
-        ];
-
-        for (s, expected) in cases {
-            let mut writer = String::new();
-            rtrim(s, &mut writer)?;
-            assert_eq!(writer, expected);
-        }
-        Ok(())
-    }
-}
diff --git a/src/expr/src/vector_op/split_part.rs b/src/expr/src/vector_op/split_part.rs
index a3d4a33b6c6a3..d64108bef9f97 100644
--- a/src/expr/src/vector_op/split_part.rs
+++ b/src/expr/src/vector_op/split_part.rs
@@ -14,9 +14,11 @@
 
 use std::fmt::Write;
 
+use risingwave_expr_macro::function;
+
 use crate::{ExprError, Result};
 
-#[inline(always)]
+#[function("split_part(varchar, varchar, int32) -> varchar")]
 pub fn split_part(
     string_expr: &str,
     delimiter_expr: &str,
diff --git a/src/expr/src/vector_op/string.rs b/src/expr/src/vector_op/string.rs
new file mode 100644
index 0000000000000..b4ff9d466b0ce
--- /dev/null
+++ b/src/expr/src/vector_op/string.rs
@@ -0,0 +1,388 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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.
+
+//! String functions
+//!
+//! <https://www.postgresql.org/docs/current/functions-string.html>
+
+use std::fmt::Write;
+
+use risingwave_expr_macro::function;
+
+/// Returns the character with the specified Unicode code point.
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select chr(65);
+/// ----
+/// A
+/// ```
+#[function("chr(int32) -> varchar")]
+pub fn chr(code: i32, writer: &mut dyn Write) {
+    if let Some(c) = std::char::from_u32(code as u32) {
+        write!(writer, "{}", c).unwrap();
+    }
+}
+
+/// Returns true if the given string starts with the specified prefix.
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select starts_with('abcdef', 'abc');
+/// ----
+/// t
+/// ```
+#[function("starts_with(varchar, varchar) -> boolean")]
+pub fn starts_with(s: &str, prefix: &str) -> bool {
+    s.starts_with(prefix)
+}
+
+/// Capitalizes the first letter of each word in the given string.
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select initcap('the quick brown fox');
+/// ----
+/// The Quick Brown Fox
+/// ```
+#[function("initcap(varchar) -> varchar")]
+pub fn initcap(s: &str, writer: &mut dyn Write) {
+    let mut capitalize_next = true;
+    for c in s.chars() {
+        if capitalize_next {
+            write!(writer, "{}", c.to_uppercase()).unwrap();
+            capitalize_next = false;
+        } else {
+            write!(writer, "{}", c.to_lowercase()).unwrap();
+        }
+        if c.is_whitespace() {
+            capitalize_next = true;
+        }
+    }
+}
+
+/// Extends the given string on the left until it is at least the specified length,
+/// using the specified fill character (or a space by default).
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select lpad('abc', 5);
+/// ----
+///   abc
+///
+/// query T
+/// select lpad('abcdef', 3);
+/// ----
+/// abc
+/// ```
+#[function("lpad(varchar, int32) -> varchar")]
+pub fn lpad(s: &str, length: i32, writer: &mut dyn Write) {
+    lpad_fill(s, length, " ", writer);
+}
+
+/// Extends the string to the specified length by prepending the characters fill.
+/// If the string is already longer than the specified length, it is truncated on the right.
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select lpad('hi', 5, 'xy');
+/// ----
+/// xyxhi
+/// ```
+#[function("lpad(varchar, int32, varchar) -> varchar")]
+pub fn lpad_fill(s: &str, length: i32, fill: &str, writer: &mut dyn Write) {
+    let s_len = s.chars().count();
+    let fill_len = fill.chars().count();
+
+    if length <= 0 {
+        return;
+    }
+    if s_len >= length as usize {
+        for c in s.chars().take(length as usize) {
+            write!(writer, "{c}").unwrap();
+        }
+    } else {
+        let mut remaining_length = length as usize - s_len;
+        while remaining_length >= fill_len {
+            write!(writer, "{fill}").unwrap();
+            remaining_length -= fill_len;
+        }
+        for c in fill.chars().take(remaining_length) {
+            write!(writer, "{c}").unwrap();
+        }
+        write!(writer, "{s}").unwrap();
+    }
+}
+
+/// Extends the given string on the right until it is at least the specified length,
+/// using the specified fill character (or a space by default).
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select rpad('abc', 5);
+/// ----
+/// abc  
+///
+/// query T
+/// select rpad('abcdef', 3);
+/// ----
+/// abc
+/// ```
+#[function("rpad(varchar, int32) -> varchar")]
+pub fn rpad(s: &str, length: i32, writer: &mut dyn Write) {
+    rpad_fill(s, length, " ", writer);
+}
+
+/// Extends the given string on the right until it is at least the specified length,
+/// using the specified fill string, truncating the string if it is already longer
+/// than the specified length.
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select rpad('hi', 5, 'xy');
+/// ----
+/// hixyx
+///
+/// query T
+/// select rpad('abc', 5, '😀');
+/// ----
+/// abc😀😀
+///
+/// query T
+/// select rpad('abcdef', 3, '0');
+/// ----
+/// abc
+#[function("rpad(varchar, int32, varchar) -> varchar")]
+pub fn rpad_fill(s: &str, length: i32, fill: &str, writer: &mut dyn Write) {
+    let s_len = s.chars().count();
+    let fill_len = fill.chars().count();
+
+    if length <= 0 {
+        return;
+    }
+
+    if s_len >= length as usize {
+        for c in s.chars().take(length as usize) {
+            write!(writer, "{c}").unwrap();
+        }
+    } else {
+        write!(writer, "{s}").unwrap();
+        let mut remaining_length = length as usize - s_len;
+        while remaining_length >= fill_len {
+            write!(writer, "{fill}").unwrap();
+            remaining_length -= fill_len;
+        }
+        for c in fill.chars().take(remaining_length) {
+            write!(writer, "{c}").unwrap();
+        }
+    }
+}
+
+/// Reverses the characters in the given string.
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select reverse('abcdef');
+/// ----
+/// fedcba
+/// ```
+#[function("reverse(varchar) -> varchar")]
+pub fn reverse(s: &str, writer: &mut dyn Write) {
+    for c in s.chars().rev() {
+        write!(writer, "{}", c).unwrap();
+    }
+}
+
+/// Returns the index of the first occurrence of the specified substring in the input string,
+/// or zero if the substring is not present.
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select strpos('hello, world', 'lo');
+/// ----
+/// 4
+///
+/// query T
+/// select strpos('high', 'ig');
+/// ----
+/// 2
+///
+/// query T
+/// select strpos('abc', 'def');
+/// ----
+/// 0
+/// ```
+#[function("strpos(varchar, varchar) -> int32")]
+pub fn strpos(s: &str, substr: &str) -> i32 {
+    if let Some(pos) = s.find(substr) {
+        pos as i32 + 1
+    } else {
+        0
+    }
+}
+
+/// Converts the input string to ASCII by dropping accents, assuming that the input string
+/// is encoded in one of the supported encodings (Latin1, Latin2, Latin9, or WIN1250).
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select to_ascii('Karél');
+/// ----
+/// Karel
+/// ```
+#[function("to_ascii(varchar) -> varchar")]
+pub fn to_ascii(s: &str, writer: &mut dyn Write) {
+    for c in s.chars() {
+        let ascii = match c {
+            'Á' | 'À' | 'Â' | 'Ã' => 'A',
+            'á' | 'à' | 'â' | 'ã' => 'a',
+            'Č' | 'Ć' | 'Ç' => 'C',
+            'č' | 'ć' | 'ç' => 'c',
+            'Ď' => 'D',
+            'ď' => 'd',
+            'É' | 'È' | 'Ê' | 'Ẽ' => 'E',
+            'é' | 'è' | 'ê' | 'ẽ' => 'e',
+            'Í' | 'Ì' | 'Î' | 'Ĩ' => 'I',
+            'í' | 'ì' | 'î' | 'ĩ' => 'i',
+            'Ľ' => 'L',
+            'ľ' => 'l',
+            'Ň' => 'N',
+            'ň' => 'n',
+            'Ó' | 'Ò' | 'Ô' | 'Õ' => 'O',
+            'ó' | 'ò' | 'ô' | 'õ' => 'o',
+            'Ŕ' => 'R',
+            'ŕ' => 'r',
+            'Š' | 'Ś' => 'S',
+            'š' | 'ś' => 's',
+            'Ť' => 'T',
+            'ť' => 't',
+            'Ú' | 'Ù' | 'Û' | 'Ũ' => 'U',
+            'ú' | 'ù' | 'û' | 'ũ' => 'u',
+            'Ý' | 'Ỳ' => 'Y',
+            'ý' | 'ỳ' => 'y',
+            'Ž' | 'Ź' | 'Ż' => 'Z',
+            'ž' | 'ź' | 'ż' => 'z',
+            _ => c,
+        };
+        write!(writer, "{}", ascii).unwrap();
+    }
+}
+
+/// Converts the given integer to its equivalent hexadecimal representation.
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select to_hex(2147483647);
+/// ----
+/// 7fffffff
+///
+/// query T
+/// select to_hex(-2147483648);
+/// ----
+/// 80000000
+///
+/// query T
+/// select to_hex(9223372036854775807);
+/// ----
+/// 7fffffffffffffff
+///
+/// query T
+/// select to_hex(-9223372036854775808);
+/// ----
+/// 8000000000000000
+/// ```
+#[function("to_hex(int32) -> varchar")]
+pub fn to_hex_i32(n: i32, writer: &mut dyn Write) {
+    write!(writer, "{:x}", n).unwrap();
+}
+
+#[function("to_hex(int64) -> varchar")]
+pub fn to_hex_i64(n: i64, writer: &mut dyn Write) {
+    write!(writer, "{:x}", n).unwrap();
+}
+
+/// Returns the given string suitably quoted to be used as an identifier in an SQL statement string.
+/// Quotes are added only if necessary (i.e., if the string contains non-identifier characters or
+/// would be case-folded). Embedded quotes are properly doubled.
+///
+/// Refer to <https://github.com/postgres/postgres/blob/90189eefc1e11822794e3386d9bafafd3ba3a6e8/src/backend/utils/adt/ruleutils.c#L11506>
+///
+/// # Example
+///
+/// ```slt
+/// query T
+/// select quote_ident('foo bar')
+/// ----
+/// "foo bar"
+///
+/// query T
+/// select quote_ident('FooBar')
+/// ----
+/// "FooBar"
+///
+/// query T
+/// select quote_ident('foo_bar')
+/// ----
+/// foo_bar
+///
+/// query T
+/// select quote_ident('foo"bar')
+/// ----
+/// "foo""bar"
+///
+/// # FIXME: quote SQL keywords is not supported yet
+/// query T
+/// select quote_ident('select')
+/// ----
+/// select
+/// ```
+#[function("quote_ident(varchar) -> varchar")]
+pub fn quote_ident(s: &str, writer: &mut dyn Write) {
+    let needs_quotes = s.chars().any(|c| !matches!(c, 'a'..='z' | '0'..='9' | '_'));
+    if !needs_quotes {
+        write!(writer, "{}", s).unwrap();
+        return;
+    }
+    write!(writer, "\"").unwrap();
+    for c in s.chars() {
+        if c == '"' {
+            write!(writer, "\"\"").unwrap();
+        } else {
+            write!(writer, "{c}").unwrap();
+        }
+    }
+    write!(writer, "\"").unwrap();
+}
diff --git a/src/expr/src/vector_op/substr.rs b/src/expr/src/vector_op/substr.rs
index c3f81cae2c063..5175be1eca452 100644
--- a/src/expr/src/vector_op/substr.rs
+++ b/src/expr/src/vector_op/substr.rs
@@ -15,23 +15,25 @@
 use std::cmp::{max, min};
 use std::fmt::Write;
 
+use risingwave_expr_macro::function;
+
 use crate::{bail, Result};
 
-#[inline(always)]
+#[function("substr(varchar, int32) -> varchar")]
 pub fn substr_start(s: &str, start: i32, writer: &mut dyn Write) -> Result<()> {
     let start = (start.saturating_sub(1).max(0) as usize).min(s.len());
     writer.write_str(&s[start..]).unwrap();
     Ok(())
 }
 
-#[inline(always)]
+// #[function("substr(varchar, 0, int32) -> varchar")]
 pub fn substr_for(s: &str, count: i32, writer: &mut dyn Write) -> Result<()> {
     let end = min(count as usize, s.len());
     writer.write_str(&s[..end]).unwrap();
     Ok(())
 }
 
-#[inline(always)]
+#[function("substr(varchar, int32, int32) -> varchar")]
 pub fn substr_start_for(s: &str, start: i32, count: i32, writer: &mut dyn Write) -> Result<()> {
     if count < 0 {
         bail!("length in substr should be non-negative: {}", count);
@@ -56,19 +58,19 @@ mod tests {
         let s = "cxscgccdd";
 
         let cases = [
-            (s.to_owned(), Some(4), None, "cgccdd"),
-            (s.to_owned(), None, Some(3), "cxs"),
-            (s.to_owned(), Some(4), Some(-2), "[unused result]"),
-            (s.to_owned(), Some(4), Some(2), "cg"),
-            (s.to_owned(), Some(-1), Some(-5), "[unused result]"),
-            (s.to_owned(), Some(-1), Some(5), "cxs"),
+            (s, Some(4), None, "cgccdd"),
+            (s, None, Some(3), "cxs"),
+            (s, Some(4), Some(-2), "[unused result]"),
+            (s, Some(4), Some(2), "cg"),
+            (s, Some(-1), Some(-5), "[unused result]"),
+            (s, Some(-1), Some(5), "cxs"),
         ];
 
         for (s, off, len, expected) in cases {
             let mut writer = String::new();
             match (off, len) {
                 (Some(off), Some(len)) => {
-                    let result = substr_start_for(&s, off, len, &mut writer);
+                    let result = substr_start_for(s, off, len, &mut writer);
                     if len < 0 {
                         assert!(result.is_err());
                         continue;
@@ -76,8 +78,8 @@ mod tests {
                         result?
                     }
                 }
-                (Some(off), None) => substr_start(&s, off, &mut writer)?,
-                (None, Some(len)) => substr_for(&s, len, &mut writer)?,
+                (Some(off), None) => substr_start(s, off, &mut writer)?,
+                (None, Some(len)) => substr_for(s, len, &mut writer)?,
                 _ => unreachable!(),
             }
             assert_eq!(writer, expected);
diff --git a/src/expr/src/vector_op/tests.rs b/src/expr/src/vector_op/tests.rs
deleted file mode 100644
index 35d146b189ee1..0000000000000
--- a/src/expr/src/vector_op/tests.rs
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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::assert_matches::assert_matches;
-use std::str::FromStr;
-
-use chrono::NaiveDateTime;
-use risingwave_common::types::test_utils::IntervalUnitTestExt;
-use risingwave_common::types::{
-    Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, OrderedF32, OrderedF64,
-};
-
-use crate::vector_op::arithmetic_op::*;
-use crate::vector_op::bitwise_op::*;
-use crate::vector_op::cast::try_cast;
-use crate::vector_op::cmp::*;
-use crate::vector_op::conjunction::*;
-use crate::ExprError;
-
-#[test]
-fn test_arithmetic() {
-    assert_eq!(
-        general_add::<Decimal, i32, Decimal>(dec("1.0"), 1).unwrap(),
-        dec("2.0")
-    );
-    assert_eq!(
-        general_sub::<Decimal, i32, Decimal>(dec("1.0"), 2).unwrap(),
-        dec("-1.0")
-    );
-    assert_eq!(
-        general_mul::<Decimal, i32, Decimal>(dec("1.0"), 2).unwrap(),
-        dec("2.0")
-    );
-    assert_eq!(
-        general_div::<Decimal, i32, Decimal>(dec("2.0"), 2).unwrap(),
-        dec("1.0")
-    );
-    assert_eq!(
-        general_mod::<Decimal, i32, Decimal>(dec("2.0"), 2).unwrap(),
-        dec("0")
-    );
-    assert_eq!(general_neg::<Decimal>(dec("1.0")).unwrap(), dec("-1.0"));
-    assert_eq!(general_add::<i16, i32, i32>(1i16, 1i32).unwrap(), 2i32);
-    assert_eq!(general_sub::<i16, i32, i32>(1i16, 1i32).unwrap(), 0i32);
-    assert_eq!(general_mul::<i16, i32, i32>(1i16, 1i32).unwrap(), 1i32);
-    assert_eq!(general_div::<i16, i32, i32>(1i16, 1i32).unwrap(), 1i32);
-    assert_eq!(general_mod::<i16, i32, i32>(1i16, 1i32).unwrap(), 0i32);
-    assert_eq!(general_neg::<i16>(1i16).unwrap(), -1i16);
-
-    assert_eq!(
-        general_add::<Decimal, f32, Decimal>(dec("1.0"), -1f32).unwrap(),
-        dec("0.0")
-    );
-    assert_eq!(
-        general_sub::<Decimal, f32, Decimal>(dec("1.0"), 1f32).unwrap(),
-        dec("0.0")
-    );
-    assert_eq!(
-        general_div::<Decimal, f32, Decimal>(dec("0.0"), 1f32).unwrap(),
-        dec("0.0")
-    );
-    assert_eq!(
-        general_mul::<Decimal, f32, Decimal>(dec("0.0"), 1f32).unwrap(),
-        dec("0.0")
-    );
-    assert_eq!(
-        general_mod::<Decimal, f32, Decimal>(dec("0.0"), 1f32).unwrap(),
-        dec("0.0")
-    );
-    assert!(
-        general_add::<i32, OrderedF32, OrderedF64>(-1i32, 1f32.into())
-            .unwrap()
-            .abs()
-            < f64::EPSILON
-    );
-    assert!(
-        general_sub::<i32, OrderedF32, OrderedF64>(1i32, 1f32.into())
-            .unwrap()
-            .abs()
-            < f64::EPSILON
-    );
-    assert!(
-        general_mul::<i32, OrderedF32, OrderedF64>(0i32, 1f32.into())
-            .unwrap()
-            .abs()
-            < f64::EPSILON
-    );
-    assert!(
-        general_div::<i32, OrderedF32, OrderedF64>(0i32, 1f32.into())
-            .unwrap()
-            .abs()
-            < f64::EPSILON
-    );
-    assert_eq!(
-        general_neg::<OrderedF32>(1f32.into()).unwrap(),
-        OrderedF32::from(-1f32)
-    );
-    assert_eq!(
-        date_interval_add::<NaiveDateWrapper, IntervalUnit, NaiveDateTimeWrapper>(
-            NaiveDateWrapper::from_ymd_uncheck(1994, 1, 1),
-            IntervalUnit::from_month(12)
-        )
-        .unwrap(),
-        NaiveDateTimeWrapper::new(
-            NaiveDateTime::parse_from_str("1995-1-1 0:0:0", "%Y-%m-%d %H:%M:%S").unwrap()
-        )
-    );
-    assert_eq!(
-        interval_date_add::<IntervalUnit, NaiveDateWrapper, NaiveDateTimeWrapper>(
-            IntervalUnit::from_month(12),
-            NaiveDateWrapper::from_ymd_uncheck(1994, 1, 1)
-        )
-        .unwrap(),
-        NaiveDateTimeWrapper::new(
-            NaiveDateTime::parse_from_str("1995-1-1 0:0:0", "%Y-%m-%d %H:%M:%S").unwrap()
-        )
-    );
-    assert_eq!(
-        date_interval_sub::<NaiveDateWrapper, IntervalUnit, NaiveDateTimeWrapper>(
-            NaiveDateWrapper::from_ymd_uncheck(1994, 1, 1),
-            IntervalUnit::from_month(12)
-        )
-        .unwrap(),
-        NaiveDateTimeWrapper::new(
-            NaiveDateTime::parse_from_str("1993-1-1 0:0:0", "%Y-%m-%d %H:%M:%S").unwrap()
-        )
-    );
-}
-
-#[test]
-fn test_bitwise() {
-    // check the boundary
-    assert_eq!(general_shl::<i32, i32>(1i32, 0i32).unwrap(), 1i32);
-    assert_eq!(general_shl::<i64, i32>(1i64, 31i32).unwrap(), 2147483648i64);
-    assert_matches!(
-        general_shl::<i32, i32>(1i32, 32i32).unwrap_err(),
-        ExprError::NumericOutOfRange,
-    );
-    assert_eq!(
-        general_shr::<i64, i32>(-2147483648i64, 31i32).unwrap(),
-        -1i64
-    );
-    assert_eq!(general_shr::<i64, i32>(1i64, 0i32).unwrap(), 1i64);
-    // truth table
-    assert_eq!(
-        general_bitand::<u32, u32, u64>(0b0011u32, 0b0101u32),
-        0b1u64
-    );
-    assert_eq!(
-        general_bitor::<u32, u32, u64>(0b0011u32, 0b0101u32),
-        0b0111u64
-    );
-    assert_eq!(
-        general_bitxor::<u32, u32, u64>(0b0011u32, 0b0101u32),
-        0b0110u64
-    );
-    assert_eq!(general_bitnot::<i32>(0b01i32), -2i32);
-}
-
-#[test]
-fn test_comparison() {
-    assert!(general_eq::<Decimal, i32, Decimal>(dec("1.0"), 1));
-    assert!(general_eq::<Decimal, f32, Decimal>(dec("1.0"), 1.0));
-    assert!(!general_ne::<Decimal, i32, Decimal>(dec("1.0"), 1));
-    assert!(!general_ne::<Decimal, f32, Decimal>(dec("1.0"), 1.0));
-    assert!(!general_gt::<Decimal, i32, Decimal>(dec("1.0"), 2));
-    assert!(!general_gt::<Decimal, f32, Decimal>(dec("1.0"), 2.0));
-    assert!(general_le::<Decimal, i32, Decimal>(dec("1.0"), 2));
-    assert!(general_le::<Decimal, f32, Decimal>(dec("1.0"), 2.1));
-    assert!(!general_ge::<Decimal, i32, Decimal>(dec("1.0"), 2));
-    assert!(!general_ge::<Decimal, f32, Decimal>(dec("1.0"), 2.1));
-    assert!(general_lt::<Decimal, i32, Decimal>(dec("1.0"), 2));
-    assert!(general_lt::<Decimal, f32, Decimal>(dec("1.0"), 2.1));
-    assert!(general_is_distinct_from::<Decimal, i32, Decimal>(
-        Some(dec("1.0")),
-        Some(2)
-    ));
-    assert!(general_is_distinct_from::<Decimal, f32, Decimal>(
-        Some(dec("1.0")),
-        Some(2.0)
-    ));
-    assert!(general_is_distinct_from::<Decimal, f32, Decimal>(
-        Some(dec("1.0")),
-        None
-    ));
-    assert!(general_is_distinct_from::<Decimal, i32, Decimal>(
-        None,
-        Some(1)
-    ));
-    assert!(!general_is_distinct_from::<Decimal, i32, Decimal>(
-        Some(dec("1.0")),
-        Some(1)
-    ));
-    assert!(!general_is_distinct_from::<Decimal, f32, Decimal>(
-        Some(dec("1.0")),
-        Some(1.0)
-    ));
-    assert!(!general_is_distinct_from::<Decimal, f32, Decimal>(
-        None, None
-    ));
-    assert!(general_eq::<OrderedF32, i32, OrderedF64>(1.0.into(), 1));
-    assert!(!general_ne::<OrderedF32, i32, OrderedF64>(1.0.into(), 1));
-    assert!(!general_lt::<OrderedF32, i32, OrderedF64>(1.0.into(), 1));
-    assert!(general_le::<OrderedF32, i32, OrderedF64>(1.0.into(), 1));
-    assert!(!general_gt::<OrderedF32, i32, OrderedF64>(1.0.into(), 1));
-    assert!(general_ge::<OrderedF32, i32, OrderedF64>(1.0.into(), 1));
-    assert!(!general_is_distinct_from::<OrderedF32, i32, OrderedF64>(
-        Some(1.0.into()),
-        Some(1)
-    ));
-    assert!(general_eq::<i64, i32, i64>(1i64, 1));
-    assert!(!general_ne::<i64, i32, i64>(1i64, 1));
-    assert!(!general_lt::<i64, i32, i64>(1i64, 1));
-    assert!(general_le::<i64, i32, i64>(1i64, 1));
-    assert!(!general_gt::<i64, i32, i64>(1i64, 1));
-    assert!(general_ge::<i64, i32, i64>(1i64, 1));
-    assert!(!general_is_distinct_from::<i64, i32, i64>(
-        Some(1i64),
-        Some(1)
-    ));
-}
-
-#[test]
-fn test_conjunction() {
-    assert!(not(Some(false)).unwrap());
-    assert!(!and(Some(true), Some(false)).unwrap().unwrap());
-    assert!(or(Some(true), Some(false)).unwrap().unwrap());
-}
-#[test]
-fn test_cast() {
-    assert_eq!(
-        try_cast::<_, NaiveDateTimeWrapper>(NaiveDateWrapper::from_ymd_uncheck(1994, 1, 1))
-            .unwrap(),
-        NaiveDateTimeWrapper::new(
-            NaiveDateTime::parse_from_str("1994-1-1 0:0:0", "%Y-%m-%d %H:%M:%S").unwrap()
-        )
-    )
-}
-
-fn dec(s: &str) -> Decimal {
-    Decimal::from_str(s).unwrap()
-}
diff --git a/src/expr/src/vector_op/timestamptz.rs b/src/expr/src/vector_op/timestamptz.rs
index 12a7ce3d74657..7d8c426c38439 100644
--- a/src/expr/src/vector_op/timestamptz.rs
+++ b/src/expr/src/vector_op/timestamptz.rs
@@ -17,7 +17,8 @@ use std::fmt::Write;
 use chrono::{TimeZone, Utc};
 use chrono_tz::Tz;
 use num_traits::ToPrimitive;
-use risingwave_common::types::{NaiveDateTimeWrapper, OrderedF64};
+use risingwave_common::types::{Timestamp, F64};
+use risingwave_expr_macro::function;
 
 use crate::vector_op::cast::{str_to_timestamp, str_with_time_zone_to_timestamptz};
 use crate::{ExprError, Result};
@@ -31,8 +32,8 @@ fn lookup_time_zone(time_zone: &str) -> Result<Tz> {
     })
 }
 
-#[inline(always)]
-pub fn f64_sec_to_timestamptz(elem: OrderedF64) -> Result<i64> {
+#[function("to_timestamp(float64) -> timestamptz")]
+pub fn f64_sec_to_timestamptz(elem: F64) -> Result<i64> {
     // TODO(#4515): handle +/- infinity
     (elem * 1e6)
         .round() // TODO(#5576): should round to even
@@ -40,8 +41,8 @@ pub fn f64_sec_to_timestamptz(elem: OrderedF64) -> Result<i64> {
         .ok_or(ExprError::NumericOutOfRange)
 }
 
-#[inline(always)]
-pub fn timestamp_at_time_zone(input: NaiveDateTimeWrapper, time_zone: &str) -> Result<i64> {
+#[function("at_time_zone(timestamp, varchar) -> timestamptz")]
+pub fn timestamp_at_time_zone(input: Timestamp, time_zone: &str) -> Result<i64> {
     let time_zone = lookup_time_zone(time_zone)?;
     // https://www.postgresql.org/docs/current/datetime-invalid-input.html
     // Special cases:
@@ -65,6 +66,7 @@ pub fn timestamp_at_time_zone(input: NaiveDateTimeWrapper, time_zone: &str) -> R
     Ok(usec)
 }
 
+#[function("cast_with_time_zone(timestamptz, varchar) -> varchar")]
 pub fn timestamptz_to_string(elem: i64, time_zone: &str, writer: &mut dyn Write) -> Result<()> {
     let time_zone = lookup_time_zone(time_zone)?;
     let secs = elem.div_euclid(1_000_000);
@@ -82,20 +84,21 @@ pub fn timestamptz_to_string(elem: i64, time_zone: &str, writer: &mut dyn Write)
 
 // Tries to interpret the string with a timezone, and if failing, tries to interpret the string as a
 // timestamp and then adjusts it with the session timezone.
+#[function("cast_with_time_zone(varchar, varchar) -> timestamptz")]
 pub fn str_to_timestamptz(elem: &str, time_zone: &str) -> Result<i64> {
     str_with_time_zone_to_timestamptz(elem)
         .or_else(|_| timestamp_at_time_zone(str_to_timestamp(elem)?, time_zone))
 }
 
-#[inline(always)]
-pub fn timestamptz_at_time_zone(input: i64, time_zone: &str) -> Result<NaiveDateTimeWrapper> {
+#[function("at_time_zone(timestamptz, varchar) -> timestamp")]
+pub fn timestamptz_at_time_zone(input: i64, time_zone: &str) -> Result<Timestamp> {
     let time_zone = lookup_time_zone(time_zone)?;
     let secs = input.div_euclid(1_000_000);
     let nsecs = input.rem_euclid(1_000_000) * 1000;
     let instant_utc = Utc.timestamp_opt(secs, nsecs as u32).unwrap();
     let instant_local = instant_utc.with_timezone(&time_zone);
     let naive = instant_local.naive_local();
-    Ok(NaiveDateTimeWrapper(naive))
+    Ok(Timestamp(naive))
 }
 
 #[cfg(test)]
diff --git a/src/expr/src/vector_op/to_char.rs b/src/expr/src/vector_op/to_char.rs
index 5e2d02c186ab7..50b129c430c44 100644
--- a/src/expr/src/vector_op/to_char.rs
+++ b/src/expr/src/vector_op/to_char.rs
@@ -18,9 +18,7 @@ use std::sync::LazyLock;
 use aho_corasick::{AhoCorasick, AhoCorasickBuilder};
 use chrono::format::StrftimeItems;
 use ouroboros::self_referencing;
-use risingwave_common::types::NaiveDateTimeWrapper;
-
-use crate::Result;
+use risingwave_common::types::Timestamp;
 
 #[self_referencing]
 pub struct ChronoPattern {
@@ -70,18 +68,9 @@ pub fn compile_pattern_to_chrono(tmpl: &str) -> ChronoPattern {
     .build()
 }
 
-#[inline(always)]
-pub fn to_char_timestamp(
-    data: NaiveDateTimeWrapper,
-    tmpl: &str,
-    writer: &mut dyn Write,
-) -> Result<()> {
+// #[function("to_char(timestamp, varchar) -> varchar")]
+pub fn to_char_timestamp(data: Timestamp, tmpl: &str, writer: &mut dyn Write) {
     let pattern = compile_pattern_to_chrono(tmpl);
-    write!(
-        writer,
-        "{}",
-        data.0.format_with_items(pattern.borrow_items().iter())
-    )
-    .unwrap();
-    Ok(())
+    let format = data.0.format_with_items(pattern.borrow_items().iter());
+    write!(writer, "{}", format).unwrap();
 }
diff --git a/src/expr/src/vector_op/to_timestamp.rs b/src/expr/src/vector_op/to_timestamp.rs
index 2ccfc66df8921..4cb74078bf224 100644
--- a/src/expr/src/vector_op/to_timestamp.rs
+++ b/src/expr/src/vector_op/to_timestamp.rs
@@ -13,13 +13,14 @@
 // limitations under the License.
 
 use chrono::format::Parsed;
-use risingwave_common::types::NaiveDateTimeWrapper;
+use risingwave_common::types::Timestamp;
 
+// use risingwave_expr_macro::function;
 use super::to_char::{compile_pattern_to_chrono, ChronoPattern};
 use crate::Result;
 
 #[inline(always)]
-pub fn to_timestamp_const_tmpl(s: &str, tmpl: &ChronoPattern) -> Result<NaiveDateTimeWrapper> {
+pub fn to_timestamp_const_tmpl(s: &str, tmpl: &ChronoPattern) -> Result<Timestamp> {
     let mut parsed = Parsed::new();
     chrono::format::parse(&mut parsed, s, tmpl.borrow_items().iter())?;
 
@@ -60,13 +61,11 @@ pub fn to_timestamp_const_tmpl(s: &str, tmpl: &ChronoPattern) -> Result<NaiveDat
 
     // Seconds and nanoseconds can be omitted, so we don't need to assign default value for them.
 
-    Ok(NaiveDateTimeWrapper(
-        parsed.to_naive_datetime_with_offset(0)?,
-    ))
+    Ok(Timestamp(parsed.to_naive_datetime_with_offset(0)?))
 }
 
-#[inline(always)]
-pub fn to_timestamp(s: &str, tmpl: &str) -> Result<NaiveDateTimeWrapper> {
+// #[function("to_timestamp(varchar, varchar) -> timestamp")]
+pub fn to_timestamp(s: &str, tmpl: &str) -> Result<Timestamp> {
     let pattern = compile_pattern_to_chrono(tmpl);
     to_timestamp_const_tmpl(s, &pattern)
 }
diff --git a/src/expr/src/vector_op/translate.rs b/src/expr/src/vector_op/translate.rs
index b2c44aa43d9f9..8dcec75307946 100644
--- a/src/expr/src/vector_op/translate.rs
+++ b/src/expr/src/vector_op/translate.rs
@@ -15,15 +15,10 @@
 use std::collections::HashMap;
 use std::fmt::Write;
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn translate(
-    s: &str,
-    match_str: &str,
-    replace_str: &str,
-    writer: &mut dyn Write,
-) -> Result<()> {
+#[function("translate(varchar, varchar, varchar) -> varchar")]
+pub fn translate(s: &str, match_str: &str, replace_str: &str, writer: &mut dyn Write) {
     let mut char_map = HashMap::new();
     let mut match_chars = match_str.chars();
     let mut replace_chars = replace_str.chars();
@@ -46,7 +41,6 @@ pub fn translate(
     for c in iter {
         writer.write_char(c).unwrap();
     }
-    Ok(())
 }
 
 #[cfg(test)]
@@ -54,7 +48,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_translate() -> Result<()> {
+    fn test_translate() {
         let cases = [
             ("hello world", "lo", "12", "he112 w2r1d"),
             (
@@ -73,9 +67,8 @@ mod tests {
 
         for (s, match_str, replace_str, expected) in cases {
             let mut writer = String::new();
-            translate(s, match_str, replace_str, &mut writer)?;
+            translate(s, match_str, replace_str, &mut writer);
             assert_eq!(writer, expected);
         }
-        Ok(())
     }
 }
diff --git a/src/expr/src/vector_op/trim.rs b/src/expr/src/vector_op/trim.rs
index 165991fa04618..754d90650f69c 100644
--- a/src/expr/src/vector_op/trim.rs
+++ b/src/expr/src/vector_op/trim.rs
@@ -14,12 +14,48 @@
 
 use std::fmt::Write;
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn trim(s: &str, writer: &mut dyn Write) -> Result<()> {
+#[function("trim(varchar) -> varchar")]
+pub fn trim(s: &str, writer: &mut dyn Write) {
     writer.write_str(s.trim()).unwrap();
-    Ok(())
+}
+
+/// Note: the behavior of `ltrim` in `PostgreSQL` and `trim_start` (or `trim_left`) in Rust
+/// are actually different when the string is in right-to-left languages like Arabic or Hebrew.
+/// Since we would like to simplify the implementation, currently we omit this case.
+#[function("ltrim(varchar) -> varchar")]
+pub fn ltrim(s: &str, writer: &mut dyn Write) {
+    writer.write_str(s.trim_start()).unwrap();
+}
+
+/// Note: the behavior of `rtrim` in `PostgreSQL` and `trim_end` (or `trim_right`) in Rust
+/// are actually different when the string is in right-to-left languages like Arabic or Hebrew.
+/// Since we would like to simplify the implementation, currently we omit this case.
+#[function("rtrim(varchar) -> varchar")]
+pub fn rtrim(s: &str, writer: &mut dyn Write) {
+    writer.write_str(s.trim_end()).unwrap();
+}
+
+#[function("trim(varchar, varchar) -> varchar")]
+pub fn trim_characters(s: &str, characters: &str, writer: &mut dyn Write) {
+    let pattern = |c| characters.chars().any(|ch| ch == c);
+    // We remark that feeding a &str and a slice of chars into trim_left/right_matches
+    // means different, one is matching with the entire string and the other one is matching
+    // with any char in the slice.
+    writer.write_str(s.trim_matches(pattern)).unwrap();
+}
+
+#[function("ltrim(varchar, varchar) -> varchar")]
+pub fn ltrim_characters(s: &str, characters: &str, writer: &mut dyn Write) {
+    let pattern = |c| characters.chars().any(|ch| ch == c);
+    writer.write_str(s.trim_start_matches(pattern)).unwrap();
+}
+
+#[function("rtrim(varchar, varchar) -> varchar")]
+pub fn rtrim_characters(s: &str, characters: &str, writer: &mut dyn Write) {
+    let pattern = |c| characters.chars().any(|ch| ch == c);
+    writer.write_str(s.trim_end_matches(pattern)).unwrap();
 }
 
 #[cfg(test)]
@@ -27,7 +63,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_trim() -> Result<()> {
+    fn test_trim() {
         let cases = [
             (" Hello\tworld\t", "Hello\tworld"),
             (" 空I ❤️ databases空 ", "空I ❤️ databases空"),
@@ -35,9 +71,81 @@ mod tests {
 
         for (s, expected) in cases {
             let mut writer = String::new();
-            trim(s, &mut writer)?;
+            trim(s, &mut writer);
+            assert_eq!(writer, expected);
+        }
+    }
+
+    #[test]
+    fn test_ltrim() {
+        let cases = [
+            (" \tHello\tworld\t", "Hello\tworld\t"),
+            (" \t空I ❤️ databases空 ", "空I ❤️ databases空 "),
+        ];
+
+        for (s, expected) in cases {
+            let mut writer = String::new();
+            ltrim(s, &mut writer);
+            assert_eq!(writer, expected);
+        }
+    }
+
+    #[test]
+    fn test_rtrim() {
+        let cases = [
+            (" \tHello\tworld\t ", " \tHello\tworld"),
+            (" \t空I ❤️ databases空\t ", " \t空I ❤️ databases空"),
+        ];
+
+        for (s, expected) in cases {
+            let mut writer = String::new();
+            rtrim(s, &mut writer);
+            assert_eq!(writer, expected);
+        }
+    }
+
+    #[test]
+    fn test_trim_characters() {
+        let cases = [
+            ("Hello world", "Hdl", "ello wor"),
+            ("abcde", "aae", "bcd"),
+            ("zxy", "yxz", ""),
+        ];
+
+        for (s, characters, expected) in cases {
+            let mut writer = String::new();
+            trim_characters(s, characters, &mut writer);
+            assert_eq!(writer, expected);
+        }
+    }
+
+    #[test]
+    fn test_ltrim_characters() {
+        let cases = [
+            ("Hello world", "Hdl", "ello world"),
+            ("abcde", "aae", "bcde"),
+            ("zxy", "yxz", ""),
+        ];
+
+        for (s, characters, expected) in cases {
+            let mut writer = String::new();
+            ltrim_characters(s, characters, &mut writer);
+            assert_eq!(writer, expected);
+        }
+    }
+
+    #[test]
+    fn test_rtrim_characters() {
+        let cases = [
+            ("Hello world", "Hdl", "Hello wor"),
+            ("abcde", "aae", "abcd"),
+            ("zxy", "yxz", ""),
+        ];
+
+        for (s, characters, expected) in cases {
+            let mut writer = String::new();
+            rtrim_characters(s, characters, &mut writer);
             assert_eq!(writer, expected);
         }
-        Ok(())
     }
 }
diff --git a/src/expr/src/vector_op/trim_characters.rs b/src/expr/src/vector_op/trim_characters.rs
deleted file mode 100644
index e61f72600b645..0000000000000
--- a/src/expr/src/vector_op/trim_characters.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2023 RisingWave Labs
-//
-// 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::Write;
-
-use crate::Result;
-
-macro_rules! gen_trim {
-    ($( { $func_name:ident, $method:ident }),*) => {
-        $(#[inline(always)]
-        pub fn $func_name(s: &str, characters: &str, writer: &mut dyn Write) -> Result<()> {
-            let pattern = |c| characters.chars().any(|ch| ch == c);
-            // We remark that feeding a &str and a slice of chars into trim_left/right_matches
-            // means different, one is matching with the entire string and the other one is matching
-            // with any char in the slice.
-            Ok(writer.write_str(s.$method(pattern)).unwrap())
-        })*
-    }
-}
-
-gen_trim! {
-    { trim_characters, trim_matches },
-    { ltrim_characters, trim_start_matches },
-    { rtrim_characters, trim_end_matches }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_trim_characters() -> Result<()> {
-        let cases = [
-            ("Hello world", "Hdl", "ello wor"),
-            ("abcde", "aae", "bcd"),
-            ("zxy", "yxz", ""),
-        ];
-
-        for (s, characters, expected) in cases {
-            let mut writer = String::new();
-            trim_characters(s, characters, &mut writer)?;
-            assert_eq!(writer, expected);
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn test_ltrim_characters() -> Result<()> {
-        let cases = [
-            ("Hello world", "Hdl", "ello world"),
-            ("abcde", "aae", "bcde"),
-            ("zxy", "yxz", ""),
-        ];
-
-        for (s, characters, expected) in cases {
-            let mut writer = String::new();
-            ltrim_characters(s, characters, &mut writer)?;
-            assert_eq!(writer, expected);
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn test_rtrim_characters() -> Result<()> {
-        let cases = [
-            ("Hello world", "Hdl", "Hello wor"),
-            ("abcde", "aae", "abcd"),
-            ("zxy", "yxz", ""),
-        ];
-
-        for (s, characters, expected) in cases {
-            let mut writer = String::new();
-            rtrim_characters(s, characters, &mut writer)?;
-            assert_eq!(writer, expected);
-        }
-        Ok(())
-    }
-}
diff --git a/src/expr/src/vector_op/tumble.rs b/src/expr/src/vector_op/tumble.rs
index f6e0c29120d45..defd681132214 100644
--- a/src/expr/src/vector_op/tumble.rs
+++ b/src/expr/src/vector_op/tumble.rs
@@ -13,43 +13,33 @@
 // limitations under the License.
 
 use num_traits::Zero;
-use risingwave_common::types::{
-    IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, USECS_PER_DAY, USECS_PER_MONTH,
-};
+use risingwave_common::types::{Date, Interval, Timestamp, USECS_PER_DAY, USECS_PER_MONTH};
+use risingwave_expr_macro::function;
 
 use crate::Result;
 
 #[inline(always)]
-fn interval_unit_to_micro_second(t: IntervalUnit) -> i64 {
+fn interval_to_micro_second(t: Interval) -> i64 {
     t.get_months() as i64 * USECS_PER_MONTH + t.get_days() as i64 * USECS_PER_DAY + t.get_usecs()
 }
 
-#[inline(always)]
-pub fn tumble_start_date(
-    timestamp: NaiveDateWrapper,
-    window_size: IntervalUnit,
-) -> Result<NaiveDateTimeWrapper> {
+#[function("tumble_start(date, interval) -> timestamp")]
+pub fn tumble_start_date(timestamp: Date, window_size: Interval) -> Result<Timestamp> {
     tumble_start_date_time(timestamp.into(), window_size)
 }
 
-#[inline(always)]
-pub fn tumble_start_date_time(
-    timestamp: NaiveDateTimeWrapper,
-    window_size: IntervalUnit,
-) -> Result<NaiveDateTimeWrapper> {
+#[function("tumble_start(timestamp, interval) -> timestamp")]
+pub fn tumble_start_date_time(timestamp: Timestamp, window_size: Interval) -> Result<Timestamp> {
     let timestamp_micro_second = timestamp.0.timestamp_micros();
     let window_start_micro_second = get_window_start(timestamp_micro_second, window_size)?;
-    Ok(NaiveDateTimeWrapper::from_timestamp_uncheck(
+    Ok(Timestamp::from_timestamp_uncheck(
         window_start_micro_second / 1_000_000,
         (window_start_micro_second % 1_000_000 * 1000) as u32,
     ))
 }
 
-#[inline(always)]
-pub fn tumble_start_timestamptz(
-    timestamp_micro_second: i64,
-    window_size: IntervalUnit,
-) -> Result<i64> {
+#[function("tumble_start(timestamptz, interval) -> timestamptz")]
+pub fn tumble_start_timestamptz(timestamp_micro_second: i64, window_size: Interval) -> Result<i64> {
     let timestamp_micro_second = timestamp_micro_second;
     let window_size = window_size;
     get_window_start(timestamp_micro_second, window_size)
@@ -57,30 +47,30 @@ pub fn tumble_start_timestamptz(
 
 /// The common part of PostgreSQL function `timestamp_bin` and `timestamptz_bin`.
 #[inline(always)]
-fn get_window_start(timestamp_micro_second: i64, window_size: IntervalUnit) -> Result<i64> {
-    get_window_start_with_offset(timestamp_micro_second, window_size, IntervalUnit::zero())
+fn get_window_start(timestamp_micro_second: i64, window_size: Interval) -> Result<i64> {
+    get_window_start_with_offset(timestamp_micro_second, window_size, Interval::zero())
 }
 
-#[inline(always)]
+#[function("tumble_start(date, interval, interval) -> timestamp")]
 pub fn tumble_start_offset_date(
-    timestamp_date: NaiveDateWrapper,
-    window_size: IntervalUnit,
-    offset: IntervalUnit,
-) -> Result<NaiveDateTimeWrapper> {
+    timestamp_date: Date,
+    window_size: Interval,
+    offset: Interval,
+) -> Result<Timestamp> {
     tumble_start_offset_date_time(timestamp_date.into(), window_size, offset)
 }
 
-#[inline(always)]
+#[function("tumble_start(timestamp, interval, interval) -> timestamp")]
 pub fn tumble_start_offset_date_time(
-    time: NaiveDateTimeWrapper,
-    window_size: IntervalUnit,
-    offset: IntervalUnit,
-) -> Result<NaiveDateTimeWrapper> {
+    time: Timestamp,
+    window_size: Interval,
+    offset: Interval,
+) -> Result<Timestamp> {
     let timestamp_micro_second = time.0.timestamp_micros();
     let window_start_micro_second =
         get_window_start_with_offset(timestamp_micro_second, window_size, offset)?;
 
-    Ok(NaiveDateTimeWrapper::from_timestamp_uncheck(
+    Ok(Timestamp::from_timestamp_uncheck(
         window_start_micro_second / 1_000_000,
         (window_start_micro_second % 1_000_000 * 1000) as u32,
     ))
@@ -89,11 +79,11 @@ pub fn tumble_start_offset_date_time(
 #[inline(always)]
 fn get_window_start_with_offset(
     timestamp_micro_second: i64,
-    window_size: IntervalUnit,
-    offset: IntervalUnit,
+    window_size: Interval,
+    offset: Interval,
 ) -> Result<i64> {
-    let window_size_micro_second = interval_unit_to_micro_second(window_size);
-    let offset_micro_second = interval_unit_to_micro_second(offset);
+    let window_size_micro_second = interval_to_micro_second(window_size);
+    let offset_micro_second = interval_to_micro_second(offset);
 
     // Inspired by https://issues.apache.org/jira/browse/FLINK-26334
     let remainder = (timestamp_micro_second - offset_micro_second) % window_size_micro_second;
@@ -104,11 +94,11 @@ fn get_window_start_with_offset(
     }
 }
 
-#[inline(always)]
+#[function("tumble_start(timestamptz, interval, interval) -> timestamptz")]
 pub fn tumble_start_offset_timestamptz(
     timestamp_micro_second: i64,
-    window_size: IntervalUnit,
-    offset: IntervalUnit,
+    window_size: Interval,
+    offset: Interval,
 ) -> Result<i64> {
     get_window_start_with_offset(timestamp_micro_second, window_size, offset)
 }
@@ -116,18 +106,18 @@ pub fn tumble_start_offset_timestamptz(
 #[cfg(test)]
 mod tests {
     use chrono::{Datelike, Timelike};
-    use risingwave_common::types::test_utils::IntervalUnitTestExt;
-    use risingwave_common::types::{IntervalUnit, NaiveDateWrapper};
+    use risingwave_common::types::test_utils::IntervalTestExt;
+    use risingwave_common::types::{Date, Interval};
 
     use super::tumble_start_offset_date_time;
     use crate::vector_op::tumble::{
-        get_window_start, interval_unit_to_micro_second, tumble_start_date_time,
+        get_window_start, interval_to_micro_second, tumble_start_date_time,
     };
 
     #[test]
     fn test_tumble_start_date_time() {
-        let dt = NaiveDateWrapper::from_ymd_uncheck(2022, 2, 22).and_hms_uncheck(22, 22, 22);
-        let interval = IntervalUnit::from_minutes(30);
+        let dt = Date::from_ymd_uncheck(2022, 2, 22).and_hms_uncheck(22, 22, 22);
+        let interval = Interval::from_minutes(30);
         let w = tumble_start_date_time(dt, interval).unwrap().0;
         assert_eq!(w.year(), 2022);
         assert_eq!(w.month(), 2);
@@ -139,18 +129,18 @@ mod tests {
 
     #[test]
     fn test_tumble_start_offset_date_time() {
-        let dt = NaiveDateWrapper::from_ymd_uncheck(2022, 2, 22).and_hms_uncheck(22, 22, 22);
+        let dt = Date::from_ymd_uncheck(2022, 2, 22).and_hms_uncheck(22, 22, 22);
         let window_size = 30;
         for offset in 0..window_size {
             for coefficient in 0..5 {
-                let w = tumble_start_date_time(dt, IntervalUnit::from_minutes(window_size))
+                let w = tumble_start_date_time(dt, Interval::from_minutes(window_size))
                     .unwrap()
                     .0;
                 println!("{}", w);
                 let w = tumble_start_offset_date_time(
                     dt,
-                    IntervalUnit::from_minutes(window_size),
-                    IntervalUnit::from_minutes(coefficient * window_size + offset),
+                    Interval::from_minutes(window_size),
+                    Interval::from_minutes(coefficient * window_size + offset),
                 )
                 .unwrap()
                 .0;
@@ -174,11 +164,11 @@ mod tests {
     fn test_remainder_necessary() {
         let mut wrong_cnt = 0;
         for i in -30..30 {
-            let timestamp_micro_second = IntervalUnit::from_minutes(i).get_usecs();
-            let window_size = IntervalUnit::from_minutes(5);
+            let timestamp_micro_second = Interval::from_minutes(i).get_usecs();
+            let window_size = Interval::from_minutes(5);
             let window_start = get_window_start(timestamp_micro_second, window_size).unwrap();
 
-            let window_size_micro_second = interval_unit_to_micro_second(window_size);
+            let window_size_micro_second = interval_to_micro_second(window_size);
             let default_window_start = timestamp_micro_second
                 - (timestamp_micro_second + window_size_micro_second) % window_size_micro_second;
 
diff --git a/src/expr/src/vector_op/upper.rs b/src/expr/src/vector_op/upper.rs
index 9bd54ba13cb4d..45cf51ce9e327 100644
--- a/src/expr/src/vector_op/upper.rs
+++ b/src/expr/src/vector_op/upper.rs
@@ -14,14 +14,13 @@
 
 use std::fmt::Write;
 
-use crate::Result;
+use risingwave_expr_macro::function;
 
-#[inline(always)]
-pub fn upper(s: &str, writer: &mut dyn Write) -> Result<()> {
+#[function("upper(varchar) -> varchar")]
+pub fn upper(s: &str, writer: &mut dyn Write) {
     for c in s.chars() {
         writer.write_char(c.to_ascii_uppercase()).unwrap();
     }
-    Ok(())
 }
 
 #[cfg(test)]
@@ -29,7 +28,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_upper() -> Result<()> {
+    fn test_upper() {
         let cases = [
             ("hello world", "HELLO WORLD"),
             ("hello RUST", "HELLO RUST"),
@@ -38,9 +37,8 @@ mod tests {
 
         for (s, expected) in cases {
             let mut writer = String::new();
-            upper(s, &mut writer)?;
+            upper(s, &mut writer);
             assert_eq!(writer, expected);
         }
-        Ok(())
     }
 }
diff --git a/src/frontend/Cargo.toml b/src/frontend/Cargo.toml
index d4c8e2a194bea..c0be257d3f6ac 100644
--- a/src/frontend/Cargo.toml
+++ b/src/frontend/Cargo.toml
@@ -44,6 +44,7 @@ petgraph = "0.6"
 pgwire = { path = "../utils/pgwire" }
 pin-project-lite = "0.2"
 postgres-types = { version = "0.2.4" }
+pretty-xmlish = "0.1.10"
 prometheus = { version = "0.13", features = ["process"] }
 rand = "0.8"
 risingwave_batch = { path = "../batch" }
diff --git a/src/frontend/planner_test/src/lib.rs b/src/frontend/planner_test/src/lib.rs
index 36819c6a86b59..a13f99e699231 100644
--- a/src/frontend/planner_test/src/lib.rs
+++ b/src/frontend/planner_test/src/lib.rs
@@ -19,7 +19,7 @@
 
 mod resolve_id;
 
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 use std::path::Path;
 use std::sync::Arc;
 
@@ -33,7 +33,7 @@ use risingwave_frontend::session::SessionImpl;
 use risingwave_frontend::test_utils::{create_proto_file, get_explain_output, LocalFrontend};
 use risingwave_frontend::{
     build_graph, explain_stream_graph, Binder, Explain, FrontendOpts, OptimizerContext,
-    OptimizerContextRef, PlanRef, Planner,
+    OptimizerContextRef, PlanRef, Planner, WithOptions,
 };
 use risingwave_sqlparser::ast::{ExplainOptions, ObjectName, Statement};
 use risingwave_sqlparser::parser::Parser;
@@ -83,6 +83,10 @@ pub struct TestCase {
     /// Batch plan for local execution `.gen_batch_local_plan()`
     pub batch_local_plan: Option<String>,
 
+    /// Create sink plan (assumes blackhole sink)
+    /// TODO: Other sinks
+    pub sink_plan: Option<String>,
+
     /// Create MV plan `.gen_create_mv_plan()`
     pub stream_plan: Option<String>,
 
@@ -152,6 +156,9 @@ pub struct TestCaseResult {
     /// Batch plan for local execution `.gen_batch_local_plan()`
     pub batch_local_plan: Option<String>,
 
+    /// Generate sink plan
+    pub sink_plan: Option<String>,
+
     /// Create MV plan `.gen_create_mv_plan()`
     pub stream_plan: Option<String>,
 
@@ -176,6 +183,9 @@ pub struct TestCaseResult {
     /// Error of `.gen_stream_plan()`
     pub stream_error: Option<String>,
 
+    /// Error of `.gen_sink_plan()`
+    pub sink_error: Option<String>,
+
     /// The result of an `EXPLAIN` statement.
     ///
     /// This field is used when `sql` is an `EXPLAIN` statement.
@@ -209,6 +219,7 @@ impl TestCaseResult {
             batch_plan: self.batch_plan,
             batch_local_plan: self.batch_local_plan,
             stream_plan: self.stream_plan,
+            sink_plan: self.sink_plan,
             batch_plan_proto: self.batch_plan_proto,
             planner_error: self.planner_error,
             optimizer_error: self.optimizer_error,
@@ -635,7 +646,31 @@ impl TestCase {
                 // Only generate stream_dist_plan if it is specified in test case
                 if self.stream_dist_plan.is_some() {
                     let graph = build_graph(stream_plan);
-                    ret.stream_dist_plan = Some(explain_stream_graph(&graph, false).unwrap());
+                    ret.stream_dist_plan = Some(explain_stream_graph(&graph, false));
+                }
+            }
+        }
+
+        'sink: {
+            if self.sink_plan.is_some() {
+                let sink_name = "sink_test";
+                let mut options = HashMap::new();
+                options.insert("connector".to_string(), "blackhole".to_string());
+                options.insert("type".to_string(), "append-only".to_string());
+                let options = WithOptions::new(options);
+                match logical_plan.gen_sink_plan(
+                    sink_name.to_string(),
+                    format!("CREATE SINK {sink_name} AS {}", stmt),
+                    options,
+                ) {
+                    Ok(sink_plan) => {
+                        ret.sink_plan = Some(explain_plan(&sink_plan.into()));
+                        break 'sink;
+                    }
+                    Err(err) => {
+                        ret.sink_error = Some(err.to_string());
+                        break 'sink;
+                    }
                 }
             }
         }
@@ -696,7 +731,7 @@ fn check_result(expected: &TestCase, actual: &TestCaseResult) -> Result<()> {
         &expected.explain_output,
         &actual.explain_output,
     )?;
-
+    check_option_plan_eq("sink_plan", &expected.sink_plan, &actual.sink_plan)?;
     Ok(())
 }
 
diff --git a/src/frontend/planner_test/tests/testdata/agg.yaml b/src/frontend/planner_test/tests/testdata/agg.yaml
index 2faa95ab79834..3d2ff0f1f709a 100644
--- a/src/frontend/planner_test/tests/testdata/agg.yaml
+++ b/src/frontend/planner_test/tests/testdata/agg.yaml
@@ -30,7 +30,7 @@
       └─BatchExchange { order: [], dist: Single }
         └─BatchScan { table: t, columns: [t.v1, t.v2, t.v3], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, agg], pk_columns: [v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, agg], stream_key: [v1], pk_columns: [v1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.v1, (min(t.v2) + (max(t.v3) * count(t.v1))) as $expr1] }
       └─StreamHashAgg { group_key: [t.v1], aggs: [min(t.v2), max(t.v3), count(t.v1), count] }
         └─StreamExchange { dist: HashShard(t.v1) }
@@ -50,7 +50,7 @@
       └─BatchExchange { order: [], dist: Single }
         └─BatchScan { table: t, columns: [t.v1, t.v2, t.v3], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [agg], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [agg], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [(min(min(t.v1)) + (max(max(t.v2)) * sum0(count(t.v3)))) as $expr2] }
       └─StreamGlobalSimpleAgg { aggs: [min(min(t.v1)), max(max(t.v2)), sum0(count(t.v3)), count] }
         └─StreamExchange { dist: Single }
@@ -82,7 +82,7 @@
         └─BatchProject { exprs: [t.v3, t.v1, (t.v1 + t.v2) as $expr1] }
           └─BatchScan { table: t, columns: [t.v1, t.v2, t.v3], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v3, agg], pk_columns: [v3], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v3, agg], stream_key: [v3], pk_columns: [v3], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.v3, (min(t.v1) * (sum($expr1)::Decimal / count($expr1))) as $expr2] }
       └─StreamHashAgg { group_key: [t.v3], aggs: [min(t.v1), sum($expr1), count($expr1), count] }
         └─StreamExchange { dist: HashShard(t.v3) }
@@ -150,7 +150,7 @@
       └─BatchProject { exprs: [(t.v1 + t.v2) as $expr1] }
         └─BatchScan { table: t, columns: [t.v1, t.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [cnt, sum], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [cnt, sum], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum0(count($expr1)), sum(sum($expr1))] }
       └─StreamGlobalSimpleAgg { aggs: [sum0(count($expr1)), sum(sum($expr1)), count] }
         └─StreamExchange { dist: Single }
@@ -168,7 +168,7 @@
           └─BatchProject { exprs: [t.v1, (t.v2 + t.v3) as $expr1] }
             └─BatchScan { table: t, columns: [t.v1, t.v2, t.v3], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, agg], pk_columns: [v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, agg], stream_key: [v1], pk_columns: [v1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.v1, ((sum($expr1) / count($expr1)) + max(t.v1)) as $expr2] }
       └─StreamHashAgg { group_key: [t.v1], aggs: [sum($expr1), count($expr1), max(t.v1), count] }
         └─StreamExchange { dist: HashShard(t.v1) }
@@ -420,7 +420,7 @@
         └─BatchSimpleAgg { aggs: [min(t.v1), max(t.v3), count(t.v2)] }
           └─BatchScan { table: t, columns: [t.v1, t.v2, t.v3], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [agg], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [agg], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [(min(min(t.v1)) + (max(max(t.v3)) * sum0(count(t.v2)))) as $expr2] }
       └─StreamGlobalSimpleAgg { aggs: [min(min(t.v1)), max(max(t.v3)), sum0(count(t.v2)), count] }
         └─StreamExchange { dist: Single }
@@ -442,7 +442,7 @@
       └─LogicalAgg { group_key: [t.v1], aggs: [] }
         └─LogicalScan { table: t, columns: [t.v1] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t.v1(hidden)], pk_columns: [t.v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t.v1(hidden)], stream_key: [t.v1], pk_columns: [t.v1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.v1, t.v1] }
       └─StreamHashAgg { group_key: [t.v1], aggs: [count] }
         └─StreamExchange { dist: HashShard(t.v1) }
@@ -462,7 +462,7 @@
       └─LogicalAgg { group_key: [t.v3, t.v2], aggs: [min(t.v1), max(t.v1)] }
         └─LogicalScan { table: t, columns: [t.v1, t.v2, t.v3] }
   stream_plan: |
-    StreamMaterialize { columns: [v2, min_v1, v3, max_v1, t.v2(hidden)], pk_columns: [v3, t.v2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v2, min_v1, v3, max_v1, t.v2(hidden)], stream_key: [v3, t.v2], pk_columns: [v3, t.v2], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.v2, min(t.v1), t.v3, max(t.v1), t.v2] }
       └─StreamHashAgg { group_key: [t.v3, t.v2], aggs: [min(t.v1), max(t.v1), count] }
         └─StreamExchange { dist: HashShard(t.v2, t.v3) }
@@ -480,7 +480,7 @@
     LogicalAgg { aggs: [sum(t.v1)] }
     └─LogicalScan { table: t, columns: [t.v1] }
   stream_plan: |
-    StreamMaterialize { columns: [s1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [s1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum(t.v1))] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum(t.v1)), count] }
         └─StreamExchange { dist: Single }
@@ -499,7 +499,7 @@
     LogicalAgg { aggs: [sum(t.v1)] }
     └─LogicalScan { table: t, columns: [t.v1] }
   stream_plan: |
-    StreamMaterialize { columns: [s1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [s1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum(t.v1))] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum(t.v1)), count] }
         └─StreamExchange { dist: Single }
@@ -518,7 +518,7 @@
     LogicalAgg { aggs: [sum(t.v1)] }
     └─LogicalScan { table: t, columns: [t.v1] }
   stream_plan: |
-    StreamMaterialize { columns: [s1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [s1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum(t.v1))] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum(t.v1)), count] }
         └─StreamExchange { dist: Single }
@@ -537,7 +537,7 @@
     LogicalAgg { aggs: [sum(t.v1) filter((t.v1 > 0:Int32))] }
     └─LogicalScan { table: t, columns: [t.v1] }
   stream_plan: |
-    StreamMaterialize { columns: [sa], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [sa], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum(t.v1) filter((t.v1 > 0:Int32)))] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum(t.v1) filter((t.v1 > 0:Int32))), count] }
         └─StreamExchange { dist: Single }
@@ -572,14 +572,13 @@
     └─LogicalProject { exprs: [t.a, t.b, (t.a * t.b) as $expr1] }
       └─LogicalScan { table: t, columns: [t.a, t.b] }
   stream_plan: |
-    StreamMaterialize { columns: [sab], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [sab], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(max($expr1) filter((t.a < t.b) AND ((t.a + t.b) < 100:Int32) AND ((t.a * t.b) <> ((t.a + t.b) - 1:Int32))))] }
       └─StreamGlobalSimpleAgg { aggs: [max(max($expr1) filter((t.a < t.b) AND ((t.a + t.b) < 100:Int32) AND ((t.a * t.b) <> ((t.a + t.b) - 1:Int32)))), count] }
         └─StreamExchange { dist: Single }
           └─StreamHashAgg { group_key: [$expr2], aggs: [max($expr1) filter((t.a < t.b) AND ((t.a + t.b) < 100:Int32) AND ((t.a * t.b) <> ((t.a + t.b) - 1:Int32))), count] }
-            └─StreamProject { exprs: [t.a, t.b, $expr1, t._row_id, Vnode(t._row_id) as $expr2] }
-              └─StreamProject { exprs: [t.a, t.b, (t.a * t.b) as $expr1, t._row_id] }
-                └─StreamTableScan { table: t, columns: [t.a, t.b, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+            └─StreamProject { exprs: [t.a, t.b, (t.a * t.b) as $expr1, t._row_id, Vnode(t._row_id) as $expr2] }
+              └─StreamTableScan { table: t, columns: [t.a, t.b, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - name: avg filter clause + group by
   sql: |
     create table t(a int, b int);
@@ -594,7 +593,7 @@
     └─LogicalAgg { group_key: [t.b], aggs: [sum(t.a) filter((t.a > t.b)), count(t.a) filter((t.a > t.b))] }
       └─LogicalScan { table: t, columns: [t.a, t.b] }
   stream_plan: |
-    StreamMaterialize { columns: [avga, t.b(hidden)], pk_columns: [t.b], pk_conflict: "no check" }
+    StreamMaterialize { columns: [avga, t.b(hidden)], stream_key: [t.b], pk_columns: [t.b], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [(sum(t.a) filter((t.a > t.b))::Decimal / count(t.a) filter((t.a > t.b))) as $expr1, t.b] }
       └─StreamHashAgg { group_key: [t.b], aggs: [sum(t.a) filter((t.a > t.b)), count(t.a) filter((t.a > t.b)), count] }
         └─StreamExchange { dist: HashShard(t.b) }
@@ -612,7 +611,7 @@
     LogicalAgg { aggs: [count filter((t.a > t.b))] }
     └─LogicalScan { table: t, columns: [t.a, t.b] }
   stream_plan: |
-    StreamMaterialize { columns: [cnt_agb], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [cnt_agb], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum0(count filter((t.a > t.b)))] }
       └─StreamGlobalSimpleAgg { aggs: [sum0(count filter((t.a > t.b))), count] }
         └─StreamExchange { dist: Single }
@@ -652,7 +651,7 @@
       └─BatchSimpleAgg { aggs: [sum(t.v2) filter((t.v2 < 5:Int32))] }
         └─BatchScan { table: t, columns: [t.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [b], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [b], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum(t.v2) filter((t.v2 < 5:Int32)))] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum(t.v2) filter((t.v2 < 5:Int32))), count] }
         └─StreamExchange { dist: Single }
@@ -683,7 +682,7 @@
           └─BatchExchange { order: [], dist: HashShard(t.a, t.b) }
             └─BatchScan { table: t, columns: [t.a, t.b, t.c], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a, distinct_b_num, sum_c], pk_columns: [a], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, distinct_b_num, sum_c], stream_key: [a], pk_columns: [a], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.a, count(distinct t.b), sum(t.c)] }
       └─StreamHashAgg { group_key: [t.a], aggs: [count(distinct t.b), sum(t.c), count] }
         └─StreamExchange { dist: HashShard(t.a) }
@@ -706,7 +705,7 @@
             └─BatchExpand { column_subsets: [[t.a, t.c], [t.a, t.b]] }
               └─BatchScan { table: t, columns: [t.a, t.b, t.c], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a, distinct_b_num, distinct_c_sum, sum_c], pk_columns: [a], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, distinct_b_num, distinct_c_sum, sum_c], stream_key: [a], pk_columns: [a], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.a, count(distinct t.b), count(distinct t.c), sum(t.c)] }
       └─StreamHashAgg { group_key: [t.a], aggs: [count(distinct t.b), count(distinct t.c), sum(t.c), count] }
         └─StreamExchange { dist: HashShard(t.a) }
@@ -727,7 +726,7 @@
           └─BatchExchange { order: [], dist: HashShard(t.a, t.b) }
             └─BatchScan { table: t, columns: [t.a, t.b, t.c], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a, count, sum], pk_columns: [a], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, count, sum], stream_key: [a], pk_columns: [a], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.a, count(distinct t.b) filter((t.b < 100:Int32)), sum(t.c)] }
       └─StreamHashAgg { group_key: [t.a], aggs: [count(distinct t.b) filter((t.b < 100:Int32)), sum(t.c), count] }
         └─StreamExchange { dist: HashShard(t.a) }
@@ -754,7 +753,7 @@
     └─LogicalProject { exprs: [t.b, (Length(t.a) * t.b) as $expr1] }
       └─LogicalScan { table: t, columns: [t.a, t.b] }
   stream_plan: |
-    StreamMaterialize { columns: [s1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [s1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum($expr1) filter((t.b < 100:Int32) AND ((t.b * 2:Int32) > 10:Int32)))] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum($expr1) filter((t.b < 100:Int32) AND ((t.b * 2:Int32) > 10:Int32))), count] }
         └─StreamExchange { dist: Single }
@@ -783,7 +782,7 @@
       └─BatchSortAgg { group_key: [i.x], aggs: [count] }
         └─BatchScan { table: i, columns: [i.x], distribution: UpstreamHashShard(i.x) }
   stream_plan: |
-    StreamMaterialize { columns: [cnt, i.x(hidden)], pk_columns: [i.x], pk_conflict: "no check" }
+    StreamMaterialize { columns: [cnt, i.x(hidden)], stream_key: [i.x], pk_columns: [i.x], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [count, i.x] }
       └─StreamHashAgg { group_key: [i.x], aggs: [count] }
         └─StreamTableScan { table: i, columns: [i.x, i.t._row_id], pk: [i.t._row_id], dist: UpstreamHashShard(i.x) }
@@ -1034,7 +1033,7 @@
         └─BatchProject { exprs: [t.v1, (t.v1 * t.v1) as $expr1] }
           └─BatchScan { table: t, columns: [t.v1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [stddev_samp, stddev_pop], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [stddev_samp, stddev_pop], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [Case((sum0(count(t.v1)) <= 1:Int64), null:Float64, Pow(((sum(sum($expr1))::Decimal - ((sum(sum(t.v1))::Decimal * sum(sum(t.v1))::Decimal) / sum0(count(t.v1)))) / (sum0(count(t.v1)) - 1:Int64))::Float64, 0.5:Float64)) as $expr2, Pow(((sum(sum($expr1))::Decimal - ((sum(sum(t.v1))::Decimal * sum(sum(t.v1))::Decimal) / sum0(count(t.v1)))) / sum0(count(t.v1)))::Float64, 0.5:Float64) as $expr3] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), sum(sum(t.v1)), sum0(count(t.v1)), count] }
         └─StreamExchange { dist: Single }
@@ -1055,7 +1054,7 @@
           └─BatchHashAgg { group_key: [t.v1, t.v3, t.v2], aggs: [min(t.v3), sum(t.v1)] }
             └─BatchScan { table: t, columns: [t.v1, t.v2, t.v3], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [min, sum, t.v1(hidden), t.v3(hidden), t.v2(hidden)], pk_columns: [t.v1, t.v3, t.v2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [min, sum, t.v1(hidden), t.v3(hidden), t.v2(hidden)], stream_key: [t.v1, t.v3, t.v2], pk_columns: [t.v1, t.v3, t.v2], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [min(min(t.v3)), sum(sum(t.v1)), t.v1, t.v3, t.v2] }
       └─StreamHashAgg { group_key: [t.v1, t.v3, t.v2], aggs: [min(min(t.v3)), sum(sum(t.v1)), count] }
         └─StreamExchange { dist: HashShard(t.v1, t.v3, t.v2) }
@@ -1074,7 +1073,7 @@
       └─BatchSimpleAgg { aggs: [min(t.v1), sum(t.v2)] }
         └─BatchScan { table: t, columns: [t.v1, t.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [min, sum], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [min, sum], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [min(min(t.v1)), sum(sum(t.v2))] }
       └─StreamGlobalSimpleAgg { aggs: [min(min(t.v1)), sum(sum(t.v2)), count] }
         └─StreamExchange { dist: Single }
@@ -1092,7 +1091,7 @@
     └─BatchExchange { order: [], dist: Single }
       └─BatchScan { table: t, columns: [t.v1, t.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [min, sum], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [min, sum], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [min(t.v1), sum(t.v2)] }
       └─StreamGlobalSimpleAgg { aggs: [min(t.v1), sum(t.v2), count] }
         └─StreamExchange { dist: Single }
@@ -1133,15 +1132,14 @@
             └─BatchHashAgg { group_key: [lineitem.l_tax, lineitem.l_shipinstruct, lineitem.l_orderkey, lineitem.l_commitdate], aggs: [] }
               └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_tax, lineitem.l_commitdate, lineitem.l_shipinstruct], distribution: UpstreamHashShard(lineitem.l_orderkey) }
   stream_plan: |
-    StreamMaterialize { columns: [col_0, lineitem.l_commitdate(hidden)], pk_columns: [lineitem.l_commitdate], pk_conflict: "no check" }
+    StreamMaterialize { columns: [col_0, lineitem.l_commitdate(hidden)], stream_key: [lineitem.l_commitdate], pk_columns: [lineitem.l_commitdate], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(max(lineitem.l_commitdate)), lineitem.l_commitdate] }
       └─StreamHashAgg { group_key: [lineitem.l_commitdate], aggs: [max(max(lineitem.l_commitdate)), count] }
         └─StreamExchange { dist: HashShard(lineitem.l_commitdate) }
           └─StreamHashAgg { group_key: [lineitem.l_commitdate, $expr1], aggs: [max(lineitem.l_commitdate), count] }
             └─StreamProject { exprs: [lineitem.l_tax, lineitem.l_shipinstruct, lineitem.l_orderkey, lineitem.l_commitdate, Vnode(lineitem.l_orderkey) as $expr1] }
-              └─StreamProject { exprs: [lineitem.l_tax, lineitem.l_shipinstruct, lineitem.l_orderkey, lineitem.l_commitdate] }
-                └─StreamHashAgg { group_key: [lineitem.l_tax, lineitem.l_shipinstruct, lineitem.l_orderkey, lineitem.l_commitdate], aggs: [count] }
-                  └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_tax, lineitem.l_commitdate, lineitem.l_shipinstruct], pk: [lineitem.l_orderkey], dist: UpstreamHashShard(lineitem.l_orderkey) }
+              └─StreamHashAgg { group_key: [lineitem.l_tax, lineitem.l_shipinstruct, lineitem.l_orderkey, lineitem.l_commitdate], aggs: [count] }
+                └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_tax, lineitem.l_commitdate, lineitem.l_shipinstruct], pk: [lineitem.l_orderkey], dist: UpstreamHashShard(lineitem.l_orderkey) }
 - name: two phase agg on hop window input should use two phase agg
   sql: |
     SET QUERY_MODE TO DISTRIBUTED;
@@ -1174,20 +1172,19 @@
                     └─BatchFilter { predicate: IsNotNull(bid.date_time) }
                       └─BatchScan { table: bid, columns: [bid.date_time, bid.auction], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [maxn, starttime_c], pk_columns: [starttime_c], pk_conflict: "no check" }
+    StreamMaterialize { columns: [maxn, starttime_c], stream_key: [starttime_c], pk_columns: [starttime_c], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(max(sum0(count))), window_start] }
       └─StreamHashAgg { group_key: [window_start], aggs: [max(max(sum0(count))), count] }
         └─StreamExchange { dist: HashShard(window_start) }
           └─StreamHashAgg { group_key: [window_start, $expr2], aggs: [max(sum0(count)), count] }
             └─StreamProject { exprs: [bid.auction, window_start, sum0(count), Vnode(bid.auction, window_start) as $expr2] }
-              └─StreamProject { exprs: [bid.auction, window_start, sum0(count)] }
-                └─StreamHashAgg { group_key: [bid.auction, window_start], aggs: [sum0(count), count] }
-                  └─StreamExchange { dist: HashShard(bid.auction, window_start) }
-                    └─StreamHashAgg { group_key: [bid.auction, window_start, $expr1], aggs: [count] }
-                      └─StreamProject { exprs: [bid.auction, window_start, bid._row_id, Vnode(bid._row_id) as $expr1] }
-                        └─StreamHopWindow { time_col: bid.date_time, slide: 00:00:02, size: 00:00:10, output: [bid.auction, window_start, bid._row_id] }
-                          └─StreamFilter { predicate: IsNotNull(bid.date_time) }
-                            └─StreamTableScan { table: bid, columns: [bid.date_time, bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+              └─StreamHashAgg { group_key: [bid.auction, window_start], aggs: [sum0(count), count] }
+                └─StreamExchange { dist: HashShard(bid.auction, window_start) }
+                  └─StreamHashAgg { group_key: [bid.auction, window_start, $expr1], aggs: [count] }
+                    └─StreamProject { exprs: [bid.auction, window_start, bid._row_id, Vnode(bid._row_id) as $expr1] }
+                      └─StreamHopWindow { time_col: bid.date_time, slide: 00:00:02, size: 00:00:10, output: [bid.auction, window_start, bid._row_id] }
+                        └─StreamFilter { predicate: IsNotNull(bid.date_time) }
+                          └─StreamTableScan { table: bid, columns: [bid.date_time, bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
 - name: two phase agg with stream SomeShard (via index) but pk satisfies output dist should use shuffle agg
   sql: |
     SET QUERY_MODE TO DISTRIBUTED;
@@ -1203,7 +1200,7 @@
           └─BatchHashAgg { group_key: [idx.id], aggs: [count] }
             └─BatchScan { table: idx, columns: [idx.id], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [count, idx.id(hidden)], pk_columns: [idx.id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [count, idx.id(hidden)], stream_key: [idx.id], pk_columns: [idx.id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [count, idx.id] }
       └─StreamHashAgg { group_key: [idx.id], aggs: [count] }
         └─StreamExchange { dist: HashShard(idx.id) }
@@ -1223,7 +1220,7 @@
           └─BatchHashAgg { group_key: [idx.col1], aggs: [count] }
             └─BatchScan { table: idx, columns: [idx.col1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [count, idx.col1(hidden)], pk_columns: [idx.col1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [count, idx.col1(hidden)], stream_key: [idx.col1], pk_columns: [idx.col1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum0(count), idx.col1] }
       └─StreamHashAgg { group_key: [idx.col1], aggs: [sum0(count), count] }
         └─StreamExchange { dist: HashShard(idx.col1) }
diff --git a/src/frontend/planner_test/tests/testdata/append_only.yaml b/src/frontend/planner_test/tests/testdata/append_only.yaml
index 1fec7e202dec3..a3d2ebf80d0f9 100644
--- a/src/frontend/planner_test/tests/testdata/append_only.yaml
+++ b/src/frontend/planner_test/tests/testdata/append_only.yaml
@@ -3,7 +3,7 @@
     create table t1 (v1 int, v2 int) append only;
     select v1, max(v2) as mx2 from t1 group by v1;
   stream_plan: |
-    StreamMaterialize { columns: [v1, mx2], pk_columns: [v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, mx2], stream_key: [v1], pk_columns: [v1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.v1, max(t1.v2)] }
       └─StreamAppendOnlyHashAgg { group_key: [t1.v1], aggs: [max(t1.v2), count] }
         └─StreamExchange { dist: HashShard(t1.v1) }
@@ -13,7 +13,7 @@
     create table t2 (v1 int, v3 int) append only;
     select t1.v1 as id, v2, v3 from t1 join t2 on t1.v1=t2.v1;
   stream_plan: |
-    StreamMaterialize { columns: [id, v2, v3, t1._row_id(hidden), t2._row_id(hidden)], pk_columns: [t1._row_id, t2._row_id, id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, v2, v3, t1._row_id(hidden), t2._row_id(hidden)], stream_key: [t1._row_id, t2._row_id, id], pk_columns: [t1._row_id, t2._row_id, id], pk_conflict: "NoCheck" }
     └─StreamAppendOnlyHashJoin { type: Inner, predicate: t1.v1 = t2.v1, output: [t1.v1, t1.v2, t2.v3, t1._row_id, t2._row_id] }
       ├─StreamExchange { dist: HashShard(t1.v1) }
       | └─StreamTableScan { table: t1, columns: [t1.v1, t1.v2, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -23,7 +23,7 @@
     create table t1 (v1 int, v2 int) append only;
     select v1 from t1 order by v1 limit 3 offset 3;
   stream_plan: |
-    StreamMaterialize { columns: [v1, t1._row_id(hidden)], pk_columns: [t1._row_id], order_descs: [v1, t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [v1, t1._row_id], pk_conflict: "NoCheck" }
     └─StreamAppendOnlyTopN { order: "[t1.v1 ASC]", limit: 3, offset: 3 }
       └─StreamExchange { dist: Single }
         └─StreamTableScan { table: t1, columns: [t1.v1, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -31,7 +31,7 @@
     create table t1 (v1 int, v2 int) append only;
     select max(v1) as max_v1 from t1;
   stream_plan: |
-    StreamMaterialize { columns: [max_v1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_v1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(max(t1.v1))] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [max(max(t1.v1)), count] }
         └─StreamExchange { dist: Single }
diff --git a/src/frontend/planner_test/tests/testdata/basic_query.yaml b/src/frontend/planner_test/tests/testdata/basic_query.yaml
index b856a6050082c..1ed5bef5ddd22 100644
--- a/src/frontend/planner_test/tests/testdata/basic_query.yaml
+++ b/src/frontend/planner_test/tests/testdata/basic_query.yaml
@@ -11,7 +11,7 @@
     BatchExchange { order: [], dist: Single }
     └─BatchScan { table: t, columns: [t.v1, t.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamTableScan { table: t, columns: [t.v1, t.v2, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - sql: |
     create table t (v1 bigint, v2 double precision);
@@ -25,7 +25,7 @@
     └─BatchFilter { predicate: true }
       └─BatchScan { table: t, columns: [], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamFilter { predicate: true }
       └─StreamTableScan { table: t, columns: [t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - sql: |
@@ -36,7 +36,7 @@
     └─BatchFilter { predicate: (t.v1 < 1:Int32) }
       └─BatchScan { table: t, columns: [t.v1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamFilter { predicate: (t.v1 < 1:Int32) }
       └─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - name: test boolean expression common factor extraction
@@ -94,7 +94,7 @@
     BatchExchange { order: [], dist: Single }
     └─BatchScan { table: t, columns: [t.v1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - sql: select 1
   batch_plan: |
@@ -184,20 +184,42 @@
     create materialized view mv(A,b) as select * from t;
     select a, b from mv;
   stream_plan: |
-    StreamMaterialize { columns: [a, b, mv.t._row_id(hidden)], pk_columns: [mv.t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, b, mv.t._row_id(hidden)], stream_key: [mv.t._row_id], pk_columns: [mv.t._row_id], pk_conflict: "NoCheck" }
     └─StreamTableScan { table: mv, columns: [mv.a, mv.b, mv.t._row_id], pk: [mv.t._row_id], dist: UpstreamHashShard(mv.t._row_id) }
 - sql: |
     create table t (v1 int, v2 int);
     create materialized view mv(a,b) as select v1+1,v2+1 from t;
     select * from mv;
   stream_plan: |
-    StreamMaterialize { columns: [a, b, mv.t._row_id(hidden)], pk_columns: [mv.t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, b, mv.t._row_id(hidden)], stream_key: [mv.t._row_id], pk_columns: [mv.t._row_id], pk_conflict: "NoCheck" }
     └─StreamTableScan { table: mv, columns: [mv.a, mv.b, mv.t._row_id], pk: [mv.t._row_id], dist: UpstreamHashShard(mv.t._row_id) }
 - sql: |
     create table t (id int primary key, col int);
     create index idx on t(col);
     select id from idx;
   stream_plan: |
-    StreamMaterialize { columns: [id], pk_columns: [id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id], stream_key: [id], pk_columns: [id], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(idx.id) }
       └─StreamTableScan { table: idx, columns: [idx.id], pk: [idx.id], dist: SomeShard }
+- sql: |
+    select * from generate_series(1, 10000000, 1) where Now() is null;
+  batch_plan: |
+    BatchValues { rows: [] }
+- sql: |
+    create table t (v int);
+    select * from t natural join (select * from t where 1=0);
+  batch_plan: |
+    BatchExchange { order: [], dist: Single }
+    └─BatchHashJoin { type: Inner, predicate: t.v = t.v, output: [t.v] }
+      ├─BatchExchange { order: [], dist: HashShard(t.v) }
+      | └─BatchScan { table: t, columns: [t.v], distribution: SomeShard }
+      └─BatchExchange { order: [], dist: HashShard(t.v) }
+        └─BatchValues { rows: [] }
+  stream_plan: |
+    StreamMaterialize { columns: [v, t._row_id(hidden), t._row_id#1(hidden)], stream_key: [t._row_id, t._row_id#1, v], pk_columns: [t._row_id, t._row_id#1, v], pk_conflict: "NoCheck" }
+    └─StreamHashJoin { type: Inner, predicate: t.v = t.v, output: [t.v, t._row_id, t._row_id] }
+      ├─StreamExchange { dist: HashShard(t.v) }
+      | └─StreamTableScan { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+      └─StreamExchange { dist: HashShard(t.v) }
+        └─StreamFilter { predicate: false:Boolean }
+          └─StreamTableScan { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
diff --git a/src/frontend/planner_test/tests/testdata/bushy_join.yaml b/src/frontend/planner_test/tests/testdata/bushy_join.yaml
new file mode 100644
index 0000000000000..02e55e1a34f38
--- /dev/null
+++ b/src/frontend/planner_test/tests/testdata/bushy_join.yaml
@@ -0,0 +1,1405 @@
+# This file is automatically generated. See `src/frontend/planner_test/README.md` for more information.
+- id: create_tables
+  sql: |
+    CREATE TABLE supplier (
+            s_suppkey  INTEGER,
+            s_name VARCHAR,
+            s_address VARCHAR,
+            s_nationkey INTEGER,
+            s_phone VARCHAR,
+            s_acctbal NUMERIC,
+            s_comment VARCHAR,
+            PRIMARY KEY (s_suppkey)
+    );
+
+    CREATE TABLE part (
+            p_partkey INTEGER,
+            p_name VARCHAR,
+            p_mfgr VARCHAR,
+            p_brand VARCHAR,
+            p_type VARCHAR,
+            p_size INTEGER,
+            p_container VARCHAR,
+            p_retailprice NUMERIC,
+            p_comment VARCHAR,
+            PRIMARY KEY (p_partkey)
+    );
+
+    CREATE TABLE partsupp (
+            ps_partkey INTEGER,
+            ps_suppkey INTEGER,
+            ps_availqty INTEGER,
+            ps_supplycost NUMERIC,
+            ps_comment VARCHAR,
+            PRIMARY KEY (ps_partkey, ps_suppkey)
+    );
+
+    CREATE TABLE customer (
+            c_custkey INTEGER,
+            c_name VARCHAR,
+            c_address VARCHAR,
+            c_nationkey INTEGER,
+            c_phone VARCHAR,
+            c_acctbal NUMERIC,
+            c_mktsegment VARCHAR,
+            c_comment VARCHAR,
+            PRIMARY KEY (c_custkey)
+    );
+
+    CREATE TABLE orders (
+            o_orderkey BIGINT,
+            o_custkey INTEGER,
+            o_orderstatus VARCHAR,
+            o_totalprice NUMERIC,
+            o_orderdate DATE,
+            o_orderpriority VARCHAR,
+            o_clerk VARCHAR,
+            o_shippriority INTEGER,
+            o_comment VARCHAR,
+            PRIMARY KEY (o_orderkey)
+    );
+
+    CREATE TABLE lineitem (
+            l_orderkey BIGINT,
+            l_partkey INTEGER,
+            l_suppkey INTEGER,
+            l_linenumber INTEGER,
+            l_quantity NUMERIC,
+            l_extendedprice NUMERIC,
+            l_discount NUMERIC,
+            l_tax NUMERIC,
+            l_returnflag VARCHAR,
+            l_linestatus VARCHAR,
+            l_shipdate DATE,
+            l_commitdate DATE,
+            l_receiptdate DATE,
+            l_shipinstruct VARCHAR,
+            l_shipmode VARCHAR,
+            l_comment VARCHAR,
+            PRIMARY KEY (l_orderkey, l_linenumber)
+    );
+
+    CREATE TABLE nation (
+            n_nationkey INTEGER,
+            n_name VARCHAR,
+            n_regionkey INTEGER,
+            n_comment VARCHAR,
+            PRIMARY KEY (n_nationkey)
+    );
+
+    CREATE TABLE region (
+            r_regionkey INTEGER,
+            r_name VARCHAR,
+            r_comment VARCHAR,
+            PRIMARY KEY (r_regionkey)
+    );
+- id: tpch_q1
+  before:
+  - create_tables
+  sql: |
+    select
+      l_returnflag,
+      l_linestatus,
+      sum(l_quantity) as sum_qty,
+      sum(l_extendedprice) as sum_base_price,
+      sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,
+      sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,
+      round(avg(l_quantity), 4) as avg_qty,
+      round(avg(l_extendedprice), 4) as avg_price,
+      round(avg(l_discount), 4) as avg_disc,
+      count(*) as count_order
+    from
+      lineitem
+    where
+      l_shipdate <= date '1998-12-01' - interval '71' day
+    group by
+      l_returnflag,
+      l_linestatus
+    order by
+      l_returnflag,
+      l_linestatus;
+  stream_plan: |
+    StreamMaterialize { columns: [l_returnflag, l_linestatus, sum_qty, sum_base_price, sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc, count_order], stream_key: [l_returnflag, l_linestatus], pk_columns: [l_returnflag, l_linestatus], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [lineitem.l_returnflag, lineitem.l_linestatus, sum(lineitem.l_quantity), sum(lineitem.l_extendedprice), sum($expr1), sum($expr2), RoundDigit((sum(lineitem.l_quantity) / count(lineitem.l_quantity)), 4:Int32) as $expr3, RoundDigit((sum(lineitem.l_extendedprice) / count(lineitem.l_extendedprice)), 4:Int32) as $expr4, RoundDigit((sum(lineitem.l_discount) / count(lineitem.l_discount)), 4:Int32) as $expr5, count] }
+      └─StreamHashAgg { group_key: [lineitem.l_returnflag, lineitem.l_linestatus], aggs: [sum(lineitem.l_quantity), sum(lineitem.l_extendedprice), sum($expr1), sum($expr2), count(lineitem.l_quantity), count(lineitem.l_extendedprice), sum(lineitem.l_discount), count(lineitem.l_discount), count] }
+        └─StreamExchange { dist: HashShard(lineitem.l_returnflag, lineitem.l_linestatus) }
+          └─StreamProject { exprs: [lineitem.l_returnflag, lineitem.l_linestatus, lineitem.l_quantity, lineitem.l_extendedprice, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, ((lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) * (1:Int32 + lineitem.l_tax)) as $expr2, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
+            └─StreamFilter { predicate: (lineitem.l_shipdate <= '1998-09-21 00:00:00':Timestamp) }
+              └─StreamTableScan { table: lineitem, columns: [lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_tax, lineitem.l_returnflag, lineitem.l_linestatus, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q2
+  before:
+  - create_tables
+  sql: |
+    select
+        s_acctbal,
+        s_name,
+        n_name,
+        p_partkey,
+        p_mfgr,
+        s_address,
+        s_phone,
+        s_comment
+    from
+        part,
+        supplier,
+        partsupp,
+        nation,
+        region
+    where
+            p_partkey = ps_partkey
+            and s_suppkey = ps_suppkey
+      and p_size = 4
+      and p_type like '%TIN'
+            and s_nationkey = n_nationkey
+            and n_regionkey = r_regionkey
+            and r_name = 'AFRICA'
+            and ps_supplycost = (
+                    select
+                            min(ps_supplycost)
+                    from
+                            partsupp,
+                            supplier,
+                            nation,
+                            region
+                    where
+                            p_partkey = ps_partkey
+                            and s_suppkey = ps_suppkey
+                            and s_nationkey = n_nationkey
+                            and n_regionkey = r_regionkey
+                            and r_name = 'AFRICA'
+            )
+    order by
+          s_acctbal desc,
+          n_name,
+          s_name,
+          p_partkey
+    limit 100;
+  stream_plan: |
+    StreamMaterialize { columns: [s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address, s_phone, s_comment, region.r_regionkey(hidden), nation.n_nationkey(hidden), supplier.s_suppkey(hidden), part.p_partkey(hidden), partsupp.ps_partkey(hidden), partsupp.ps_suppkey(hidden), min(partsupp.ps_supplycost)(hidden)], stream_key: [region.r_regionkey, nation.n_nationkey, supplier.s_suppkey, part.p_partkey, p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, min(partsupp.ps_supplycost)], pk_columns: [s_acctbal, n_name, s_name, p_partkey, region.r_regionkey, nation.n_nationkey, supplier.s_suppkey, part.p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, min(partsupp.ps_supplycost)], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, region.r_regionkey, nation.n_nationkey, supplier.s_suppkey, part.p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, min(partsupp.ps_supplycost)] }
+      └─StreamTopN { order: "[supplier.s_acctbal DESC, nation.n_name ASC, supplier.s_name ASC, part.p_partkey ASC]", limit: 100, offset: 0 }
+        └─StreamExchange { dist: Single }
+          └─StreamGroupTopN { order: "[supplier.s_acctbal DESC, nation.n_name ASC, supplier.s_name ASC, part.p_partkey ASC]", limit: 100, offset: 0, group_key: [15] }
+            └─StreamProject { exprs: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, region.r_regionkey, nation.n_nationkey, supplier.s_suppkey, part.p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, min(partsupp.ps_supplycost), Vnode(supplier.s_suppkey) as $expr1] }
+              └─StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = partsupp.ps_suppkey, output: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, region.r_regionkey, nation.n_nationkey, supplier.s_suppkey, part.p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, min(partsupp.ps_supplycost)] }
+                ├─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+                | └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = supplier.s_nationkey, output: [nation.n_name, supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, supplier.s_acctbal, supplier.s_comment, region.r_regionkey, nation.n_nationkey] }
+                |   ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                |   | └─StreamHashJoin { type: Inner, predicate: region.r_regionkey = nation.n_regionkey, output: [nation.n_nationkey, nation.n_name, region.r_regionkey] }
+                |   |   ├─StreamExchange { dist: HashShard(region.r_regionkey) }
+                |   |   | └─StreamProject { exprs: [region.r_regionkey] }
+                |   |   |   └─StreamFilter { predicate: (region.r_name = 'AFRICA':Varchar) }
+                |   |   |     └─StreamTableScan { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
+                |   |   └─StreamExchange { dist: HashShard(nation.n_regionkey) }
+                |   |     └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                |   └─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+                |     └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_nationkey, supplier.s_phone, supplier.s_acctbal, supplier.s_comment], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+                └─StreamExchange { dist: HashShard(partsupp.ps_suppkey) }
+                  └─StreamHashJoin { type: Inner, predicate: part.p_partkey IS NOT DISTINCT FROM part.p_partkey AND min(partsupp.ps_supplycost) = partsupp.ps_supplycost, output: [part.p_partkey, part.p_mfgr, partsupp.ps_suppkey, part.p_partkey, min(partsupp.ps_supplycost), partsupp.ps_partkey] }
+                    ├─StreamProject { exprs: [part.p_partkey, min(partsupp.ps_supplycost)] }
+                    | └─StreamHashAgg { group_key: [part.p_partkey], aggs: [min(partsupp.ps_supplycost), count] }
+                    |   └─StreamHashJoin { type: LeftOuter, predicate: part.p_partkey IS NOT DISTINCT FROM partsupp.ps_partkey, output: [part.p_partkey, partsupp.ps_supplycost, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, region.r_regionkey, nation.n_nationkey, supplier.s_nationkey] }
+                    |     ├─StreamExchange { dist: HashShard(part.p_partkey) }
+                    |     | └─StreamProject { exprs: [part.p_partkey] }
+                    |     |   └─StreamHashAgg { group_key: [part.p_partkey], aggs: [count] }
+                    |     |     └─StreamProject { exprs: [part.p_partkey] }
+                    |     |       └─StreamFilter { predicate: (part.p_size = 4:Int32) AND Like(part.p_type, '%TIN':Varchar) }
+                    |     |         └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_type, part.p_size], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+                    |     └─StreamExchange { dist: HashShard(partsupp.ps_partkey) }
+                    |       └─StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [partsupp.ps_partkey, partsupp.ps_supplycost, partsupp.ps_suppkey, supplier.s_suppkey, supplier.s_nationkey, region.r_regionkey, nation.n_nationkey] }
+                    |         ├─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+                    |         | └─StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [partsupp.ps_partkey, partsupp.ps_supplycost, supplier.s_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] }
+                    |         |   ├─StreamExchange { dist: HashShard(partsupp.ps_suppkey) }
+                    |         |   | └─StreamFilter { predicate: IsNotNull(partsupp.ps_partkey) }
+                    |         |   |   └─StreamTableScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+                    |         |   └─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+                    |         |     └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+                    |         └─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                    |           └─StreamHashJoin { type: Inner, predicate: region.r_regionkey = nation.n_regionkey, output: [nation.n_nationkey, region.r_regionkey] }
+                    |             ├─StreamExchange { dist: HashShard(region.r_regionkey) }
+                    |             | └─StreamProject { exprs: [region.r_regionkey] }
+                    |             |   └─StreamFilter { predicate: (region.r_name = 'AFRICA':Varchar) }
+                    |             |     └─StreamTableScan { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
+                    |             └─StreamExchange { dist: HashShard(nation.n_regionkey) }
+                    |               └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                    └─StreamHashJoin { type: Inner, predicate: part.p_partkey = partsupp.ps_partkey, output: [part.p_partkey, part.p_mfgr, partsupp.ps_suppkey, partsupp.ps_supplycost, partsupp.ps_partkey] }
+                      ├─StreamExchange { dist: HashShard(part.p_partkey) }
+                      | └─StreamProject { exprs: [part.p_partkey, part.p_mfgr] }
+                      |   └─StreamFilter { predicate: (part.p_size = 4:Int32) AND Like(part.p_type, '%TIN':Varchar) }
+                      |     └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_mfgr, part.p_type, part.p_size], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+                      └─StreamExchange { dist: HashShard(partsupp.ps_partkey) }
+                        └─StreamTableScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q3
+  before:
+  - create_tables
+  sql: |
+    select
+      l_orderkey,
+      sum(l_extendedprice * (1 - l_discount)) as revenue,
+      o_orderdate,
+      o_shippriority
+    from
+      customer,
+      orders,
+      lineitem
+    where
+      c_mktsegment = 'FURNITURE'
+      and c_custkey = o_custkey
+      and l_orderkey = o_orderkey
+      and o_orderdate < date '1995-03-29'
+      and l_shipdate > date '1995-03-29'
+    group by
+      l_orderkey,
+      o_orderdate,
+      o_shippriority
+    order by
+      revenue desc,
+      o_orderdate
+    limit 10;
+  stream_plan: |
+    StreamMaterialize { columns: [l_orderkey, revenue, o_orderdate, o_shippriority], stream_key: [l_orderkey, o_orderdate, o_shippriority], pk_columns: [revenue, o_orderdate, l_orderkey, o_shippriority], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority] }
+      └─StreamTopN { order: "[sum($expr1) DESC, orders.o_orderdate ASC]", limit: 10, offset: 0 }
+        └─StreamExchange { dist: Single }
+          └─StreamGroupTopN { order: "[sum($expr1) DESC, orders.o_orderdate ASC]", limit: 10, offset: 0, group_key: [4] }
+            └─StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority, Vnode(lineitem.l_orderkey) as $expr2] }
+              └─StreamHashAgg { group_key: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority], aggs: [sum($expr1), count] }
+                └─StreamProject { exprs: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_linenumber, customer.c_custkey, orders.o_orderkey] }
+                  └─StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [orders.o_orderdate, orders.o_shippriority, lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, customer.c_custkey, orders.o_orderkey] }
+                    ├─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                    | └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
+                    |   └─StreamFilter { predicate: (lineitem.l_shipdate > '1995-03-29':Date) }
+                    |     └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                    └─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                      └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [orders.o_orderkey, orders.o_orderdate, orders.o_shippriority, customer.c_custkey] }
+                        ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+                        | └─StreamProject { exprs: [customer.c_custkey] }
+                        |   └─StreamFilter { predicate: (customer.c_mktsegment = 'FURNITURE':Varchar) }
+                        |     └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_mktsegment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+                        └─StreamExchange { dist: HashShard(orders.o_custkey) }
+                          └─StreamFilter { predicate: (orders.o_orderdate < '1995-03-29':Date) }
+                            └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate, orders.o_shippriority], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q4
+  before:
+  - create_tables
+  sql: |
+    select
+      o_orderpriority,
+      count(*) as order_count
+    from
+      orders
+    where
+      o_orderdate >= date '1997-07-01'
+      and o_orderdate < date '1997-07-01' + interval '3' month
+      and exists (
+        select
+          *
+        from
+          lineitem
+        where
+          l_orderkey = o_orderkey
+          and l_commitdate < l_receiptdate
+      )
+    group by
+      o_orderpriority
+    order by
+      o_orderpriority;
+  stream_plan: |
+    StreamMaterialize { columns: [o_orderpriority, order_count], stream_key: [o_orderpriority], pk_columns: [o_orderpriority], pk_conflict: "NoCheck" }
+    └─StreamHashAgg { group_key: [orders.o_orderpriority], aggs: [count] }
+      └─StreamExchange { dist: HashShard(orders.o_orderpriority) }
+        └─StreamHashJoin { type: LeftSemi, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderpriority, orders.o_orderkey] }
+          ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
+          | └─StreamProject { exprs: [orders.o_orderkey, orders.o_orderpriority] }
+          |   └─StreamFilter { predicate: (orders.o_orderdate >= '1997-07-01':Date) AND (orders.o_orderdate < '1997-10-01 00:00:00':Timestamp) }
+          |     └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_orderpriority, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+          └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+            └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_linenumber] }
+              └─StreamFilter { predicate: (lineitem.l_commitdate < lineitem.l_receiptdate) }
+                └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q5
+  before:
+  - create_tables
+  sql: |
+    select
+      n_name,
+      sum(l_extendedprice * (1 - l_discount)) as revenue
+    from
+      customer,
+      orders,
+      lineitem,
+      supplier,
+      nation,
+      region
+    where
+      c_custkey = o_custkey
+      and l_orderkey = o_orderkey
+      and l_suppkey = s_suppkey
+      and c_nationkey = s_nationkey
+      and s_nationkey = n_nationkey
+      and n_regionkey = r_regionkey
+      and r_name = 'MIDDLE EAST'
+      and o_orderdate >= date '1994-01-01'
+      and o_orderdate < date '1994-01-01' + interval '1' year
+    group by
+      n_name
+    order by
+      revenue desc;
+  stream_plan: |
+    StreamMaterialize { columns: [n_name, revenue], stream_key: [n_name], pk_columns: [revenue, n_name], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [nation.n_name, sum($expr1)] }
+      └─StreamHashAgg { group_key: [nation.n_name], aggs: [sum($expr1), count] }
+        └─StreamExchange { dist: HashShard(nation.n_name) }
+          └─StreamProject { exprs: [nation.n_name, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber, customer.c_custkey, orders.o_orderkey, region.r_regionkey, nation.n_nationkey, supplier.s_suppkey, lineitem.l_suppkey, customer.c_nationkey] }
+            └─StreamHashJoin { type: Inner, predicate: lineitem.l_suppkey = supplier.s_suppkey AND customer.c_nationkey = supplier.s_nationkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, lineitem.l_orderkey, lineitem.l_linenumber, customer.c_custkey, orders.o_orderkey, lineitem.l_suppkey, customer.c_nationkey, region.r_regionkey, nation.n_nationkey, supplier.s_suppkey] }
+              ├─StreamExchange { dist: HashShard(lineitem.l_suppkey, customer.c_nationkey) }
+              | └─StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber, customer.c_custkey, orders.o_orderkey] }
+              |   ├─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+              |   | └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+              |   └─StreamExchange { dist: HashShard(orders.o_orderkey) }
+              |     └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_nationkey, orders.o_orderkey, customer.c_custkey] }
+              |       ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+              |       | └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+              |       └─StreamExchange { dist: HashShard(orders.o_custkey) }
+              |         └─StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
+              |           └─StreamFilter { predicate: (orders.o_orderdate >= '1994-01-01':Date) AND (orders.o_orderdate < '1995-01-01 00:00:00':Timestamp) }
+              |             └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+              └─StreamExchange { dist: HashShard(supplier.s_suppkey, supplier.s_nationkey) }
+                └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = supplier.s_nationkey, output: [nation.n_name, supplier.s_suppkey, supplier.s_nationkey, region.r_regionkey, nation.n_nationkey] }
+                  ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                  | └─StreamHashJoin { type: Inner, predicate: region.r_regionkey = nation.n_regionkey, output: [nation.n_nationkey, nation.n_name, region.r_regionkey] }
+                  |   ├─StreamExchange { dist: HashShard(region.r_regionkey) }
+                  |   | └─StreamProject { exprs: [region.r_regionkey] }
+                  |   |   └─StreamFilter { predicate: (region.r_name = 'MIDDLE EAST':Varchar) }
+                  |   |     └─StreamTableScan { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
+                  |   └─StreamExchange { dist: HashShard(nation.n_regionkey) }
+                  |     └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                  └─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+                    └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q6
+  before:
+  - create_tables
+  sql: |
+    select
+      sum(l_extendedprice * l_discount) as revenue
+    from
+      lineitem
+    where
+      l_shipdate >= date '1994-01-01'
+      and l_shipdate < date '1994-01-01' + interval '1' year
+      and l_discount between 0.08 - 0.01 and 0.08 + 0.01
+      and l_quantity < 24;
+  stream_plan: |
+    StreamMaterialize { columns: [revenue], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [sum(sum($expr1))] }
+      └─StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), count] }
+        └─StreamExchange { dist: Single }
+          └─StreamStatelessLocalSimpleAgg { aggs: [sum($expr1)] }
+            └─StreamProject { exprs: [(lineitem.l_extendedprice * lineitem.l_discount) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber] }
+              └─StreamFilter { predicate: (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) AND (lineitem.l_discount >= 0.07:Decimal) AND (lineitem.l_discount <= 0.09:Decimal) AND (lineitem.l_quantity < 24:Int32) }
+                └─StreamTableScan { table: lineitem, columns: [lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_quantity, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q7
+  before:
+  - create_tables
+  sql: |
+    select
+      supp_nation,
+      cust_nation,
+      l_year,
+      sum(volume) as revenue
+    from
+      (
+        select
+          n1.n_name as supp_nation,
+          n2.n_name as cust_nation,
+          extract(year from l_shipdate) as l_year,
+          l_extendedprice * (1 - l_discount) as volume
+        from
+          supplier,
+          lineitem,
+          orders,
+          customer,
+          nation n1,
+          nation n2
+        where
+          s_suppkey = l_suppkey
+          and o_orderkey = l_orderkey
+          and c_custkey = o_custkey
+          and s_nationkey = n1.n_nationkey
+          and c_nationkey = n2.n_nationkey
+          and (
+            (n1.n_name = 'ROMANIA' and n2.n_name = 'IRAN')
+            or (n1.n_name = 'IRAN' and n2.n_name = 'ROMANIA')
+          )
+          and l_shipdate between date '1983-01-01' and date '2000-12-31'
+      ) as shipping
+    group by
+      supp_nation,
+      cust_nation,
+      l_year
+    order by
+      supp_nation,
+      cust_nation,
+      l_year;
+  stream_plan: |
+    StreamMaterialize { columns: [supp_nation, cust_nation, l_year, revenue], stream_key: [supp_nation, cust_nation, l_year], pk_columns: [supp_nation, cust_nation, l_year], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [nation.n_name, nation.n_name, $expr1, sum($expr2)] }
+      └─StreamHashAgg { group_key: [nation.n_name, nation.n_name, $expr1], aggs: [sum($expr2), count] }
+        └─StreamExchange { dist: HashShard(nation.n_name, nation.n_name, $expr1) }
+          └─StreamProject { exprs: [nation.n_name, nation.n_name, Extract('YEAR':Varchar, lineitem.l_shipdate) as $expr1, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr2, nation.n_nationkey, supplier.s_suppkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, customer.c_custkey, orders.o_orderkey] }
+            └─StreamFilter { predicate: (((nation.n_name = 'ROMANIA':Varchar) AND (nation.n_name = 'IRAN':Varchar)) OR ((nation.n_name = 'IRAN':Varchar) AND (nation.n_name = 'ROMANIA':Varchar))) }
+              └─StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: all }
+                ├─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                | └─StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [nation.n_name, lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, nation.n_nationkey, supplier.s_suppkey, lineitem.l_linenumber] }
+                |   ├─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+                |   | └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = supplier.s_nationkey, output: [nation.n_name, supplier.s_suppkey, nation.n_nationkey] }
+                |   |   ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                |   |   | └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                |   |   └─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+                |   |     └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+                |   └─StreamExchange { dist: HashShard(lineitem.l_suppkey) }
+                |     └─StreamFilter { predicate: (lineitem.l_shipdate >= '1983-01-01':Date) AND (lineitem.l_shipdate <= '2000-12-31':Date) }
+                |       └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                └─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                  └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [nation.n_name, orders.o_orderkey, nation.n_nationkey, customer.c_custkey] }
+                    ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+                    | └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = customer.c_nationkey, output: [nation.n_name, customer.c_custkey, nation.n_nationkey] }
+                    |   ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                    |   | └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                    |   └─StreamExchange { dist: HashShard(customer.c_nationkey) }
+                    |     └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+                    └─StreamExchange { dist: HashShard(orders.o_custkey) }
+                      └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q8
+  before:
+  - create_tables
+  sql: |
+    select
+      o_year,
+      round(sum(case
+        when nation = 'IRAN' then volume
+        else 0
+      end) / sum(volume), 6) as mkt_share
+    from
+      (
+        select
+          extract(year from o_orderdate) as o_year,
+          l_extendedprice * (1 - l_discount) as volume,
+          n2.n_name as nation
+        from
+          part,
+          supplier,
+          lineitem,
+          orders,
+          customer,
+          nation n1,
+          nation n2,
+          region
+        where
+          p_partkey = l_partkey
+          and s_suppkey = l_suppkey
+          and l_orderkey = o_orderkey
+          and o_custkey = c_custkey
+          and c_nationkey = n1.n_nationkey
+          and n1.n_regionkey = r_regionkey
+          and r_name = 'ASIA'
+          and s_nationkey = n2.n_nationkey
+          and o_orderdate between date '1995-01-01' and date '1996-12-31'
+          and p_type = 'PROMO ANODIZED STEEL'
+      ) as all_nations
+    group by
+      o_year
+    order by
+      o_year;
+  stream_plan: |
+    StreamMaterialize { columns: [o_year, mkt_share], stream_key: [o_year], pk_columns: [o_year], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [$expr1, RoundDigit((sum($expr2) / sum($expr3)), 6:Int32) as $expr4] }
+      └─StreamHashAgg { group_key: [$expr1], aggs: [sum($expr2), sum($expr3), count] }
+        └─StreamExchange { dist: HashShard($expr1) }
+          └─StreamProject { exprs: [Extract('YEAR':Varchar, orders.o_orderdate) as $expr1, Case((nation.n_name = 'IRAN':Varchar), (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)), 0:Decimal) as $expr2, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr3, region.r_regionkey, nation.n_nationkey, customer.c_custkey, nation.n_nationkey, supplier.s_suppkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, orders.o_orderkey] }
+            └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [lineitem.l_extendedprice, lineitem.l_discount, orders.o_orderdate, nation.n_name, region.r_regionkey, nation.n_nationkey, customer.c_custkey, nation.n_nationkey, supplier.s_suppkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, orders.o_orderkey] }
+              ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+              | └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = customer.c_nationkey, output: [customer.c_custkey, region.r_regionkey, nation.n_nationkey] }
+              |   ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+              |   | └─StreamHashJoin { type: Inner, predicate: region.r_regionkey = nation.n_regionkey, output: [nation.n_nationkey, region.r_regionkey] }
+              |   |   ├─StreamExchange { dist: HashShard(region.r_regionkey) }
+              |   |   | └─StreamProject { exprs: [region.r_regionkey] }
+              |   |   |   └─StreamFilter { predicate: (region.r_name = 'ASIA':Varchar) }
+              |   |   |     └─StreamTableScan { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
+              |   |   └─StreamExchange { dist: HashShard(nation.n_regionkey) }
+              |   |     └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+              |   └─StreamExchange { dist: HashShard(customer.c_nationkey) }
+              |     └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+              └─StreamExchange { dist: HashShard(orders.o_custkey) }
+                └─StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [nation.n_name, lineitem.l_extendedprice, lineitem.l_discount, orders.o_custkey, orders.o_orderdate, nation.n_nationkey, supplier.s_suppkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, orders.o_orderkey] }
+                  ├─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                  | └─StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [nation.n_name, lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, nation.n_nationkey, supplier.s_suppkey, part.p_partkey, lineitem.l_linenumber] }
+                  |   ├─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+                  |   | └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = supplier.s_nationkey, output: [nation.n_name, supplier.s_suppkey, nation.n_nationkey] }
+                  |   |   ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                  |   |   | └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                  |   |   └─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+                  |   |     └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+                  |   └─StreamExchange { dist: HashShard(lineitem.l_suppkey) }
+                  |     └─StreamHashJoin { type: Inner, predicate: part.p_partkey = lineitem.l_partkey, output: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, part.p_partkey, lineitem.l_linenumber] }
+                  |       ├─StreamExchange { dist: HashShard(part.p_partkey) }
+                  |       | └─StreamProject { exprs: [part.p_partkey] }
+                  |       |   └─StreamFilter { predicate: (part.p_type = 'PROMO ANODIZED STEEL':Varchar) }
+                  |       |     └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_type], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+                  |       └─StreamExchange { dist: HashShard(lineitem.l_partkey) }
+                  |         └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                  └─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                    └─StreamFilter { predicate: (orders.o_orderdate >= '1995-01-01':Date) AND (orders.o_orderdate <= '1996-12-31':Date) }
+                      └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q9
+  before:
+  - create_tables
+  sql: |
+    select
+      nation,
+      o_year,
+      round(sum(amount), 2) as sum_profit
+    from
+      (
+        select
+          n_name as nation,
+          extract(year from o_orderdate) as o_year,
+          l_extendedprice * (1 - l_discount) - ps_supplycost * l_quantity as amount
+        from
+          part,
+          supplier,
+          lineitem,
+          partsupp,
+          orders,
+          nation
+        where
+          s_suppkey = l_suppkey
+          and ps_suppkey = l_suppkey
+          and ps_partkey = l_partkey
+          and p_partkey = l_partkey
+          and o_orderkey = l_orderkey
+          and s_nationkey = n_nationkey
+          and p_name like '%yellow%'
+      ) as profit
+    group by
+      nation,
+      o_year
+    order by
+      nation,
+      o_year desc;
+  stream_plan: |
+    StreamMaterialize { columns: [nation, o_year, sum_profit], stream_key: [nation, o_year], pk_columns: [nation, o_year], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [nation.n_name, $expr1, RoundDigit(sum($expr2), 2:Int32) as $expr3] }
+      └─StreamHashAgg { group_key: [nation.n_name, $expr1], aggs: [sum($expr2), count] }
+        └─StreamExchange { dist: HashShard(nation.n_name, $expr1) }
+          └─StreamProject { exprs: [nation.n_name, Extract('YEAR':Varchar, orders.o_orderdate) as $expr1, ((lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) - (partsupp.ps_supplycost * lineitem.l_quantity)) as $expr2, nation.n_nationkey, supplier.s_suppkey, orders.o_orderkey, partsupp.ps_partkey, partsupp.ps_suppkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+            └─StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, partsupp.ps_supplycost, orders.o_orderdate, nation.n_name, nation.n_nationkey, supplier.s_suppkey, orders.o_orderkey, partsupp.ps_partkey, partsupp.ps_suppkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+              ├─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+              | └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = supplier.s_nationkey, output: [nation.n_name, supplier.s_suppkey, nation.n_nationkey] }
+              |   ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+              |   | └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+              |   └─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+              |     └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+              └─StreamExchange { dist: HashShard(lineitem.l_suppkey) }
+                └─StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderdate, partsupp.ps_supplycost, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, orders.o_orderkey, partsupp.ps_partkey, partsupp.ps_suppkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+                  ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                  | └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+                  └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                    └─StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = lineitem.l_suppkey AND partsupp.ps_partkey = lineitem.l_partkey, output: [partsupp.ps_supplycost, lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, partsupp.ps_partkey, partsupp.ps_suppkey, part.p_partkey, lineitem.l_linenumber] }
+                      ├─StreamExchange { dist: HashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+                      | └─StreamTableScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+                      └─StreamExchange { dist: HashShard(lineitem.l_partkey, lineitem.l_suppkey) }
+                        └─StreamHashJoin { type: Inner, predicate: part.p_partkey = lineitem.l_partkey, output: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, part.p_partkey, lineitem.l_linenumber] }
+                          ├─StreamExchange { dist: HashShard(part.p_partkey) }
+                          | └─StreamProject { exprs: [part.p_partkey] }
+                          |   └─StreamFilter { predicate: Like(part.p_name, '%yellow%':Varchar) }
+                          |     └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_name], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+                          └─StreamExchange { dist: HashShard(lineitem.l_partkey) }
+                            └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q10
+  before:
+  - create_tables
+  sql: |
+    select
+      c_custkey,
+      c_name,
+      sum(l_extendedprice * (1.00 - l_discount)) as revenue,
+      c_acctbal,
+      n_name,
+      c_address,
+      c_phone,
+      c_comment
+    from
+      customer,
+      orders,
+      lineitem,
+      nation
+    where
+      c_custkey = o_custkey
+      and l_orderkey = o_orderkey
+      and o_orderdate >= date '1994-01-01'
+      and o_orderdate < date '1994-01-01' + interval '3' month
+      and l_returnflag = 'R'
+      and c_nationkey = n_nationkey
+    group by
+      c_custkey,
+      c_name,
+      c_acctbal,
+      c_phone,
+      n_name,
+      c_address,
+      c_comment
+    order by
+      revenue desc
+    limit 20;
+  stream_plan: |
+    StreamMaterialize { columns: [c_custkey, c_name, revenue, c_acctbal, n_name, c_address, c_phone, c_comment], stream_key: [c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], pk_columns: [revenue, c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment] }
+      └─StreamTopN { order: "[sum($expr1) DESC]", limit: 20, offset: 0 }
+        └─StreamExchange { dist: Single }
+          └─StreamGroupTopN { order: "[sum($expr1) DESC]", limit: 20, offset: 0, group_key: [8] }
+            └─StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment, Vnode(customer.c_custkey) as $expr2] }
+              └─StreamHashAgg { group_key: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment], aggs: [sum($expr1), count] }
+                └─StreamProject { exprs: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment, (lineitem.l_extendedprice * (1.00:Decimal - lineitem.l_discount)) as $expr1, nation.n_nationkey, lineitem.l_orderkey, lineitem.l_linenumber, orders.o_orderkey] }
+                  └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, nation.n_nationkey, lineitem.l_orderkey, lineitem.l_linenumber, orders.o_orderkey] }
+                    ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+                    | └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = customer.c_nationkey, output: [nation.n_name, customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, nation.n_nationkey] }
+                    |   ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                    |   | └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                    |   └─StreamExchange { dist: HashShard(customer.c_nationkey) }
+                    |     └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_nationkey, customer.c_phone, customer.c_acctbal, customer.c_comment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+                    └─StreamExchange { dist: HashShard(orders.o_custkey) }
+                      └─StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [lineitem.l_extendedprice, lineitem.l_discount, orders.o_custkey, lineitem.l_orderkey, lineitem.l_linenumber, orders.o_orderkey] }
+                        ├─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                        | └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
+                        |   └─StreamFilter { predicate: (lineitem.l_returnflag = 'R':Varchar) }
+                        |     └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_returnflag], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                        └─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                          └─StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
+                            └─StreamFilter { predicate: (orders.o_orderdate >= '1994-01-01':Date) AND (orders.o_orderdate < '1994-04-01 00:00:00':Timestamp) }
+                              └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q11
+  before:
+  - create_tables
+  sql: |
+    select
+      ps_partkey,
+      sum(ps_supplycost * ps_availqty) as value
+    from
+      partsupp,
+      supplier,
+      nation
+    where
+      ps_suppkey = s_suppkey
+      and s_nationkey = n_nationkey
+      and n_name = 'ARGENTINA'
+    group by
+      ps_partkey
+    having
+      sum(ps_supplycost * ps_availqty) > (
+        select
+          sum(ps_supplycost * ps_availqty) * 0.0001000000
+        from
+          partsupp,
+          supplier,
+          nation
+        where
+          ps_suppkey = s_suppkey
+          and s_nationkey = n_nationkey
+          and n_name = 'ARGENTINA'
+      )
+    order by
+      value desc;
+  stream_plan: |
+    StreamMaterialize { columns: [ps_partkey, value], stream_key: [ps_partkey], pk_columns: [value, ps_partkey], pk_conflict: "NoCheck" }
+    └─StreamDynamicFilter { predicate: (sum($expr1) > $expr3), output: [partsupp.ps_partkey, sum($expr1)] }
+      ├─StreamProject { exprs: [partsupp.ps_partkey, sum($expr1)] }
+      | └─StreamHashAgg { group_key: [partsupp.ps_partkey], aggs: [sum($expr1), count] }
+      |   └─StreamExchange { dist: HashShard(partsupp.ps_partkey) }
+      |     └─StreamProject { exprs: [partsupp.ps_partkey, (partsupp.ps_supplycost * partsupp.ps_availqty) as $expr1, nation.n_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] }
+      |       └─StreamShare { id = 13 }
+      |         └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = supplier.s_nationkey, output: [partsupp.ps_partkey, partsupp.ps_availqty, partsupp.ps_supplycost, nation.n_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] }
+      |           ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+      |           | └─StreamProject { exprs: [nation.n_nationkey] }
+      |           |   └─StreamFilter { predicate: (nation.n_name = 'ARGENTINA':Varchar) }
+      |           |     └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+      |           └─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+      |             └─StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [partsupp.ps_partkey, partsupp.ps_availqty, partsupp.ps_supplycost, supplier.s_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] }
+      |               ├─StreamExchange { dist: HashShard(partsupp.ps_suppkey) }
+      |               | └─StreamTableScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+      |               └─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+      |                 └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+      └─StreamExchange { dist: Broadcast }
+        └─StreamProject { exprs: [(sum(sum($expr2)) * 0.0001000000:Decimal) as $expr3] }
+          └─StreamGlobalSimpleAgg { aggs: [sum(sum($expr2)), count] }
+            └─StreamExchange { dist: Single }
+              └─StreamStatelessLocalSimpleAgg { aggs: [sum($expr2)] }
+                └─StreamProject { exprs: [(partsupp.ps_supplycost * partsupp.ps_availqty) as $expr2, nation.n_nationkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey] }
+                  └─StreamShare { id = 13 }
+                    └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = supplier.s_nationkey, output: [partsupp.ps_partkey, partsupp.ps_availqty, partsupp.ps_supplycost, nation.n_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] }
+                      ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                      | └─StreamProject { exprs: [nation.n_nationkey] }
+                      |   └─StreamFilter { predicate: (nation.n_name = 'ARGENTINA':Varchar) }
+                      |     └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                      └─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+                        └─StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [partsupp.ps_partkey, partsupp.ps_availqty, partsupp.ps_supplycost, supplier.s_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] }
+                          ├─StreamExchange { dist: HashShard(partsupp.ps_suppkey) }
+                          | └─StreamTableScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+                          └─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+                            └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q12
+  before:
+  - create_tables
+  sql: |
+    select
+        l_shipmode,
+        sum(case
+            when o_orderpriority = '1-URGENT'
+                or o_orderpriority = '2-HIGH'
+                then 1
+            else 0
+        end) as high_line_count,
+        sum(case
+            when o_orderpriority <> '1-URGENT'
+                and o_orderpriority <> '2-HIGH'
+                then 1
+            else 0
+        end) as low_line_count
+    from
+        orders,
+        lineitem
+    where
+        o_orderkey = l_orderkey
+        and l_shipmode in ('FOB', 'SHIP')
+        and l_commitdate < l_receiptdate
+        and l_shipdate < l_commitdate
+        and l_receiptdate >= date '1994-01-01'
+        and l_receiptdate < date '1994-01-01' + interval '1' year
+    group by
+        l_shipmode
+    order by
+        l_shipmode;
+  stream_plan: |
+    StreamMaterialize { columns: [l_shipmode, high_line_count, low_line_count], stream_key: [l_shipmode], pk_columns: [l_shipmode], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [lineitem.l_shipmode, sum($expr1), sum($expr2)] }
+      └─StreamHashAgg { group_key: [lineitem.l_shipmode], aggs: [sum($expr1), sum($expr2), count] }
+        └─StreamExchange { dist: HashShard(lineitem.l_shipmode) }
+          └─StreamProject { exprs: [lineitem.l_shipmode, Case(((orders.o_orderpriority = '1-URGENT':Varchar) OR (orders.o_orderpriority = '2-HIGH':Varchar)), 1:Int32, 0:Int32) as $expr1, Case(((orders.o_orderpriority <> '1-URGENT':Varchar) AND (orders.o_orderpriority <> '2-HIGH':Varchar)), 1:Int32, 0:Int32) as $expr2, orders.o_orderkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+            └─StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderpriority, lineitem.l_shipmode, orders.o_orderkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+              ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
+              | └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_orderpriority], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+              └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_shipmode, lineitem.l_linenumber] }
+                  └─StreamFilter { predicate: In(lineitem.l_shipmode, 'FOB':Varchar, 'SHIP':Varchar) AND (lineitem.l_commitdate < lineitem.l_receiptdate) AND (lineitem.l_shipdate < lineitem.l_commitdate) AND (lineitem.l_receiptdate >= '1994-01-01':Date) AND (lineitem.l_receiptdate < '1995-01-01 00:00:00':Timestamp) }
+                    └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_shipmode, lineitem.l_linenumber, lineitem.l_shipdate, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q13
+  before:
+  - create_tables
+  sql: |
+    select
+      c_count,
+      count(*) as custdist
+    from
+      (
+        select
+          c_custkey,
+          count(o_orderkey) as c_count
+        from
+          customer left outer join orders on
+            c_custkey = o_custkey
+            and o_comment not like '%:1%:2%'
+        group by
+          c_custkey
+      ) as c_orders (c_custkey, c_count)
+    group by
+      c_count
+    order by
+      custdist desc,
+      c_count desc;
+  stream_plan: |
+    StreamMaterialize { columns: [c_count, custdist], stream_key: [c_count], pk_columns: [custdist, c_count], pk_conflict: "NoCheck" }
+    └─StreamHashAgg { group_key: [count(orders.o_orderkey)], aggs: [count] }
+      └─StreamExchange { dist: HashShard(count(orders.o_orderkey)) }
+        └─StreamProject { exprs: [customer.c_custkey, count(orders.o_orderkey)] }
+          └─StreamHashAgg { group_key: [customer.c_custkey], aggs: [count(orders.o_orderkey), count] }
+            └─StreamHashJoin { type: LeftOuter, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, orders.o_orderkey] }
+              ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+              | └─StreamTableScan { table: customer, columns: [customer.c_custkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+              └─StreamExchange { dist: HashShard(orders.o_custkey) }
+                └─StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
+                  └─StreamFilter { predicate: Not(Like(orders.o_comment, '%:1%:2%':Varchar)) }
+                    └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_comment], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q14
+  before:
+  - create_tables
+  sql: |
+    select
+      100.00 * sum(case
+        when p_type like 'PROMO%'
+          then l_extendedprice * (1 - l_discount)
+        else 0
+      end) / sum(l_extendedprice * (1 - l_discount)) as promo_revenue
+    from
+      lineitem,
+      part
+    where
+      l_partkey = p_partkey
+      and l_shipdate >= date '1995-09-01'
+      and l_shipdate < date '1995-09-01' + interval '1' month;
+  stream_plan: |
+    StreamMaterialize { columns: [promo_revenue], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [((100.00:Decimal * sum(sum($expr1))) / sum(sum($expr2))) as $expr3] }
+      └─StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), sum(sum($expr2)), count] }
+        └─StreamExchange { dist: Single }
+          └─StreamStatelessLocalSimpleAgg { aggs: [sum($expr1), sum($expr2)] }
+            └─StreamProject { exprs: [Case(Like(part.p_type, 'PROMO%':Varchar), (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)), 0:Decimal) as $expr1, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr2, lineitem.l_orderkey, lineitem.l_linenumber, part.p_partkey, lineitem.l_partkey] }
+              └─StreamHashJoin { type: Inner, predicate: lineitem.l_partkey = part.p_partkey, output: [lineitem.l_extendedprice, lineitem.l_discount, part.p_type, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_partkey, part.p_partkey] }
+                ├─StreamExchange { dist: HashShard(lineitem.l_partkey) }
+                | └─StreamProject { exprs: [lineitem.l_partkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
+                |   └─StreamFilter { predicate: (lineitem.l_shipdate >= '1995-09-01':Date) AND (lineitem.l_shipdate < '1995-10-01 00:00:00':Timestamp) }
+                |     └─StreamTableScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                └─StreamExchange { dist: HashShard(part.p_partkey) }
+                  └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_type], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q15
+  before:
+  - create_tables
+  sql: |
+    with revenue0 (supplier_no, total_revenue) as (
+      select
+        l_suppkey,
+        sum(l_extendedprice * (1 - l_discount))
+      from
+        lineitem
+      where
+        l_shipdate >= date '1993-01-01'
+        and l_shipdate < date '1993-01-01' + interval '3' month
+      group by
+        l_suppkey
+    )
+    select
+      s_suppkey,
+      s_name,
+      s_address,
+      s_phone,
+      total_revenue
+    from
+      supplier,
+      revenue0
+    where
+      s_suppkey = supplier_no
+      and total_revenue = (
+        select
+          max(total_revenue)
+        from
+          revenue0
+      )
+    order by
+      s_suppkey;
+  stream_plan: |
+    StreamMaterialize { columns: [s_suppkey, s_name, s_address, s_phone, total_revenue, max(max(sum($expr1)))(hidden), lineitem.l_suppkey(hidden)], stream_key: [s_suppkey, lineitem.l_suppkey, max(max(sum($expr1)))], pk_columns: [s_suppkey, lineitem.l_suppkey, max(max(sum($expr1)))], pk_conflict: "NoCheck" }
+    └─StreamHashJoin { type: Inner, predicate: max(max(sum($expr1))) = sum($expr1), output: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, sum($expr1), max(max(sum($expr1))), lineitem.l_suppkey] }
+      ├─StreamExchange { dist: HashShard(max(max(sum($expr1)))) }
+      | └─StreamProject { exprs: [max(max(sum($expr1)))] }
+      |   └─StreamGlobalSimpleAgg { aggs: [max(max(sum($expr1))), count] }
+      |     └─StreamExchange { dist: Single }
+      |       └─StreamHashAgg { group_key: [$expr2], aggs: [max(sum($expr1)), count] }
+      |         └─StreamProject { exprs: [lineitem.l_suppkey, sum($expr1), Vnode(lineitem.l_suppkey) as $expr2] }
+      |           └─StreamShare { id = 10 }
+      |             └─StreamProject { exprs: [lineitem.l_suppkey, sum($expr1)] }
+      |               └─StreamHashAgg { group_key: [lineitem.l_suppkey], aggs: [sum($expr1), count] }
+      |                 └─StreamExchange { dist: HashShard(lineitem.l_suppkey) }
+      |                   └─StreamProject { exprs: [lineitem.l_suppkey, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber] }
+      |                     └─StreamFilter { predicate: (lineitem.l_shipdate >= '1993-01-01':Date) AND (lineitem.l_shipdate < '1993-04-01 00:00:00':Timestamp) }
+      |                       └─StreamTableScan { table: lineitem, columns: [lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+      └─StreamExchange { dist: HashShard(sum($expr1)) }
+        └─StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, sum($expr1), lineitem.l_suppkey] }
+          ├─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+          | └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+          └─StreamShare { id = 10 }
+            └─StreamProject { exprs: [lineitem.l_suppkey, sum($expr1)] }
+              └─StreamHashAgg { group_key: [lineitem.l_suppkey], aggs: [sum($expr1), count] }
+                └─StreamExchange { dist: HashShard(lineitem.l_suppkey) }
+                  └─StreamProject { exprs: [lineitem.l_suppkey, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber] }
+                    └─StreamFilter { predicate: (lineitem.l_shipdate >= '1993-01-01':Date) AND (lineitem.l_shipdate < '1993-04-01 00:00:00':Timestamp) }
+                      └─StreamTableScan { table: lineitem, columns: [lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q16
+  before:
+  - create_tables
+  sql: |
+    select
+      p_brand,
+      p_type,
+      p_size,
+      count(distinct ps_suppkey) as supplier_cnt
+    from
+      partsupp,
+      part
+    where
+      p_partkey = ps_partkey
+      and p_brand <> 'Brand#45'
+      and p_type not like 'SMALL PLATED%'
+      and p_size in (19, 17, 16, 23, 10, 4, 38, 11)
+      and ps_suppkey not in (
+        select
+          s_suppkey
+        from
+          supplier
+        where
+          s_comment like '%Customer%Complaints%'
+      )
+    group by
+      p_brand,
+      p_type,
+      p_size
+    order by
+      supplier_cnt desc,
+      p_brand,
+      p_type,
+      p_size;
+  stream_plan: |
+    StreamMaterialize { columns: [p_brand, p_type, p_size, supplier_cnt], stream_key: [p_brand, p_type, p_size], pk_columns: [supplier_cnt, p_brand, p_type, p_size], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [part.p_brand, part.p_type, part.p_size, count(distinct partsupp.ps_suppkey)] }
+      └─StreamHashAgg { group_key: [part.p_brand, part.p_type, part.p_size], aggs: [count(distinct partsupp.ps_suppkey), count] }
+        └─StreamExchange { dist: HashShard(part.p_brand, part.p_type, part.p_size) }
+          └─StreamHashJoin { type: LeftAnti, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [part.p_brand, part.p_type, part.p_size, partsupp.ps_suppkey, partsupp.ps_partkey, part.p_partkey] }
+            ├─StreamExchange { dist: HashShard(partsupp.ps_suppkey) }
+            | └─StreamHashJoin { type: Inner, predicate: partsupp.ps_partkey = part.p_partkey, output: [partsupp.ps_suppkey, part.p_brand, part.p_type, part.p_size, partsupp.ps_partkey, part.p_partkey] }
+            |   ├─StreamExchange { dist: HashShard(partsupp.ps_partkey) }
+            |   | └─StreamTableScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+            |   └─StreamExchange { dist: HashShard(part.p_partkey) }
+            |     └─StreamFilter { predicate: (part.p_brand <> 'Brand#45':Varchar) AND Not(Like(part.p_type, 'SMALL PLATED%':Varchar)) AND In(part.p_size, 19:Int32, 17:Int32, 16:Int32, 23:Int32, 10:Int32, 4:Int32, 38:Int32, 11:Int32) }
+            |       └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_brand, part.p_type, part.p_size], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+            └─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+              └─StreamProject { exprs: [supplier.s_suppkey] }
+                └─StreamFilter { predicate: Like(supplier.s_comment, '%Customer%Complaints%':Varchar) }
+                  └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_comment], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q17
+  before:
+  - create_tables
+  sql: |
+    select
+      ROUND(sum(l_extendedprice) / 7.0, 16) as avg_yearly
+    from
+      lineitem,
+      part
+    where
+      p_partkey = l_partkey
+      and p_brand = 'Brand#13'
+      and p_container = 'JUMBO PKG'
+      and l_quantity < (
+        select
+          0.2 * avg(l_quantity)
+        from
+          lineitem
+        where
+          l_partkey = p_partkey
+      );
+  stream_plan: |
+    StreamMaterialize { columns: [avg_yearly], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [RoundDigit((sum(sum(lineitem.l_extendedprice)) / 7.0:Decimal), 16:Int32) as $expr2] }
+      └─StreamGlobalSimpleAgg { aggs: [sum(sum(lineitem.l_extendedprice)), count] }
+        └─StreamExchange { dist: Single }
+          └─StreamStatelessLocalSimpleAgg { aggs: [sum(lineitem.l_extendedprice)] }
+            └─StreamProject { exprs: [lineitem.l_extendedprice, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, part.p_partkey, lineitem.l_partkey] }
+              └─StreamFilter { predicate: (lineitem.l_quantity < $expr1) }
+                └─StreamHashJoin { type: Inner, predicate: part.p_partkey IS NOT DISTINCT FROM part.p_partkey, output: all }
+                  ├─StreamProject { exprs: [part.p_partkey, (0.2:Decimal * (sum(lineitem.l_quantity) / count(lineitem.l_quantity))) as $expr1] }
+                  | └─StreamHashAgg { group_key: [part.p_partkey], aggs: [sum(lineitem.l_quantity), count(lineitem.l_quantity), count] }
+                  |   └─StreamHashJoin { type: LeftOuter, predicate: part.p_partkey IS NOT DISTINCT FROM lineitem.l_partkey, output: [part.p_partkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                  |     ├─StreamExchange { dist: HashShard(part.p_partkey) }
+                  |     | └─StreamProject { exprs: [part.p_partkey] }
+                  |     |   └─StreamHashAgg { group_key: [part.p_partkey], aggs: [count] }
+                  |     |     └─StreamProject { exprs: [part.p_partkey] }
+                  |     |       └─StreamFilter { predicate: (part.p_brand = 'Brand#13':Varchar) AND (part.p_container = 'JUMBO PKG':Varchar) }
+                  |     |         └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_brand, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+                  |     └─StreamExchange { dist: HashShard(lineitem.l_partkey) }
+                  |       └─StreamFilter { predicate: IsNotNull(lineitem.l_partkey) }
+                  |         └─StreamTableScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                  └─StreamExchange { dist: HashShard(part.p_partkey) }
+                    └─StreamHashJoin { type: Inner, predicate: lineitem.l_partkey = part.p_partkey, output: [lineitem.l_quantity, lineitem.l_extendedprice, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_partkey] }
+                      ├─StreamExchange { dist: HashShard(lineitem.l_partkey) }
+                      | └─StreamTableScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_orderkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                      └─StreamExchange { dist: HashShard(part.p_partkey) }
+                        └─StreamProject { exprs: [part.p_partkey] }
+                          └─StreamFilter { predicate: (part.p_brand = 'Brand#13':Varchar) AND (part.p_container = 'JUMBO PKG':Varchar) }
+                            └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_brand, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q18
+  before:
+  - create_tables
+  sql: |
+    select
+      c_name,
+      c_custkey,
+      o_orderkey,
+      o_orderdate,
+      o_totalprice,
+      sum(l_quantity) quantity
+    from
+      customer,
+      orders,
+      lineitem
+    where
+      o_orderkey in (
+        select
+          l_orderkey
+        from
+          lineitem
+        group by
+          l_orderkey
+        having
+          sum(l_quantity) > 1
+      )
+      and c_custkey = o_custkey
+      and o_orderkey = l_orderkey
+    group by
+      c_name,
+      c_custkey,
+      o_orderkey,
+      o_orderdate,
+      o_totalprice
+    order by
+      o_totalprice desc,
+      o_orderdate
+    LIMIT 100;
+  stream_plan: |
+    StreamMaterialize { columns: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, quantity], stream_key: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice], pk_columns: [o_totalprice, o_orderdate, c_name, c_custkey, o_orderkey], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity)] }
+      └─StreamTopN { order: "[orders.o_totalprice DESC, orders.o_orderdate ASC]", limit: 100, offset: 0 }
+        └─StreamExchange { dist: Single }
+          └─StreamGroupTopN { order: "[orders.o_totalprice DESC, orders.o_orderdate ASC]", limit: 100, offset: 0, group_key: [6] }
+            └─StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity), Vnode(orders.o_orderkey) as $expr1] }
+              └─StreamHashAgg { group_key: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice], aggs: [sum(lineitem.l_quantity), count] }
+                └─StreamHashJoin { type: LeftSemi, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                  ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                  | └─StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                  |   ├─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                  |   | └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                  |   └─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                  |     └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate] }
+                  |       ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+                  |       | └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_name], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+                  |       └─StreamExchange { dist: HashShard(orders.o_custkey) }
+                  |         └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_totalprice, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+                  └─StreamProject { exprs: [lineitem.l_orderkey] }
+                    └─StreamFilter { predicate: (sum(lineitem.l_quantity) > 1:Int32) }
+                      └─StreamProject { exprs: [lineitem.l_orderkey, sum(lineitem.l_quantity)] }
+                        └─StreamHashAgg { group_key: [lineitem.l_orderkey], aggs: [sum(lineitem.l_quantity), count] }
+                          └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                            └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q19
+  before:
+  - create_tables
+  sql: |
+    select
+      sum(l_extendedprice* (1 - l_discount)) as revenue
+    from
+      lineitem,
+      part
+    where
+      (
+        p_partkey = l_partkey
+        and p_brand = 'Brand#52'
+        and p_container in ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG')
+        and l_quantity >= 1 and l_quantity <= 11
+        and p_size between 1 and 5
+        and l_shipmode in ('AIR', 'AIR REG')
+        and l_shipinstruct = 'DELIVER IN PERSON'
+      )
+      or
+      (
+        p_partkey = l_partkey
+        and p_brand = 'Brand#24'
+        and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK')
+        and l_quantity >= 30 and l_quantity <= 40
+        and p_size between 1 and 10
+        and l_shipmode in ('AIR', 'AIR REG')
+        and l_shipinstruct = 'DELIVER IN PERSON'
+      )
+      or
+      (
+        p_partkey = l_partkey
+        and p_brand = 'Brand#32'
+        and p_container in ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG')
+        and l_quantity >= 10 and l_quantity <= 20
+        and p_size between 1 and 15
+        and l_shipmode in ('AIR', 'AIR REG')
+        and l_shipinstruct = 'DELIVER IN PERSON'
+      );
+  stream_plan: |
+    StreamMaterialize { columns: [revenue], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [sum(sum($expr1))] }
+      └─StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), count] }
+        └─StreamExchange { dist: Single }
+          └─StreamStatelessLocalSimpleAgg { aggs: [sum($expr1)] }
+            └─StreamProject { exprs: [(lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber, part.p_partkey, lineitem.l_partkey] }
+              └─StreamFilter { predicate: (((((((part.p_brand = 'Brand#52':Varchar) AND In(part.p_container, 'SM CASE':Varchar, 'SM BOX':Varchar, 'SM PACK':Varchar, 'SM PKG':Varchar)) AND (lineitem.l_quantity >= 1:Int32)) AND (lineitem.l_quantity <= 11:Int32)) AND (part.p_size <= 5:Int32)) OR (((((part.p_brand = 'Brand#24':Varchar) AND In(part.p_container, 'MED BAG':Varchar, 'MED BOX':Varchar, 'MED PKG':Varchar, 'MED PACK':Varchar)) AND (lineitem.l_quantity >= 30:Int32)) AND (lineitem.l_quantity <= 40:Int32)) AND (part.p_size <= 10:Int32))) OR (((((part.p_brand = 'Brand#32':Varchar) AND In(part.p_container, 'LG CASE':Varchar, 'LG BOX':Varchar, 'LG PACK':Varchar, 'LG PKG':Varchar)) AND (lineitem.l_quantity >= 10:Int32)) AND (lineitem.l_quantity <= 20:Int32)) AND (part.p_size <= 15:Int32))) }
+                └─StreamHashJoin { type: Inner, predicate: lineitem.l_partkey = part.p_partkey, output: all }
+                  ├─StreamExchange { dist: HashShard(lineitem.l_partkey) }
+                  | └─StreamProject { exprs: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
+                  |   └─StreamFilter { predicate: In(lineitem.l_shipmode, 'AIR':Varchar, 'AIR REG':Varchar) AND (lineitem.l_shipinstruct = 'DELIVER IN PERSON':Varchar) }
+                  |     └─StreamTableScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipinstruct, lineitem.l_shipmode], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                  └─StreamExchange { dist: HashShard(part.p_partkey) }
+                    └─StreamFilter { predicate: (part.p_size >= 1:Int32) }
+                      └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_brand, part.p_size, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q20
+  before:
+  - create_tables
+  sql: |
+    select
+      s_name,
+      s_address
+    from
+      supplier,
+      nation
+    where
+      s_suppkey in (
+        select
+          ps_suppkey
+        from
+          partsupp
+        where
+          ps_partkey in (
+            select
+              p_partkey
+            from
+              part
+            where
+              p_name like 'forest%'
+          )
+          and ps_availqty > (
+            select
+              0.5 * sum(l_quantity)
+            from
+              lineitem
+            where
+              l_partkey = ps_partkey
+              and l_suppkey = ps_suppkey
+              and l_shipdate >= date '1994-01-01'
+              and l_shipdate < date '1994-01-01' + interval '1' year
+          )
+      )
+      and s_nationkey = n_nationkey
+      and n_name = 'KENYA'
+    order by
+      s_name;
+  stream_plan: |
+    StreamMaterialize { columns: [s_name, s_address, supplier.s_suppkey(hidden), nation.n_nationkey(hidden), supplier.s_nationkey(hidden)], stream_key: [supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], pk_columns: [s_name, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], pk_conflict: "NoCheck" }
+    └─StreamHashJoin { type: LeftSemi, predicate: supplier.s_suppkey = partsupp.ps_suppkey, output: [supplier.s_name, supplier.s_address, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey] }
+      ├─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+      | └─StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: all }
+      |   ├─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+      |   | └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+      |   └─StreamExchange { dist: HashShard(nation.n_nationkey) }
+      |     └─StreamProject { exprs: [nation.n_nationkey] }
+      |       └─StreamFilter { predicate: (nation.n_name = 'KENYA':Varchar) }
+      |         └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+      └─StreamExchange { dist: HashShard(partsupp.ps_suppkey) }
+        └─StreamProject { exprs: [partsupp.ps_suppkey, partsupp.ps_partkey, partsupp.ps_partkey, partsupp.ps_suppkey] }
+          └─StreamFilter { predicate: ($expr1 > $expr2) }
+            └─StreamHashJoin { type: Inner, predicate: partsupp.ps_partkey IS NOT DISTINCT FROM partsupp.ps_partkey AND partsupp.ps_suppkey IS NOT DISTINCT FROM partsupp.ps_suppkey, output: all }
+              ├─StreamExchange { dist: HashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+              | └─StreamProject { exprs: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty::Decimal as $expr1] }
+              |   └─StreamHashJoin { type: LeftSemi, predicate: partsupp.ps_partkey = part.p_partkey, output: all }
+              |     ├─StreamExchange { dist: HashShard(partsupp.ps_partkey) }
+              |     | └─StreamTableScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+              |     └─StreamExchange { dist: HashShard(part.p_partkey) }
+              |       └─StreamProject { exprs: [part.p_partkey] }
+              |         └─StreamFilter { predicate: Like(part.p_name, 'forest%':Varchar) }
+              |           └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_name], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+              └─StreamProject { exprs: [partsupp.ps_partkey, partsupp.ps_suppkey, (0.5:Decimal * sum(lineitem.l_quantity)) as $expr2] }
+                └─StreamHashAgg { group_key: [partsupp.ps_partkey, partsupp.ps_suppkey], aggs: [sum(lineitem.l_quantity), count] }
+                  └─StreamHashJoin { type: LeftOuter, predicate: partsupp.ps_partkey IS NOT DISTINCT FROM lineitem.l_partkey AND partsupp.ps_suppkey IS NOT DISTINCT FROM lineitem.l_suppkey, output: [partsupp.ps_partkey, partsupp.ps_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                    ├─StreamExchange { dist: HashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+                    | └─StreamProject { exprs: [partsupp.ps_partkey, partsupp.ps_suppkey] }
+                    |   └─StreamHashAgg { group_key: [partsupp.ps_partkey, partsupp.ps_suppkey], aggs: [count] }
+                    |     └─StreamTableScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+                    └─StreamExchange { dist: HashShard(lineitem.l_partkey, lineitem.l_suppkey) }
+                      └─StreamProject { exprs: [lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                        └─StreamFilter { predicate: IsNotNull(lineitem.l_partkey) AND IsNotNull(lineitem.l_suppkey) AND (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) }
+                          └─StreamTableScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q21
+  before:
+  - create_tables
+  sql: |
+    select
+      s_name,
+      count(*) as numwait
+    from
+      supplier,
+      lineitem l1,
+      orders,
+      nation
+    where
+      s_suppkey = l1.l_suppkey
+      and o_orderkey = l1.l_orderkey
+      and o_orderstatus = 'F'
+      and l1.l_receiptdate > l1.l_commitdate
+      and exists (
+        select
+          *
+        from
+          lineitem l2
+        where
+          l2.l_orderkey = l1.l_orderkey
+          and l2.l_suppkey <> l1.l_suppkey
+      )
+      and not exists (
+        select
+          *
+        from
+          lineitem l3
+        where
+          l3.l_orderkey = l1.l_orderkey
+          and l3.l_suppkey <> l1.l_suppkey
+          and l3.l_receiptdate > l3.l_commitdate
+      )
+      and s_nationkey = n_nationkey
+      and n_name = 'GERMANY'
+    group by
+      s_name
+    order by
+      numwait desc,
+      s_name
+    LIMIT 100;
+  stream_plan: |
+    StreamMaterialize { columns: [s_name, numwait], stream_key: [s_name], pk_columns: [numwait, s_name], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [supplier.s_name, count] }
+      └─StreamTopN { order: "[count DESC, supplier.s_name ASC]", limit: 100, offset: 0 }
+        └─StreamExchange { dist: Single }
+          └─StreamGroupTopN { order: "[count DESC, supplier.s_name ASC]", limit: 100, offset: 0, group_key: [2] }
+            └─StreamProject { exprs: [supplier.s_name, count, Vnode(supplier.s_name) as $expr1] }
+              └─StreamHashAgg { group_key: [supplier.s_name], aggs: [count] }
+                └─StreamExchange { dist: HashShard(supplier.s_name) }
+                  └─StreamHashJoin { type: LeftAnti, predicate: lineitem.l_orderkey = lineitem.l_orderkey AND (lineitem.l_suppkey <> lineitem.l_suppkey), output: [supplier.s_name, nation.n_nationkey, supplier.s_suppkey, orders.o_orderkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+                    ├─StreamHashJoin { type: LeftSemi, predicate: lineitem.l_orderkey = lineitem.l_orderkey AND (lineitem.l_suppkey <> lineitem.l_suppkey), output: all }
+                    | ├─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                    | | └─StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_name, lineitem.l_orderkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_suppkey, orders.o_orderkey, lineitem.l_linenumber] }
+                    | |   ├─StreamExchange { dist: HashShard(supplier.s_suppkey) }
+                    | |   | └─StreamHashJoin { type: Inner, predicate: nation.n_nationkey = supplier.s_nationkey, output: [supplier.s_suppkey, supplier.s_name, nation.n_nationkey] }
+                    | |   |   ├─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                    | |   |   | └─StreamProject { exprs: [nation.n_nationkey] }
+                    | |   |   |   └─StreamFilter { predicate: (nation.n_name = 'GERMANY':Varchar) }
+                    | |   |   |     └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                    | |   |   └─StreamExchange { dist: HashShard(supplier.s_nationkey) }
+                    | |   |     └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+                    | |   └─StreamExchange { dist: HashShard(lineitem.l_suppkey) }
+                    | |     └─StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [lineitem.l_orderkey, lineitem.l_suppkey, orders.o_orderkey, lineitem.l_linenumber] }
+                    | |       ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                    | |       | └─StreamProject { exprs: [orders.o_orderkey] }
+                    | |       |   └─StreamFilter { predicate: (orders.o_orderstatus = 'F':Varchar) }
+                    | |       |     └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_orderstatus], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+                    | |       └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                    | |         └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber] }
+                    | |           └─StreamFilter { predicate: (lineitem.l_receiptdate > lineitem.l_commitdate) }
+                    | |             └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                    | └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                    |   └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                    └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                      └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber] }
+                        └─StreamFilter { predicate: (lineitem.l_receiptdate > lineitem.l_commitdate) }
+                          └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
+- id: tpch_q22
+  before:
+  - create_tables
+  sql: |
+    select
+      cntrycode,
+      count(*) as numcust,
+      sum(c_acctbal) as totacctbal
+    from
+      (
+        select
+          substring(c_phone from 1 for 2) as cntrycode,
+          c_acctbal
+        from
+          customer
+        where
+          substring(c_phone from 1 for 2) in
+            ('30', '24', '31', '38', '25', '34', '37')
+          and c_acctbal > (
+            select
+              avg(c_acctbal)
+            from
+              customer
+            where
+              c_acctbal > 0.00::numeric
+              and substring(c_phone from 1 for 2) in
+                ('30', '24', '31', '38', '25', '34', '37')
+          )
+          and not exists (
+            select
+              *
+            from
+              orders
+            where
+              o_custkey = c_custkey
+          )
+      ) as custsale
+    group by
+      cntrycode
+    order by
+      cntrycode;
+  stream_plan: |
+    StreamMaterialize { columns: [cntrycode, numcust, totacctbal], stream_key: [cntrycode], pk_columns: [cntrycode], pk_conflict: "NoCheck" }
+    └─StreamHashAgg { group_key: [$expr2], aggs: [count, sum(customer.c_acctbal)] }
+      └─StreamExchange { dist: HashShard($expr2) }
+        └─StreamProject { exprs: [Substr(customer.c_phone, 1:Int32, 2:Int32) as $expr2, customer.c_acctbal, customer.c_custkey] }
+          └─StreamDynamicFilter { predicate: (customer.c_acctbal > $expr1), output: [customer.c_phone, customer.c_acctbal, customer.c_custkey] }
+            ├─StreamHashJoin { type: LeftAnti, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_phone, customer.c_acctbal, customer.c_custkey] }
+            | ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+            | | └─StreamFilter { predicate: In(Substr(customer.c_phone, 1:Int32, 2:Int32), '30':Varchar, '24':Varchar, '31':Varchar, '38':Varchar, '25':Varchar, '34':Varchar, '37':Varchar) }
+            | |   └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_phone, customer.c_acctbal], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+            | └─StreamExchange { dist: HashShard(orders.o_custkey) }
+            |   └─StreamTableScan { table: orders, columns: [orders.o_custkey, orders.o_orderkey], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+            └─StreamExchange { dist: Broadcast }
+              └─StreamProject { exprs: [(sum(sum(customer.c_acctbal)) / sum0(count(customer.c_acctbal))) as $expr1] }
+                └─StreamGlobalSimpleAgg { aggs: [sum(sum(customer.c_acctbal)), sum0(count(customer.c_acctbal)), count] }
+                  └─StreamExchange { dist: Single }
+                    └─StreamStatelessLocalSimpleAgg { aggs: [sum(customer.c_acctbal), count(customer.c_acctbal)] }
+                      └─StreamProject { exprs: [customer.c_acctbal, customer.c_custkey] }
+                        └─StreamFilter { predicate: (customer.c_acctbal > 0.00:Decimal) AND In(Substr(customer.c_phone, 1:Int32, 2:Int32), '30':Varchar, '24':Varchar, '31':Varchar, '38':Varchar, '25':Varchar, '34':Varchar, '37':Varchar) }
+                          └─StreamTableScan { table: customer, columns: [customer.c_acctbal, customer.c_custkey, customer.c_phone], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+  with_config_map:
+    RW_STREAMING_ENABLE_BUSHY_JOIN: 'true'
diff --git a/src/frontend/planner_test/tests/testdata/column_pruning.yaml b/src/frontend/planner_test/tests/testdata/column_pruning.yaml
index 6274d4c4b9b06..c4c47499152bb 100644
--- a/src/frontend/planner_test/tests/testdata/column_pruning.yaml
+++ b/src/frontend/planner_test/tests/testdata/column_pruning.yaml
@@ -152,7 +152,7 @@
       └─BatchFilter { predicate: IsNotNull(t1.created_at) }
         └─BatchScan { table: t1, columns: [t1.a, t1.created_at], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a, window_end, t1._row_id(hidden)], pk_columns: [t1._row_id, window_end], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, window_end, t1._row_id(hidden)], stream_key: [t1._row_id, window_end], pk_columns: [t1._row_id, window_end], pk_conflict: "NoCheck" }
     └─StreamHopWindow { time_col: t1.created_at, slide: 00:15:00, size: 00:30:00, output: [t1.a, window_end, t1._row_id] }
       └─StreamFilter { predicate: IsNotNull(t1.created_at) }
         └─StreamTableScan { table: t1, columns: [t1.a, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
diff --git a/src/frontend/planner_test/tests/testdata/common_table_expressions.yaml b/src/frontend/planner_test/tests/testdata/common_table_expressions.yaml
index f4271f5e3fa8f..8cde6d0c38a81 100644
--- a/src/frontend/planner_test/tests/testdata/common_table_expressions.yaml
+++ b/src/frontend/planner_test/tests/testdata/common_table_expressions.yaml
@@ -8,7 +8,7 @@
       └─LogicalProject { exprs: [t1.v1, t1.v2] }
         └─LogicalScan { table: t1, columns: [t1.v1, t1.v2, t1._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamTableScan { table: t1, columns: [t1.v1, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
 - sql: |
     create table t1 (v1 int, v2 int);
@@ -22,7 +22,7 @@
         └─LogicalProject { exprs: [t1.v1] }
           └─LogicalScan { table: t1, columns: [t1.v1, t1.v2, t1._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [v3, v4, v1, t2._row_id(hidden), t1._row_id(hidden)], pk_columns: [t2._row_id, t1._row_id, v3], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v3, v4, v1, t2._row_id(hidden), t1._row_id(hidden)], stream_key: [t2._row_id, t1._row_id, v3], pk_columns: [t2._row_id, t1._row_id, v3], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t2.v3 = t1.v1, output: [t2.v3, t2.v4, t1.v1, t2._row_id, t1._row_id] }
       ├─StreamExchange { dist: HashShard(t2.v3) }
       | └─StreamTableScan { table: t2, columns: [t2.v3, t2.v4, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
@@ -40,7 +40,7 @@
           └─LogicalProject { exprs: [t1.v1, t1.v2] }
             └─LogicalScan { table: t1, columns: [t1.v1, t1.v2, t1._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamTableScan { table: t1, columns: [t1.v1, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
 - sql: |
     create table t1 (x int);
diff --git a/src/frontend/planner_test/tests/testdata/delta_join.yaml b/src/frontend/planner_test/tests/testdata/delta_join.yaml
index 8e13a1359fc0a..cc2ea7206d07e 100644
--- a/src/frontend/planner_test/tests/testdata/delta_join.yaml
+++ b/src/frontend/planner_test/tests/testdata/delta_join.yaml
@@ -8,7 +8,7 @@
     /* should generate delta join plan, and stream index scan */
     select * from a join b on a.a1 = b.b1 ;
   stream_plan: |
-    StreamMaterialize { columns: [a1, a2, b1, b2, i_a1.a._row_id(hidden), i_b1.b._row_id(hidden)], pk_columns: [i_a1.a._row_id, i_b1.b._row_id, a1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, a2, b1, b2, i_a1.a._row_id(hidden), i_b1.b._row_id(hidden)], stream_key: [i_a1.a._row_id, i_b1.b._row_id, a1], pk_columns: [i_a1.a._row_id, i_b1.b._row_id, a1], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(i_a1.a1, i_a1.a._row_id, i_b1.b._row_id) }
       └─StreamDeltaJoin { type: Inner, predicate: i_a1.a1 = i_b1.b1, output: [i_a1.a1, i_a1.a2, i_b1.b1, i_b1.b2, i_a1.a._row_id, i_b1.b._row_id] }
         ├─StreamTableScan { table: i_a1, columns: [i_a1.a1, i_a1.a2, i_a1.a._row_id], pk: [i_a1.a._row_id], dist: UpstreamHashShard(i_a1.a1) }
@@ -21,7 +21,7 @@
     /* should generate delta join plan, and stream index scan */
     select * from a join b on a.a1 = b.b1 ;
   stream_plan: |
-    StreamMaterialize { columns: [a1, a2, b1, b2, i_b1.b._row_id(hidden)], pk_columns: [a1, i_b1.b._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, a2, b1, b2, i_b1.b._row_id(hidden)], stream_key: [a1, i_b1.b._row_id], pk_columns: [a1, i_b1.b._row_id], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(a.a1, i_b1.b._row_id) }
       └─StreamDeltaJoin { type: Inner, predicate: a.a1 = i_b1.b1, output: all }
         ├─StreamTableScan { table: a, columns: [a.a1, a.a2], pk: [a.a1], dist: UpstreamHashShard(a.a1) }
@@ -33,7 +33,7 @@
     /* should generate delta join plan, and stream index scan */
     select * from a join b on a.a1 = b.b1 ;
   stream_plan: |
-    StreamMaterialize { columns: [a1, a2, b1, b2], pk_columns: [a1, b1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, a2, b1, b2], stream_key: [a1, b1], pk_columns: [a1, b1], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(a.a1, b.b1) }
       └─StreamDeltaJoin { type: Inner, predicate: a.a1 = b.b1, output: all }
         ├─StreamTableScan { table: a, columns: [a.a1, a.a2], pk: [a.a1], dist: UpstreamHashShard(a.a1) }
diff --git a/src/frontend/planner_test/tests/testdata/distribution_derive.yaml b/src/frontend/planner_test/tests/testdata/distribution_derive.yaml
index 573e250f0b415..236ccc3f4fa2c 100644
--- a/src/frontend/planner_test/tests/testdata/distribution_derive.yaml
+++ b/src/frontend/planner_test/tests/testdata/distribution_derive.yaml
@@ -17,43 +17,44 @@
       └─BatchExchange { order: [], dist: UpstreamHashShard(a.k1) }
         └─BatchScan { table: a, columns: [a.k1, a.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], stream_key: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(ak1.a._row_id, ak1.k1, bk1.b._row_id) }
       └─StreamDeltaJoin { type: Inner, predicate: ak1.k1 = bk1.k1, output: [ak1.v, bk1.v, ak1.a._row_id, ak1.k1, bk1.b._row_id] }
         ├─StreamTableScan { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
         └─StreamTableScan { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([2, 3, 4]) from 1
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], stream_key: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └──  StreamExchange Hash([2, 3, 4]) from 1
 
     Fragment 1
-      Union
-        StreamExchange Hash([2, 4, 3]) from 4
-        StreamExchange Hash([2, 4, 3]) from 5
+    Union
+    ├──  StreamExchange Hash([2, 4, 3]) from 4
+    └──  StreamExchange Hash([2, 4, 3]) from 5
 
     Fragment 2
-      Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      Chain { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
-        Upstream
-        BatchPlanNode
+    Chain { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 4
-      Lookup
-        StreamExchange Hash([0]) from 3
-        StreamExchange NoShuffle from 2
+    Lookup
+    ├──  StreamExchange Hash([0]) from 3
+    └──  StreamExchange NoShuffle from 2
 
     Fragment 5
-      Lookup
-        StreamExchange Hash([0]) from 2
-        StreamExchange NoShuffle from 3
+    Lookup
+    ├──  StreamExchange Hash([0]) from 2
+    └──  StreamExchange NoShuffle from 3
+
+    Table 4294967294 { columns: [ v, bv, ak1.a._row_id, ak1.k1, bk1.b._row_id ], primary key: [ $2 ASC, $4 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2, 3, 4 ], read pk prefix len hint: 3 }
 
-     Table 4294967294 { columns: [v, bv, ak1.a._row_id, ak1.k1, bk1.b._row_id], primary key: [$2 ASC, $4 ASC, $3 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2, 3, 4], read pk prefix len hint: 3 }
 - id: Ak1_join_B_onk1
   before:
   - create_tables
@@ -64,43 +65,44 @@
       └─BatchExchange { order: [], dist: UpstreamHashShard(ak1.k1) }
         └─BatchScan { table: ak1, columns: [ak1.k1, ak1.v], distribution: UpstreamHashShard(ak1.k1) }
   stream_plan: |
-    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], stream_key: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(ak1.a._row_id, ak1.k1, bk1.b._row_id) }
       └─StreamDeltaJoin { type: Inner, predicate: ak1.k1 = bk1.k1, output: [ak1.v, bk1.v, ak1.a._row_id, ak1.k1, bk1.b._row_id] }
         ├─StreamTableScan { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
         └─StreamTableScan { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([2, 3, 4]) from 1
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], stream_key: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └──  StreamExchange Hash([2, 3, 4]) from 1
 
     Fragment 1
-      Union
-        StreamExchange Hash([2, 4, 3]) from 4
-        StreamExchange Hash([2, 4, 3]) from 5
+    Union
+    ├──  StreamExchange Hash([2, 4, 3]) from 4
+    └──  StreamExchange Hash([2, 4, 3]) from 5
 
     Fragment 2
-      Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      Chain { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
-        Upstream
-        BatchPlanNode
+    Chain { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 4
-      Lookup
-        StreamExchange Hash([0]) from 3
-        StreamExchange NoShuffle from 2
+    Lookup
+    ├──  StreamExchange Hash([0]) from 3
+    └──  StreamExchange NoShuffle from 2
 
     Fragment 5
-      Lookup
-        StreamExchange Hash([0]) from 2
-        StreamExchange NoShuffle from 3
+    Lookup
+    ├──  StreamExchange Hash([0]) from 2
+    └──  StreamExchange NoShuffle from 3
+
+    Table 4294967294 { columns: [ v, bv, ak1.a._row_id, ak1.k1, bk1.b._row_id ], primary key: [ $2 ASC, $4 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2, 3, 4 ], read pk prefix len hint: 3 }
 
-     Table 4294967294 { columns: [v, bv, ak1.a._row_id, ak1.k1, bk1.b._row_id], primary key: [$2 ASC, $4 ASC, $3 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2, 3, 4], read pk prefix len hint: 3 }
 - id: A_join_Bk1_onk1
   before:
   - create_tables
@@ -111,43 +113,44 @@
       └─BatchExchange { order: [], dist: UpstreamHashShard(a.k1) }
         └─BatchScan { table: a, columns: [a.k1, a.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], stream_key: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(ak1.a._row_id, ak1.k1, bk1.b._row_id) }
       └─StreamDeltaJoin { type: Inner, predicate: ak1.k1 = bk1.k1, output: [ak1.v, bk1.v, ak1.a._row_id, ak1.k1, bk1.b._row_id] }
         ├─StreamTableScan { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
         └─StreamTableScan { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([2, 3, 4]) from 1
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], stream_key: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └──  StreamExchange Hash([2, 3, 4]) from 1
 
     Fragment 1
-      Union
-        StreamExchange Hash([2, 4, 3]) from 4
-        StreamExchange Hash([2, 4, 3]) from 5
+    Union
+    ├──  StreamExchange Hash([2, 4, 3]) from 4
+    └──  StreamExchange Hash([2, 4, 3]) from 5
 
     Fragment 2
-      Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      Chain { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
-        Upstream
-        BatchPlanNode
+    Chain { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 4
-      Lookup
-        StreamExchange Hash([0]) from 3
-        StreamExchange NoShuffle from 2
+    Lookup
+    ├──  StreamExchange Hash([0]) from 3
+    └──  StreamExchange NoShuffle from 2
 
     Fragment 5
-      Lookup
-        StreamExchange Hash([0]) from 2
-        StreamExchange NoShuffle from 3
+    Lookup
+    ├──  StreamExchange Hash([0]) from 2
+    └──  StreamExchange NoShuffle from 3
+
+    Table 4294967294 { columns: [ v, bv, ak1.a._row_id, ak1.k1, bk1.b._row_id ], primary key: [ $2 ASC, $4 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2, 3, 4 ], read pk prefix len hint: 3 }
 
-     Table 4294967294 { columns: [v, bv, ak1.a._row_id, ak1.k1, bk1.b._row_id], primary key: [$2 ASC, $4 ASC, $3 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2, 3, 4], read pk prefix len hint: 3 }
 - id: Ak1_join_Bk1_onk1
   before:
   - create_tables
@@ -158,43 +161,44 @@
       └─BatchExchange { order: [], dist: UpstreamHashShard(ak1.k1) }
         └─BatchScan { table: ak1, columns: [ak1.k1, ak1.v], distribution: UpstreamHashShard(ak1.k1) }
   stream_plan: |
-    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], stream_key: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(ak1.a._row_id, ak1.k1, bk1.b._row_id) }
       └─StreamDeltaJoin { type: Inner, predicate: ak1.k1 = bk1.k1, output: [ak1.v, bk1.v, ak1.a._row_id, ak1.k1, bk1.b._row_id] }
         ├─StreamTableScan { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
         └─StreamTableScan { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([2, 3, 4]) from 1
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), bk1.b._row_id(hidden)], stream_key: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_columns: [ak1.a._row_id, bk1.b._row_id, ak1.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └──  StreamExchange Hash([2, 3, 4]) from 1
 
     Fragment 1
-      Union
-        StreamExchange Hash([2, 4, 3]) from 4
-        StreamExchange Hash([2, 4, 3]) from 5
+    Union
+    ├──  StreamExchange Hash([2, 4, 3]) from 4
+    └──  StreamExchange Hash([2, 4, 3]) from 5
 
     Fragment 2
-      Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      Chain { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
-        Upstream
-        BatchPlanNode
+    Chain { table: bk1, columns: [bk1.k1, bk1.v, bk1.b._row_id], pk: [bk1.b._row_id], dist: UpstreamHashShard(bk1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 4
-      Lookup
-        StreamExchange Hash([0]) from 3
-        StreamExchange NoShuffle from 2
+    Lookup
+    ├──  StreamExchange Hash([0]) from 3
+    └──  StreamExchange NoShuffle from 2
 
     Fragment 5
-      Lookup
-        StreamExchange Hash([0]) from 2
-        StreamExchange NoShuffle from 3
+    Lookup
+    ├──  StreamExchange Hash([0]) from 2
+    └──  StreamExchange NoShuffle from 3
+
+    Table 4294967294 { columns: [ v, bv, ak1.a._row_id, ak1.k1, bk1.b._row_id ], primary key: [ $2 ASC, $4 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2, 3, 4 ], read pk prefix len hint: 3 }
 
-     Table 4294967294 { columns: [v, bv, ak1.a._row_id, ak1.k1, bk1.b._row_id], primary key: [$2 ASC, $4 ASC, $3 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2, 3, 4], read pk prefix len hint: 3 }
 - id: aggk1_from_A
   before:
   - create_tables
@@ -209,28 +213,48 @@
         └─BatchExchange { order: [], dist: HashShard(a.k1) }
           └─BatchScan { table: a, columns: [a.k1, a.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [max_v, a.k1(hidden)], pk_columns: [a.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_v, a.k1(hidden)], stream_key: [a.k1], pk_columns: [a.k1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(a.v), a.k1] }
       └─StreamHashAgg { group_key: [a.k1], aggs: [max(a.v), count] }
         └─StreamExchange { dist: HashShard(a.k1) }
           └─StreamTableScan { table: a, columns: [a.k1, a.v, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [max_v, a.k1(hidden)], pk_columns: [a.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(a.v), a.k1] }
-          StreamHashAgg { group_key: [a.k1], aggs: [max(a.v), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [max_v, a.k1(hidden)], stream_key: [a.k1], pk_columns: [a.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(a.v), a.k1] }
+        └── StreamHashAgg { group_key: [a.k1], aggs: [max(a.v), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: a, columns: [a.k1, a.v, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: a, columns: [a.k1, a.v, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ a_k1, a_v, a__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ a_k1, max(a_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ max_v, a.k1 ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [a_k1, a_v, a__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [a_k1, max(a_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [max_v, a.k1], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: aggk1_from_Ak1
   before:
   - create_tables
@@ -244,24 +268,44 @@
       └─BatchSortAgg { group_key: [ak1.k1], aggs: [max(ak1.v)] }
         └─BatchScan { table: ak1, columns: [ak1.k1, ak1.v], distribution: UpstreamHashShard(ak1.k1) }
   stream_plan: |
-    StreamMaterialize { columns: [max_v, ak1.k1(hidden)], pk_columns: [ak1.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_v, ak1.k1(hidden)], stream_key: [ak1.k1], pk_columns: [ak1.k1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(ak1.v), ak1.k1] }
       └─StreamHashAgg { group_key: [ak1.k1], aggs: [max(ak1.v), count] }
         └─StreamTableScan { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [max_v, ak1.k1(hidden)], pk_columns: [ak1.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(ak1.v), ak1.k1] }
-          StreamHashAgg { group_key: [ak1.k1], aggs: [max(ak1.v), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [ak1_k1, ak1_v, ak1_a__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [ak1_k1, max(ak1_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [max_v, ak1.k1], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [max_v, ak1.k1(hidden)], stream_key: [ak1.k1], pk_columns: [ak1.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(ak1.v), ak1.k1] }
+        └── StreamHashAgg { group_key: [ak1.k1], aggs: [max(ak1.v), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └── Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ ak1_k1, ak1_v, ak1_a__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ ak1_k1, max(ak1_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ max_v, ak1.k1 ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: aggk1_from_Ak1k2
   before:
   - create_tables
@@ -276,28 +320,48 @@
         └─BatchExchange { order: [ak1k2.k1 ASC], dist: HashShard(ak1k2.k1) }
           └─BatchScan { table: ak1k2, columns: [ak1k2.k1, ak1k2.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [max_v, ak1k2.k1(hidden)], pk_columns: [ak1k2.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_v, ak1k2.k1(hidden)], stream_key: [ak1k2.k1], pk_columns: [ak1k2.k1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(ak1k2.v), ak1k2.k1] }
       └─StreamHashAgg { group_key: [ak1k2.k1], aggs: [max(ak1k2.v), count] }
         └─StreamExchange { dist: HashShard(ak1k2.k1) }
           └─StreamTableScan { table: ak1k2, columns: [ak1k2.k1, ak1k2.v, ak1k2.k2, ak1k2.a._row_id], pk: [ak1k2.a._row_id], dist: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [max_v, ak1k2.k1(hidden)], pk_columns: [ak1k2.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(ak1k2.v), ak1k2.k1] }
-          StreamHashAgg { group_key: [ak1k2.k1], aggs: [max(ak1k2.v), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [max_v, ak1k2.k1(hidden)], stream_key: [ak1k2.k1], pk_columns: [ak1k2.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(ak1k2.v), ak1k2.k1] }
+        └── StreamHashAgg { group_key: [ak1k2.k1], aggs: [max(ak1k2.v), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: ak1k2, columns: [ak1k2.k1, ak1k2.v, ak1k2.k2, ak1k2.a._row_id], pk: [ak1k2.a._row_id], dist: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ak1k2, columns: [ak1k2.k1, ak1k2.v, ak1k2.k2, ak1k2.a._row_id], pk: [ak1k2.a._row_id], dist: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ ak1k2_k1, ak1k2_v, ak1k2_a__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ ak1k2_k1, max(ak1k2_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ max_v, ak1k2.k1 ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [ak1k2_k1, ak1k2_v, ak1k2_a__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [ak1k2_k1, max(ak1k2_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [max_v, ak1k2.k1], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: aggk2_from_Ak1k2
   before:
   - create_tables
@@ -312,28 +376,48 @@
         └─BatchExchange { order: [], dist: HashShard(ak1k2.k2) }
           └─BatchScan { table: ak1k2, columns: [ak1k2.k2, ak1k2.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [max_v, ak1k2.k2(hidden)], pk_columns: [ak1k2.k2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_v, ak1k2.k2(hidden)], stream_key: [ak1k2.k2], pk_columns: [ak1k2.k2], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(ak1k2.v), ak1k2.k2] }
       └─StreamHashAgg { group_key: [ak1k2.k2], aggs: [max(ak1k2.v), count] }
         └─StreamExchange { dist: HashShard(ak1k2.k2) }
           └─StreamTableScan { table: ak1k2, columns: [ak1k2.k2, ak1k2.v, ak1k2.k1, ak1k2.a._row_id], pk: [ak1k2.a._row_id], dist: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [max_v, ak1k2.k2(hidden)], pk_columns: [ak1k2.k2], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(ak1k2.v), ak1k2.k2] }
-          StreamHashAgg { group_key: [ak1k2.k2], aggs: [max(ak1k2.v), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [max_v, ak1k2.k2(hidden)], stream_key: [ak1k2.k2], pk_columns: [ak1k2.k2], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(ak1k2.v), ak1k2.k2] }
+        └── StreamHashAgg { group_key: [ak1k2.k2], aggs: [max(ak1k2.v), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: ak1k2, columns: [ak1k2.k2, ak1k2.v, ak1k2.k1, ak1k2.a._row_id], pk: [ak1k2.a._row_id], dist: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ak1k2, columns: [ak1k2.k2, ak1k2.v, ak1k2.k1, ak1k2.a._row_id], pk: [ak1k2.a._row_id], dist: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ ak1k2_k2, ak1k2_v, ak1k2_a__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ ak1k2_k2, max(ak1k2_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ max_v, ak1k2.k2 ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [ak1k2_k2, ak1k2_v, ak1k2_a__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [ak1k2_k2, max(ak1k2_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [max_v, ak1k2.k2], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: aggk1k2_from_Ak1k2
   before:
   - create_tables
@@ -347,23 +431,34 @@
       └─BatchSortAgg { group_key: [ak1k2.k1, ak1k2.k2], aggs: [sum(ak1k2.v)] }
         └─BatchScan { table: ak1k2, columns: [ak1k2.k1, ak1k2.k2, ak1k2.v], distribution: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
   stream_plan: |
-    StreamMaterialize { columns: [sum_v, ak1k2.k1(hidden), ak1k2.k2(hidden)], pk_columns: [ak1k2.k1, ak1k2.k2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [sum_v, ak1k2.k1(hidden), ak1k2.k2(hidden)], stream_key: [ak1k2.k1, ak1k2.k2], pk_columns: [ak1k2.k1, ak1k2.k2], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(ak1k2.v), ak1k2.k1, ak1k2.k2] }
       └─StreamHashAgg { group_key: [ak1k2.k1, ak1k2.k2], aggs: [sum(ak1k2.v), count] }
         └─StreamTableScan { table: ak1k2, columns: [ak1k2.k1, ak1k2.k2, ak1k2.v, ak1k2.a._row_id], pk: [ak1k2.a._row_id], dist: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [sum_v, ak1k2.k1(hidden), ak1k2.k2(hidden)], pk_columns: [ak1k2.k1, ak1k2.k2], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(ak1k2.v), ak1k2.k1, ak1k2.k2] }
-          StreamHashAgg { group_key: [ak1k2.k1, ak1k2.k2], aggs: [sum(ak1k2.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            Chain { table: ak1k2, columns: [ak1k2.k1, ak1k2.k2, ak1k2.v, ak1k2.a._row_id], pk: [ak1k2.a._row_id], dist: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [ak1k2_k1, ak1k2_k2, sum(ak1k2_v), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [sum_v, ak1k2.k1, ak1k2.k2], primary key: [$1 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [1, 2], read pk prefix len hint: 2 }
+    StreamMaterialize { columns: [sum_v, ak1k2.k1(hidden), ak1k2.k2(hidden)], stream_key: [ak1k2.k1, ak1k2.k2], pk_columns: [ak1k2.k1, ak1k2.k2], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(ak1k2.v), ak1k2.k1, ak1k2.k2] }
+        └── StreamHashAgg { group_key: [ak1k2.k1, ak1k2.k2], aggs: [sum(ak1k2.v), count] } { result table: 0, state tables: [], distinct tables: [] }
+            └── Chain { table: ak1k2, columns: [ak1k2.k1, ak1k2.k2, ak1k2.v, ak1k2.a._row_id], pk: [ak1k2.a._row_id], dist: UpstreamHashShard(ak1k2.k1, ak1k2.k2) }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ ak1k2_k1, ak1k2_k2, sum(ak1k2_v), count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2, 3 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 4294967294
+    ├── columns: [ sum_v, ak1k2.k1, ak1k2.k2 ]
+    ├── primary key: [ $1 ASC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 1, 2 ]
+    └── read pk prefix len hint: 2
+
 - id: aggk1k2_from_Ak1
   before:
   - create_tables
@@ -377,23 +472,34 @@
       └─BatchHashAgg { group_key: [ak1.k1, ak1.k2], aggs: [sum(ak1.v)] }
         └─BatchScan { table: ak1, columns: [ak1.k1, ak1.k2, ak1.v], distribution: UpstreamHashShard(ak1.k1) }
   stream_plan: |
-    StreamMaterialize { columns: [sum_v, ak1.k1(hidden), ak1.k2(hidden)], pk_columns: [ak1.k1, ak1.k2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [sum_v, ak1.k1(hidden), ak1.k2(hidden)], stream_key: [ak1.k1, ak1.k2], pk_columns: [ak1.k1, ak1.k2], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(ak1.v), ak1.k1, ak1.k2] }
       └─StreamHashAgg { group_key: [ak1.k1, ak1.k2], aggs: [sum(ak1.v), count] }
         └─StreamTableScan { table: ak1, columns: [ak1.k1, ak1.k2, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [sum_v, ak1.k1(hidden), ak1.k2(hidden)], pk_columns: [ak1.k1, ak1.k2], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(ak1.v), ak1.k1, ak1.k2] }
-          StreamHashAgg { group_key: [ak1.k1, ak1.k2], aggs: [sum(ak1.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            Chain { table: ak1, columns: [ak1.k1, ak1.k2, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [ak1_k1, ak1_k2, sum(ak1_v), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [sum_v, ak1.k1, ak1.k2], primary key: [$1 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [1], read pk prefix len hint: 2 }
+    StreamMaterialize { columns: [sum_v, ak1.k1(hidden), ak1.k2(hidden)], stream_key: [ak1.k1, ak1.k2], pk_columns: [ak1.k1, ak1.k2], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(ak1.v), ak1.k1, ak1.k2] }
+        └── StreamHashAgg { group_key: [ak1.k1, ak1.k2], aggs: [sum(ak1.v), count] } { result table: 0, state tables: [], distinct tables: [] }
+            └── Chain { table: ak1, columns: [ak1.k1, ak1.k2, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ ak1_k1, ak1_k2, sum(ak1_v), count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
+    Table 4294967294
+    ├── columns: [ sum_v, ak1.k1, ak1.k2 ]
+    ├── primary key: [ $1 ASC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 2
+
 - id: aggk1_from_aggk1
   before:
   - create_tables
@@ -415,32 +521,60 @@
           └─BatchExchange { order: [], dist: HashShard(a.k1) }
             └─BatchScan { table: a, columns: [a.k1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [max_num, a.k1(hidden)], pk_columns: [a.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_num, a.k1(hidden)], stream_key: [a.k1], pk_columns: [a.k1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(count), a.k1] }
       └─StreamHashAgg { group_key: [a.k1], aggs: [max(count), count] }
         └─StreamHashAgg { group_key: [a.k1], aggs: [count] }
           └─StreamExchange { dist: HashShard(a.k1) }
             └─StreamTableScan { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [max_num, a.k1(hidden)], pk_columns: [a.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(count), a.k1] }
-          StreamHashAgg { group_key: [a.k1], aggs: [max(count), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamHashAgg { group_key: [a.k1], aggs: [count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [max_num, a.k1(hidden)], stream_key: [a.k1], pk_columns: [a.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(count), a.k1] }
+        └── StreamHashAgg { group_key: [a.k1], aggs: [max(count), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └── StreamHashAgg { group_key: [a.k1], aggs: [count] }
+                ├── result table: 2
+                ├── state tables: []
+                ├── distinct tables: []
+                └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [a_k1, count], primary key: [$0 ASC, $1 DESC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [a_k1, max(count), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [a_k1, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [max_num, a.k1], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    Chain { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ a_k1, count ]
+    ├── primary key: [ $0 ASC, $1 DESC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ a_k1, max(count), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 2
+    ├── columns: [ a_k1, count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ max_num, a.k1 ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: aggk1_from_aggk1k2
   before:
   - create_tables
@@ -476,36 +610,61 @@
             └─BatchExchange { order: [], dist: HashShard(a.k1, a.k2) }
               └─BatchScan { table: a, columns: [a.k1, a.k2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [max_num, a.k1(hidden)], pk_columns: [a.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_num, a.k1(hidden)], stream_key: [a.k1], pk_columns: [a.k1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(count), a.k1] }
       └─StreamHashAgg { group_key: [a.k1], aggs: [max(count), count] }
         └─StreamExchange { dist: HashShard(a.k1) }
           └─StreamHashAgg { group_key: [a.k1, a.k2], aggs: [count] }
             └─StreamExchange { dist: HashShard(a.k1, a.k2) }
               └─StreamTableScan { table: a, columns: [a.k1, a.k2, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [max_num, a.k1(hidden)], pk_columns: [a.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(count), a.k1] }
-          StreamHashAgg { group_key: [a.k1], aggs: [max(count), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [max_num, a.k1(hidden)], stream_key: [a.k1], pk_columns: [a.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(count), a.k1] }
+        └── StreamHashAgg { group_key: [a.k1], aggs: [max(count), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamHashAgg { group_key: [a.k1, a.k2], aggs: [count] }
-          result table: 2, state tables: [], distinct tables: []
-        StreamExchange Hash([0, 1]) from 2
+    StreamHashAgg { group_key: [a.k1, a.k2], aggs: [count] } { result table: 2, state tables: [], distinct tables: [] }
+    └──  StreamExchange Hash([0, 1]) from 2
 
     Fragment 2
-      Chain { table: a, columns: [a.k1, a.k2, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [a_k1, count, a_k2], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [a_k1, max(count), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [a_k1, a_k2, count], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [max_num, a.k1], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    Chain { table: a, columns: [a.k1, a.k2, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ a_k1, count, a_k2 ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ a_k1, max(count), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 2
+    ├── columns: [ a_k1, a_k2, count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 4294967294
+    ├── columns: [ max_num, a.k1 ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: aggk2_from_aggk1k2
   before:
   - create_tables
@@ -541,36 +700,61 @@
             └─BatchExchange { order: [], dist: HashShard(a.k1, a.k2) }
               └─BatchScan { table: a, columns: [a.k1, a.k2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [max_num, a.k2(hidden)], pk_columns: [a.k2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_num, a.k2(hidden)], stream_key: [a.k2], pk_columns: [a.k2], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(count), a.k2] }
       └─StreamHashAgg { group_key: [a.k2], aggs: [max(count), count] }
         └─StreamExchange { dist: HashShard(a.k2) }
           └─StreamHashAgg { group_key: [a.k1, a.k2], aggs: [count] }
             └─StreamExchange { dist: HashShard(a.k1, a.k2) }
               └─StreamTableScan { table: a, columns: [a.k1, a.k2, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [max_num, a.k2(hidden)], pk_columns: [a.k2], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(count), a.k2] }
-          StreamHashAgg { group_key: [a.k2], aggs: [max(count), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Hash([1]) from 1
+    StreamMaterialize { columns: [max_num, a.k2(hidden)], stream_key: [a.k2], pk_columns: [a.k2], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(count), a.k2] }
+        └── StreamHashAgg { group_key: [a.k2], aggs: [max(count), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Hash([1]) from 1
 
     Fragment 1
-      StreamHashAgg { group_key: [a.k1, a.k2], aggs: [count] }
-          result table: 2, state tables: [], distinct tables: []
-        StreamExchange Hash([0, 1]) from 2
+    StreamHashAgg { group_key: [a.k1, a.k2], aggs: [count] } { result table: 2, state tables: [], distinct tables: [] }
+    └──  StreamExchange Hash([0, 1]) from 2
 
     Fragment 2
-      Chain { table: a, columns: [a.k1, a.k2, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [a_k2, count, a_k1], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [a_k2, max(count), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [a_k1, a_k2, count], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [max_num, a.k2], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    Chain { table: a, columns: [a.k1, a.k2, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ a_k2, count, a_k1 ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ a_k2, max(count), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 2
+    ├── columns: [ a_k1, a_k2, count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 4294967294
+    ├── columns: [ max_num, a.k2 ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: aggk1k2_from_aggk1k2
   before:
   - create_tables
@@ -592,32 +776,54 @@
           └─BatchExchange { order: [], dist: HashShard(a.k1, a.k2) }
             └─BatchScan { table: a, columns: [a.k1, a.k2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [max_num, a.k1(hidden), a.k2(hidden)], pk_columns: [a.k1, a.k2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_num, a.k1(hidden), a.k2(hidden)], stream_key: [a.k1, a.k2], pk_columns: [a.k1, a.k2], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(count), a.k1, a.k2] }
       └─StreamHashAgg { group_key: [a.k1, a.k2], aggs: [max(count), count] }
         └─StreamHashAgg { group_key: [a.k1, a.k2], aggs: [count] }
           └─StreamExchange { dist: HashShard(a.k1, a.k2) }
             └─StreamTableScan { table: a, columns: [a.k1, a.k2, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [max_num, a.k1(hidden), a.k2(hidden)], pk_columns: [a.k1, a.k2], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(count), a.k1, a.k2] }
-          StreamHashAgg { group_key: [a.k1, a.k2], aggs: [max(count), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamHashAgg { group_key: [a.k1, a.k2], aggs: [count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamExchange Hash([0, 1]) from 1
+    StreamMaterialize { columns: [max_num, a.k1(hidden), a.k2(hidden)], stream_key: [a.k1, a.k2], pk_columns: [a.k1, a.k2], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(count), a.k1, a.k2] }
+        └── StreamHashAgg { group_key: [a.k1, a.k2], aggs: [max(count), count] } { result table: 1, state tables: [ 0 ], distinct tables: [] }
+            └── StreamHashAgg { group_key: [a.k1, a.k2], aggs: [count] } { result table: 2, state tables: [], distinct tables: [] }
+                └──  StreamExchange Hash([0, 1]) from 1
 
     Fragment 1
-      Chain { table: a, columns: [a.k1, a.k2, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [a_k1, a_k2, count], primary key: [$0 ASC, $1 ASC, $2 DESC], value indices: [0, 1, 2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 1 { columns: [a_k1, a_k2, max(count), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 2 { columns: [a_k1, a_k2, count], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [max_num, a.k1, a.k2], primary key: [$1 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [1, 2], read pk prefix len hint: 2 }
+    Chain { table: a, columns: [a.k1, a.k2, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ a_k1, a_k2, count ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 DESC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 1
+    ├── columns: [ a_k1, a_k2, max(count), count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2, 3 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 2
+    ├── columns: [ a_k1, a_k2, count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 4294967294
+    ├── columns: [ max_num, a.k1, a.k2 ]
+    ├── primary key: [ $1 ASC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 1, 2 ]
+    └── read pk prefix len hint: 2
+
 - id: Ak1_join_aggk1_onk1
   before:
   - create_tables
@@ -639,7 +845,7 @@
           └─BatchExchange { order: [], dist: HashShard(a.k1) }
             └─BatchScan { table: a, columns: [a.k1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), a.k1(hidden)], pk_columns: [ak1.a._row_id, a.k1, ak1.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), a.k1(hidden)], stream_key: [ak1.a._row_id, a.k1, ak1.k1], pk_columns: [ak1.a._row_id, a.k1, ak1.k1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: ak1.k1 = a.k1, output: [ak1.v, count, ak1.a._row_id, ak1.k1, a.k1] }
       ├─StreamExchange { dist: HashShard(ak1.k1) }
       | └─StreamTableScan { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
@@ -647,34 +853,38 @@
         └─StreamHashAgg { group_key: [a.k1], aggs: [count] }
           └─StreamExchange { dist: HashShard(a.k1) }
             └─StreamTableScan { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), a.k1(hidden)], pk_columns: [ak1.a._row_id, a.k1, ak1.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: Inner, predicate: ak1.k1 = a.k1, output: [ak1.v, count, ak1.a._row_id, ak1.k1, a.k1] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamProject { exprs: [count, a.k1] }
-            StreamHashAgg { group_key: [a.k1], aggs: [count] }
-                result table: 4, state tables: [], distinct tables: []
-              StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [v, bv, ak1.a._row_id(hidden), ak1.k1(hidden), a.k1(hidden)], stream_key: [ak1.a._row_id, a.k1, ak1.k1], pk_columns: [ak1.a._row_id, a.k1, ak1.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: Inner, predicate: ak1.k1 = a.k1, output: [ak1.v, count, ak1.a._row_id, ak1.k1, a.k1] } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([0]) from 1
+        └── StreamProject { exprs: [count, a.k1] }
+            └── StreamHashAgg { group_key: [a.k1], aggs: [count] } { result table: 4, state tables: [], distinct tables: [] }
+                └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      Chain { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [ak1_k1, ak1_v, ak1_a__row_id], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [ak1_k1, ak1_a__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [count, a_k1], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 3 { columns: [a_k1, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [a_k1, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [v, bv, ak1.a._row_id, ak1.k1, a.k1], primary key: [$2 ASC, $4 ASC, $3 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [3], read pk prefix len hint: 3 }
+    Chain { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0 { columns: [ ak1_k1, ak1_v, ak1_a__row_id ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ ak1_k1, ak1_a__row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ count, a_k1 ], primary key: [ $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ a_k1, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ a_k1, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ v, bv, ak1.a._row_id, ak1.k1, a.k1 ], primary key: [ $2 ASC, $4 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 3 ], read pk prefix len hint: 3 }
+
 - id: aggk1_join_Ak1_onk1
   before:
   - create_tables
@@ -695,7 +905,7 @@
             └─BatchExchange { order: [], dist: HashShard(a.k1) }
               └─BatchScan { table: a, columns: [a.k1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v, bv, a.k1(hidden), ak1.a._row_id(hidden)], pk_columns: [a.k1, ak1.a._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v, bv, a.k1(hidden), ak1.a._row_id(hidden)], stream_key: [a.k1, ak1.a._row_id], pk_columns: [a.k1, ak1.a._row_id], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: a.k1 = ak1.k1, output: [ak1.v, count, a.k1, ak1.a._row_id] }
       ├─StreamProject { exprs: [count, a.k1] }
       | └─StreamHashAgg { group_key: [a.k1], aggs: [count] }
@@ -703,34 +913,47 @@
       |     └─StreamTableScan { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
       └─StreamExchange { dist: HashShard(ak1.k1) }
         └─StreamTableScan { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [v, bv, a.k1(hidden), ak1.a._row_id(hidden)], pk_columns: [a.k1, ak1.a._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: Inner, predicate: a.k1 = ak1.k1, output: [ak1.v, count, a.k1, ak1.a._row_id] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamProject { exprs: [count, a.k1] }
-            StreamHashAgg { group_key: [a.k1], aggs: [count] }
-                result table: 4, state tables: [], distinct tables: []
-              StreamExchange Hash([0]) from 1
-          StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [v, bv, a.k1(hidden), ak1.a._row_id(hidden)], stream_key: [a.k1, ak1.a._row_id], pk_columns: [a.k1, ak1.a._row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: Inner, predicate: a.k1 = ak1.k1, output: [ak1.v, count, a.k1, ak1.a._row_id] }
+        ├── left table: 0
+        ├── right table: 2
+        ├── left degree table: 1
+        ├── right degree table: 3
+        ├── StreamProject { exprs: [count, a.k1] }
+        │   └── StreamHashAgg { group_key: [a.k1], aggs: [count] } { result table: 4, state tables: [], distinct tables: [] }
+        │       └──  StreamExchange Hash([0]) from 1
+        └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      Chain { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [count, a_k1], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 1 { columns: [a_k1, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [ak1_k1, ak1_v, ak1_a__row_id], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [ak1_k1, ak1_a__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [a_k1, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [v, bv, a.k1, ak1.a._row_id], primary key: [$2 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [2], read pk prefix len hint: 2 }
+    Chain { table: ak1, columns: [ak1.k1, ak1.v, ak1.a._row_id], pk: [ak1.a._row_id], dist: UpstreamHashShard(ak1.k1) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0 { columns: [ count, a_k1 ], primary key: [ $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ a_k1, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ ak1_k1, ak1_v, ak1_a__row_id ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ ak1_k1, ak1_a__row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ a_k1, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ v, bv, a.k1, ak1.a._row_id ]
+    ├── primary key: [ $2 ASC, $3 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: [ 2 ]
+    └── read pk prefix len hint: 2
+
 - id: aggk1_join_aggk1_onk1
   before:
   - create_tables
@@ -759,7 +982,7 @@
           └─BatchExchange { order: [], dist: HashShard(b.k1) }
             └─BatchScan { table: b, columns: [b.k1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [num, bv, a.k1(hidden), b.k1(hidden)], pk_columns: [a.k1, b.k1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [num, bv, a.k1(hidden), b.k1(hidden)], stream_key: [a.k1, b.k1], pk_columns: [a.k1, b.k1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: a.k1 = b.k1, output: [count, count, a.k1, b.k1] }
       ├─StreamProject { exprs: [count, a.k1] }
       | └─StreamHashAgg { group_key: [a.k1], aggs: [count] }
@@ -769,38 +992,51 @@
         └─StreamHashAgg { group_key: [b.k1], aggs: [count] }
           └─StreamExchange { dist: HashShard(b.k1) }
             └─StreamTableScan { table: b, columns: [b.k1, b._row_id], pk: [b._row_id], dist: UpstreamHashShard(b._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [num, bv, a.k1(hidden), b.k1(hidden)], pk_columns: [a.k1, b.k1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: Inner, predicate: a.k1 = b.k1, output: [count, count, a.k1, b.k1] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamProject { exprs: [count, a.k1] }
-            StreamHashAgg { group_key: [a.k1], aggs: [count] }
-                result table: 4, state tables: [], distinct tables: []
-              StreamExchange Hash([0]) from 1
-          StreamProject { exprs: [count, b.k1] }
-            StreamHashAgg { group_key: [b.k1], aggs: [count] }
-                result table: 5, state tables: [], distinct tables: []
-              StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [num, bv, a.k1(hidden), b.k1(hidden)], stream_key: [a.k1, b.k1], pk_columns: [a.k1, b.k1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: Inner, predicate: a.k1 = b.k1, output: [count, count, a.k1, b.k1] }
+        ├── left table: 0
+        ├── right table: 2
+        ├── left degree table: 1
+        ├── right degree table: 3
+        ├── StreamProject { exprs: [count, a.k1] }
+        │   └── StreamHashAgg { group_key: [a.k1], aggs: [count] } { result table: 4, state tables: [], distinct tables: [] }
+        │       └──  StreamExchange Hash([0]) from 1
+        └── StreamProject { exprs: [count, b.k1] }
+            └── StreamHashAgg { group_key: [b.k1], aggs: [count] } { result table: 5, state tables: [], distinct tables: [] }
+                └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      Chain { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: a, columns: [a.k1, a._row_id], pk: [a._row_id], dist: UpstreamHashShard(a._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      Chain { table: b, columns: [b.k1, b._row_id], pk: [b._row_id], dist: UpstreamHashShard(b._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [count, a_k1], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 1 { columns: [a_k1, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [count, b_k1], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 3 { columns: [b_k1, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [a_k1, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [b_k1, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [num, bv, a.k1, b.k1], primary key: [$2 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [2], read pk prefix len hint: 2 }
+    Chain { table: b, columns: [b.k1, b._row_id], pk: [b._row_id], dist: UpstreamHashShard(b._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0 { columns: [ count, a_k1 ], primary key: [ $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ a_k1, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ count, b_k1 ], primary key: [ $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ b_k1, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ a_k1, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ b_k1, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ num, bv, a.k1, b.k1 ]
+    ├── primary key: [ $2 ASC, $3 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: [ 2 ]
+    └── read pk prefix len hint: 2
+
 - sql: |
     create table t1 (row_id int, uid int, v int, created_at timestamp);
     select * from hop(t1, created_at, interval '15' minute, interval '30' minute);
@@ -818,18 +1054,19 @@
       └─BatchFilter { predicate: IsNotNull(t1.created_at) }
         └─BatchScan { table: t1, columns: [t1.row_id, t1.uid, t1.v, t1.created_at], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [row_id, uid, v, created_at, window_start, window_end, t1._row_id(hidden)], pk_columns: [t1._row_id, window_start, window_end], pk_conflict: "no check" }
+    StreamMaterialize { columns: [row_id, uid, v, created_at, window_start, window_end, t1._row_id(hidden)], stream_key: [t1._row_id, window_start, window_end], pk_columns: [t1._row_id, window_start, window_end], pk_conflict: "NoCheck" }
     └─StreamHopWindow { time_col: t1.created_at, slide: 00:15:00, size: 00:30:00, output: [t1.row_id, t1.uid, t1.v, t1.created_at, window_start, window_end, t1._row_id] }
       └─StreamFilter { predicate: IsNotNull(t1.created_at) }
         └─StreamTableScan { table: t1, columns: [t1.row_id, t1.uid, t1.v, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [row_id, uid, v, created_at, window_start, window_end, t1._row_id(hidden)], pk_columns: [t1._row_id, window_start, window_end], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHopWindow { time_col: t1.created_at, slide: 00:15:00, size: 00:30:00, output: [t1.row_id, t1.uid, t1.v, t1.created_at, window_start, window_end, t1._row_id] }
-          StreamFilter { predicate: IsNotNull(t1.created_at) }
-            Chain { table: t1, columns: [t1.row_id, t1.uid, t1.v, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
-              Upstream
-              BatchPlanNode
-
-     Table 4294967294 { columns: [row_id, uid, v, created_at, window_start, window_end, t1._row_id], primary key: [$6 ASC, $4 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [6], read pk prefix len hint: 3 }
+    StreamMaterialize { columns: [row_id, uid, v, created_at, window_start, window_end, t1._row_id(hidden)], stream_key: [t1._row_id, window_start, window_end], pk_columns: [t1._row_id, window_start, window_end], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHopWindow { time_col: t1.created_at, slide: 00:15:00, size: 00:30:00, output: [t1.row_id, t1.uid, t1.v, t1.created_at, window_start, window_end, t1._row_id] }
+        └── StreamFilter { predicate: IsNotNull(t1.created_at) }
+            └── Chain { table: t1, columns: [t1.row_id, t1.uid, t1.v, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 4294967294 { columns: [ row_id, uid, v, created_at, window_start, window_end, t1._row_id ], primary key: [ $6 ASC, $4 ASC, $5 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 6 ], read pk prefix len hint: 3 }
+
diff --git a/src/frontend/planner_test/tests/testdata/dynamic_filter.yaml b/src/frontend/planner_test/tests/testdata/dynamic_filter.yaml
index 68ac98e70614d..95aa812f61423 100644
--- a/src/frontend/planner_test/tests/testdata/dynamic_filter.yaml
+++ b/src/frontend/planner_test/tests/testdata/dynamic_filter.yaml
@@ -14,7 +14,7 @@
     └─LogicalAgg { aggs: [max(t2.v2)] }
       └─LogicalScan { table: t2, columns: [t2.v2] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamDynamicFilter { predicate: (t1.v1 > max(max(t2.v2))), output: [t1.v1, t1._row_id] }
       ├─StreamTableScan { table: t1, columns: [t1.v1, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
       └─StreamExchange { dist: Broadcast }
@@ -56,7 +56,7 @@
     └─LogicalAgg { aggs: [max(t2.v2)] }
       └─LogicalScan { table: t2, columns: [t2.v2] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.v1, t1._row_id] }
       └─StreamDynamicFilter { predicate: ($expr1 > max(max(t2.v2))), output: [t1.v1, $expr1, t1._row_id] }
         ├─StreamProject { exprs: [t1.v1, (t1.v1 + t1.v1) as $expr1, t1._row_id] }
@@ -109,7 +109,7 @@
     └─LogicalAgg { aggs: [max(t2.v2)] }
       └─LogicalScan { table: t2, columns: [t2.v2] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, max, t1._row_id(hidden)], pk_columns: [t1._row_id, v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, max, t1._row_id(hidden)], stream_key: [t1._row_id, v1], pk_columns: [t1._row_id, v1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t1.v1 = max(max(t2.v2)), output: [t1.v1, max(max(t2.v2)), t1._row_id] }
       ├─StreamExchange { dist: HashShard(t1.v1) }
       | └─StreamTableScan { table: t1, columns: [t1.v1, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -132,7 +132,7 @@
     └─LogicalAgg { aggs: [max(t2.v2)] }
       └─LogicalScan { table: t2, columns: [t2.v2] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.v1, t1._row_id] }
       └─StreamDynamicFilter { predicate: ($expr1 > max(max(t2.v2))), output: [t1.v1, $expr1, t1._row_id] }
         ├─StreamProject { exprs: [t1.v1, t1.v1::Int64 as $expr1, t1._row_id] }
@@ -150,7 +150,7 @@
     create table t2 (v2 int);
     with max_v2 as (select max(v2) max from t2) select v1 from t1 where exists (select * from max_v2 where v1 > max);
   stream_plan: |
-    StreamMaterialize { columns: [v1, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamDynamicFilter { predicate: (t1.v1 > max(max(t2.v2))), output: [t1.v1, t1._row_id] }
       ├─StreamTableScan { table: t1, columns: [t1.v1, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
       └─StreamExchange { dist: Broadcast }
@@ -172,7 +172,7 @@
       └─LogicalAgg { aggs: [max(t2.v2)] }
         └─LogicalScan { table: t2, columns: [t2.v2] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamDynamicFilter { predicate: (t1.v1 > $expr2), output: [t1.v1, t1._row_id] }
       ├─StreamTableScan { table: t1, columns: [t1.v1, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
       └─StreamExchange { dist: Broadcast }
diff --git a/src/frontend/planner_test/tests/testdata/explain.yaml b/src/frontend/planner_test/tests/testdata/explain.yaml
index 881d01f1c6a0a..4758621a43dbc 100644
--- a/src/frontend/planner_test/tests/testdata/explain.yaml
+++ b/src/frontend/planner_test/tests/testdata/explain.yaml
@@ -58,7 +58,7 @@
       "stages": {
         "0": {
           "root": {
-            "plan_node_id": 10027,
+            "plan_node_id": 10028,
             "plan_node_type": "BatchValues",
             "schema": [
               {
@@ -164,7 +164,7 @@
 - sql: |
     explain create table t (v1 int, v2 varchar);
   explain_output: |
-    StreamMaterialize { columns: [v1, v2, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "overwrite" }
+    StreamMaterialize { columns: [v1, v2, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "Overwrite" }
     └─StreamExchange { dist: HashShard(_row_id) }
       └─StreamRowIdGen { row_id_index: 2 }
         └─StreamDml { columns: [v1, v2, _row_id] }
@@ -172,7 +172,7 @@
 - sql: |
     explain create table t (v1 int, v2 varchar) with ( connector = 'kafka', kafka.topic = 'kafka_3_partition_topic', kafka.brokers = '127.0.0.1:1234', kafka.scan.startup.mode='earliest'  ) row format json;
   explain_output: |
-    StreamMaterialize { columns: [v1, v2, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "overwrite" }
+    StreamMaterialize { columns: [v1, v2, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "Overwrite" }
     └─StreamExchange { dist: HashShard(_row_id) }
       └─StreamRowIdGen { row_id_index: 2 }
         └─StreamDml { columns: [v1, v2, _row_id] }
diff --git a/src/frontend/planner_test/tests/testdata/expr.yaml b/src/frontend/planner_test/tests/testdata/expr.yaml
index fc134d82d6eb0..e3d6ddc38b72b 100644
--- a/src/frontend/planner_test/tests/testdata/expr.yaml
+++ b/src/frontend/planner_test/tests/testdata/expr.yaml
@@ -165,9 +165,7 @@
 - sql: |
     select position(replace('1','1','2'),'123') where '12' like '%1';
   batch_plan: |
-    BatchProject { exprs: [0:Int32] }
-    └─BatchFilter { predicate: false:Boolean }
-      └─BatchValues { rows: [[]] }
+    BatchValues { rows: [] }
 - name: case searched form with else
   sql: |
     create table t (v1 int);
@@ -177,7 +175,7 @@
     └─BatchProject { exprs: [Case((t.v1 = 1:Int32), 1:Decimal, (t.v1 = 2:Int32), 2:Decimal, 0.0:Decimal) as $expr1] }
       └─BatchScan { table: t, columns: [t.v1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [expr, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [expr, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [Case((t.v1 = 1:Int32), 1:Decimal, (t.v1 = 2:Int32), 2:Decimal, 0.0:Decimal) as $expr1, t._row_id] }
       └─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - name: case searched form without else
@@ -216,7 +214,7 @@
     └─BatchProject { exprs: [Case((t.v1 = 1:Int32), null:Int32, t.v1) as $expr1] }
       └─BatchScan { table: t, columns: [t.v1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [expr, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [expr, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [Case((t.v1 = 1:Int32), null:Int32, t.v1) as $expr1, t._row_id] }
       └─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - sql: |
@@ -237,7 +235,7 @@
     └─BatchProject { exprs: [Coalesce(t.v1, 1:Int32) as $expr1] }
       └─BatchScan { table: t, columns: [t.v1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [expr, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [expr, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [Coalesce(t.v1, 1:Int32) as $expr1, t._row_id] }
       └─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - sql: |
@@ -263,7 +261,7 @@
     └─BatchProject { exprs: [ConcatWs(t.v1, '1':Varchar) as $expr1] }
       └─BatchScan { table: t, columns: [t.v1], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [expr, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [expr, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [ConcatWs(t.v1, '1':Varchar) as $expr1, t._row_id] }
       └─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - sql: |
@@ -289,7 +287,7 @@
     └─BatchProject { exprs: [ConcatWs('':Varchar, t.v1, t.v2::Varchar, t.v3::Varchar, '1':Varchar) as $expr1] }
       └─BatchScan { table: t, columns: [t.v1, t.v2, t.v3], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [expr, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [expr, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [ConcatWs('':Varchar, t.v1, t.v2::Varchar, t.v3::Varchar, '1':Varchar) as $expr1, t._row_id] }
       └─StreamTableScan { table: t, columns: [t.v1, t.v2, t.v3, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - sql: |
@@ -378,15 +376,11 @@
 - name: array/struct on left not supported yet 5808
   sql: |
     select array[1] < SOME(null);
-  binder_error: |-
-    Feature is not yet implemented: LessThan[List, unknown]
-    Tracking issue: https://github.com/risingwavelabs/risingwave/issues/112
+  binder_error: 'Bind error: array/struct on left are not supported yet'
 - name: array of array/struct on right not supported yet 5808
   sql: |
     select null < SOME(array[array[1]]);
-  binder_error: |-
-    Feature is not yet implemented: LessThan[unknown, List]
-    Tracking issue: https://github.com/risingwavelabs/risingwave/issues/112
+  binder_error: 'Bind error: array of array/struct on right are not supported yet'
 - sql: |
     select 1 < SOME(array[null]::integer[]);
   logical_plan: |
@@ -406,7 +400,7 @@
       └─LogicalProject { exprs: [Array(1:Int32) as $expr1] }
         └─LogicalValues { rows: [[]], schema: Schema { fields: [] } }
   batch_plan: |
-    BatchProject { exprs: [Some((1:Int32 < ArrayCat($expr10035, ARRAY[2]:List { datatype: Int32 }))) as $expr1] }
+    BatchProject { exprs: [Some((1:Int32 < ArrayCat($expr10037, ARRAY[2]:List { datatype: Int32 }))) as $expr1] }
     └─BatchNestedLoopJoin { type: LeftOuter, predicate: true, output: all }
       ├─BatchValues { rows: [[]] }
       └─BatchValues { rows: [[ARRAY[1]:List { datatype: Int32 }]] }
@@ -429,7 +423,7 @@
       └─LogicalProject { exprs: [Array(1:Int32) as $expr1] }
         └─LogicalValues { rows: [[]], schema: Schema { fields: [] } }
   batch_plan: |
-    BatchProject { exprs: [All((1:Int32 < ArrayCat($expr10035, ARRAY[2]:List { datatype: Int32 }))) as $expr1] }
+    BatchProject { exprs: [All((1:Int32 < ArrayCat($expr10037, ARRAY[2]:List { datatype: Int32 }))) as $expr1] }
     └─BatchNestedLoopJoin { type: LeftOuter, predicate: true, output: all }
       ├─BatchValues { rows: [[]] }
       └─BatchValues { rows: [[ARRAY[1]:List { datatype: Int32 }]] }
@@ -442,7 +436,7 @@
     └─LogicalFilter { predicate: (t.v1 >= Now) }
       └─LogicalScan { table: t, columns: [t.v1, t._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check", watermark_columns: [v1] }
+    StreamMaterialize { columns: [v1, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck", watermark_columns: [v1] }
     └─StreamDynamicFilter { predicate: (t.v1 >= now), output_watermarks: [t.v1], output: [t.v1, t._row_id] }
       ├─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
       └─StreamExchange { dist: Broadcast }
@@ -456,7 +450,7 @@
     └─LogicalFilter { predicate: (t.v1 >= (Now - '00:00:02':Interval)) }
       └─LogicalScan { table: t, columns: [t.v1, t._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check", watermark_columns: [v1] }
+    StreamMaterialize { columns: [v1, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck", watermark_columns: [v1] }
     └─StreamDynamicFilter { predicate: (t.v1 >= $expr1), output_watermarks: [t.v1], output: [t.v1, t._row_id] }
       ├─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
       └─StreamExchange { dist: Broadcast }
@@ -467,7 +461,7 @@
     create table t (v1 timestamp with time zone, v2 timestamp with time zone);
     select * from t where v1 >= now() and v2 >= now();
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check", watermark_columns: [v2] }
+    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck", watermark_columns: [v2] }
     └─StreamDynamicFilter { predicate: (t.v2 >= now), output_watermarks: [t.v2], output: [t.v1, t.v2, t._row_id] }
       ├─StreamDynamicFilter { predicate: (t.v1 >= now), output_watermarks: [t.v1], output: [t.v1, t.v2, t._row_id] }
       | ├─StreamTableScan { table: t, columns: [t.v1, t.v2, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
@@ -485,7 +479,7 @@
     create table t (v1 timestamp with time zone, v2 int);
     select max(v1) as max_time from t group by v2 having max(v1) >= now();
   stream_plan: |
-    StreamMaterialize { columns: [max_time, t.v2(hidden)], pk_columns: [t.v2], pk_conflict: "no check", watermark_columns: [max_time] }
+    StreamMaterialize { columns: [max_time, t.v2(hidden)], stream_key: [t.v2], pk_columns: [t.v2], pk_conflict: "NoCheck", watermark_columns: [max_time] }
     └─StreamDynamicFilter { predicate: (max(t.v1) >= now), output_watermarks: [max(t.v1)], output: [max(t.v1), t.v2] }
       ├─StreamProject { exprs: [max(t.v1), t.v2] }
       | └─StreamHashAgg { group_key: [t.v2], aggs: [max(t.v1), count] }
diff --git a/src/frontend/planner_test/tests/testdata/generated_columns.yaml b/src/frontend/planner_test/tests/testdata/generated_columns.yaml
new file mode 100644
index 0000000000000..32d37c68a407a
--- /dev/null
+++ b/src/frontend/planner_test/tests/testdata/generated_columns.yaml
@@ -0,0 +1,11 @@
+# This file is automatically generated. See `src/frontend/planner_test/README.md` for more information.
+- name: table with generated columns
+  sql: |
+    explain create table t1 (v1 int as v2-1, v2 int, v3 int as v2+1);
+  explain_output: |
+    StreamMaterialize { columns: [v1, v2, v3, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "Overwrite" }
+    └─StreamExchange { dist: HashShard(_row_id) }
+      └─StreamRowIdGen { row_id_index: 3 }
+        └─StreamProject { exprs: [(v2 - 1:Int32) as $expr1, v2, (v2 + 1:Int32) as $expr2, _row_id] }
+          └─StreamDml { columns: [v2, _row_id] }
+            └─StreamSource
diff --git a/src/frontend/planner_test/tests/testdata/index_selection.yaml b/src/frontend/planner_test/tests/testdata/index_selection.yaml
index a227d2992cd58..621cfe54e629e 100644
--- a/src/frontend/planner_test/tests/testdata/index_selection.yaml
+++ b/src/frontend/planner_test/tests/testdata/index_selection.yaml
@@ -613,7 +613,7 @@
     create table t1 (a int primary key);
     select * from t1 order by a limit 1;
   stream_plan: |
-    StreamMaterialize { columns: [a], pk_columns: [a], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a], stream_key: [a], pk_columns: [a], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.a] }
       └─StreamTopN { order: "[t1.a ASC]", limit: 1, offset: 0 }
         └─StreamExchange { dist: Single }
diff --git a/src/frontend/planner_test/tests/testdata/join.yaml b/src/frontend/planner_test/tests/testdata/join.yaml
index b5dd45773df6f..0e3110b1dc7eb 100644
--- a/src/frontend/planner_test/tests/testdata/join.yaml
+++ b/src/frontend/planner_test/tests/testdata/join.yaml
@@ -13,7 +13,7 @@
         | └─LogicalScan { table: t2, columns: [t2.v3, t2.v4, t2._row_id] }
         └─LogicalScan { table: t3, columns: [t3.v5, t3.v6, t3._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, v3, v4, v5, v6, t1._row_id(hidden), t2._row_id(hidden), t3._row_id(hidden)], pk_columns: [t1._row_id, t2._row_id, v1, t3._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, v3, v4, v5, v6, t1._row_id(hidden), t2._row_id(hidden), t3._row_id(hidden)], stream_key: [t1._row_id, t2._row_id, v1, t3._row_id], pk_columns: [t1._row_id, t2._row_id, v1, t3._row_id], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t1.v1 = t3.v5, output: [t1.v1, t1.v2, t2.v3, t2.v4, t3.v5, t3.v6, t1._row_id, t2._row_id, t3._row_id] }
       ├─StreamHashJoin { type: Inner, predicate: t1.v1 = t2.v3, output: [t1.v1, t1.v2, t2.v3, t2.v4, t1._row_id, t2._row_id] }
       | ├─StreamExchange { dist: HashShard(t1.v1) }
@@ -32,7 +32,7 @@
       ├─LogicalScan { table: t, columns: [t.v1, t.v2, t._row_id] }
       └─LogicalScan { table: t, columns: [t.v1, t.v2, t._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [t1v1, t2v1, t._row_id(hidden), t._row_id#1(hidden)], pk_columns: [t._row_id, t._row_id#1, t1v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [t1v1, t2v1, t._row_id(hidden), t._row_id#1(hidden)], stream_key: [t._row_id, t._row_id#1, t1v1], pk_columns: [t._row_id, t._row_id#1, t1v1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t.v1 = t.v1, output: [t.v1, t.v1, t._row_id, t._row_id] }
       ├─StreamExchange { dist: HashShard(t.v1) }
       | └─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
@@ -64,7 +64,7 @@
     └─BatchExchange { order: [], dist: Single }
       └─BatchScan { table: t3, columns: [t3.v1, t3.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [t1_v1, t1_v2, t2_v1, t2_v2, t3_v1, t3_v2, t1._row_id(hidden), t2._row_id(hidden), t3._row_id(hidden)], pk_columns: [t1._row_id, t2._row_id, t1_v1, t3._row_id, t2_v2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [t1_v1, t1_v2, t2_v1, t2_v2, t3_v1, t3_v2, t1._row_id(hidden), t2._row_id(hidden), t3._row_id(hidden)], stream_key: [t1._row_id, t2._row_id, t1_v1, t3._row_id, t2_v2], pk_columns: [t1._row_id, t2._row_id, t1_v1, t3._row_id, t2_v2], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t2.v2 = t3.v2, output: [t1.v1, t1.v2, t2.v1, t2.v2, t3.v1, t3.v2, t1._row_id, t2._row_id, t3._row_id] }
       ├─StreamExchange { dist: HashShard(t2.v2) }
       | └─StreamHashJoin { type: Inner, predicate: t1.v1 = t2.v1, output: [t1.v1, t1.v2, t2.v1, t2.v2, t1._row_id, t2._row_id] }
@@ -92,7 +92,7 @@
     └─BatchExchange { order: [], dist: Single }
       └─BatchScan { table: t2, columns: [t2.v1, t2.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [t1_v2, t2_v2, t1._row_id(hidden), t1.v1(hidden), t2._row_id(hidden)], pk_columns: [t1._row_id, t2._row_id, t1.v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [t1_v2, t2_v2, t1._row_id(hidden), t1.v1(hidden), t2._row_id(hidden)], stream_key: [t1._row_id, t2._row_id, t1.v1], pk_columns: [t1._row_id, t2._row_id, t1.v1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t1.v1 = t2.v1, output: [t1.v2, t2.v2, t1._row_id, t1.v1, t2._row_id] }
       ├─StreamExchange { dist: HashShard(t1.v1) }
       | └─StreamTableScan { table: t1, columns: [t1.v1, t1.v2, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -153,7 +153,7 @@
     └─BatchLookupJoin { type: Inner, predicate: i.x = i.x, output: all }
       └─BatchScan { table: i, columns: [i.x], distribution: UpstreamHashShard(i.x) }
   stream_plan: |
-    StreamMaterialize { columns: [ix, iix, i.t._row_id(hidden), i.t._row_id#1(hidden)], pk_columns: [i.t._row_id, i.t._row_id#1, ix], pk_conflict: "no check" }
+    StreamMaterialize { columns: [ix, iix, i.t._row_id(hidden), i.t._row_id#1(hidden)], stream_key: [i.t._row_id, i.t._row_id#1, ix], pk_columns: [i.t._row_id, i.t._row_id#1, ix], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: i.x = i.x, output: [i.x, i.x, i.t._row_id, i.t._row_id] }
       ├─StreamExchange { dist: HashShard(i.x) }
       | └─StreamTableScan { table: i, columns: [i.x, i.t._row_id], pk: [i.t._row_id], dist: UpstreamHashShard(i.x) }
@@ -169,7 +169,7 @@
     └─BatchLookupJoin { type: Inner, predicate: i.x = i.x, output: all }
       └─BatchScan { table: i, columns: [i.x], distribution: UpstreamHashShard(i.x) }
   stream_plan: |
-    StreamMaterialize { columns: [ix, tx, i.t._row_id(hidden), t._row_id(hidden)], pk_columns: [i.t._row_id, t._row_id, ix], pk_conflict: "no check" }
+    StreamMaterialize { columns: [ix, tx, i.t._row_id(hidden), t._row_id(hidden)], stream_key: [i.t._row_id, t._row_id, ix], pk_columns: [i.t._row_id, t._row_id, ix], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: i.x = t.x, output: [i.x, t.x, i.t._row_id, t._row_id] }
       ├─StreamExchange { dist: HashShard(i.x) }
       | └─StreamTableScan { table: i, columns: [i.x, i.t._row_id], pk: [i.t._row_id], dist: UpstreamHashShard(i.x) }
@@ -195,7 +195,7 @@
           └─BatchLookupJoin { type: Inner, predicate: i.x = i.x, output: [i.x] }
             └─BatchScan { table: i, columns: [i.x], distribution: UpstreamHashShard(i.x) }
   stream_plan: |
-    StreamMaterialize { columns: [x, i.t._row_id(hidden), i.t._row_id#1(hidden), i.x(hidden), i.t._row_id#2(hidden), i.t._row_id#3(hidden), i.x#1(hidden)], pk_columns: [i.t._row_id, i.t._row_id#1, i.x, i.t._row_id#2, i.t._row_id#3, i.x#1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [x, i.t._row_id(hidden), i.t._row_id#1(hidden), i.x(hidden), i.t._row_id#2(hidden), i.t._row_id#3(hidden), i.x#1(hidden)], stream_key: [i.t._row_id, i.t._row_id#1, i.x, i.t._row_id#2, i.t._row_id#3, i.x#1], pk_columns: [i.t._row_id, i.t._row_id#1, i.x, i.t._row_id#2, i.t._row_id#3, i.x#1], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(i.t._row_id, i.t._row_id, i.x, i.t._row_id, i.t._row_id, i.x) }
       └─StreamProject { exprs: [Coalesce(i.x, i.x) as $expr1, i.t._row_id, i.t._row_id, i.x, i.t._row_id, i.t._row_id, i.x] }
         └─StreamFilter { predicate: (((((IsNotNull(i.t._row_id) OR IsNotNull(i.t._row_id)) OR IsNotNull(i.x)) OR IsNotNull(i.t._row_id)) OR IsNotNull(i.t._row_id)) OR IsNotNull(i.x)) }
@@ -502,7 +502,7 @@
               └─BatchExchange { order: [], dist: HashShard(b.x) }
                 └─BatchScan { table: b, columns: [b.x], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [y, z, $expr3(hidden), a._row_id(hidden), b._row_id(hidden), a.x(hidden), b.x(hidden)], pk_columns: [a._row_id, b._row_id, a.x, b.x], order_descs: [$expr3, a._row_id, b._row_id, a.x, b.x], pk_conflict: "no check" }
+    StreamMaterialize { columns: [y, z, $expr3(hidden), a._row_id(hidden), b._row_id(hidden), a.x(hidden), b.x(hidden)], stream_key: [a._row_id, b._row_id, a.x, b.x], pk_columns: [$expr3, a._row_id, b._row_id, a.x, b.x], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(a._row_id, b._row_id, a.x, b.x) }
       └─StreamProject { exprs: [(2:Int32 * Coalesce(a.x, b.x)) as $expr1, (Coalesce(a.x, b.x) + Coalesce(a.x, b.x)) as $expr2, (Coalesce(a.x, b.x) + Coalesce(a.x, b.x)) as $expr3, a._row_id, b._row_id, a.x, b.x] }
         └─StreamFilter { predicate: ((2:Int32 * Coalesce(a.x, b.x)) < 10:Int32) }
@@ -604,7 +604,7 @@
       └─BatchExchange { order: [], dist: HashShard(t2.v2) }
         └─BatchScan { table: t2, columns: [t2.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, t1._row_id(hidden), $expr1(hidden), t2._row_id(hidden)], pk_columns: [t1._row_id, t2._row_id, $expr1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, t1._row_id(hidden), $expr1(hidden), t2._row_id(hidden)], stream_key: [t1._row_id, t2._row_id, $expr1], pk_columns: [t1._row_id, t2._row_id, $expr1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: $expr1 IS NOT DISTINCT FROM t2.v2, output: [t1.v1, t2.v2, t1._row_id, $expr1, t2._row_id] }
       ├─StreamExchange { dist: HashShard($expr1) }
       | └─StreamProject { exprs: [t1.v1, t1.v1::Int64 as $expr1, t1._row_id] }
@@ -616,7 +616,7 @@
     create table t(x int);
     SELECT t.x x1, t.x x2 FROM t join t tt ON t.x=tt.x;
   stream_plan: |
-    StreamMaterialize { columns: [x1, x2, t._row_id(hidden), t._row_id#1(hidden)], pk_columns: [t._row_id, t._row_id#1, x2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [x1, x2, t._row_id(hidden), t._row_id#1(hidden)], stream_key: [t._row_id, t._row_id#1, x2], pk_columns: [t._row_id, t._row_id#1, x2], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.x, t.x, t._row_id, t._row_id] }
       └─StreamHashJoin { type: Inner, predicate: t.x = t.x, output: [t.x, t._row_id, t._row_id] }
         ├─StreamExchange { dist: HashShard(t.x) }
@@ -628,7 +628,7 @@
     create table t (src int, dst int);
     select t1.src p1, t1.dst p2, t2.dst p3 from t t1, t t2, t t3 where t1.dst = t2.src and t2.src = t3.dst and t3.dst = t1.src;
   stream_plan: |
-    StreamMaterialize { columns: [p1, p2, p3, t._row_id(hidden), t._row_id#1(hidden), t.src(hidden), t._row_id#2(hidden)], pk_columns: [t._row_id, t._row_id#1, p2, t._row_id#2, t.src, p1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [p1, p2, p3, t._row_id(hidden), t._row_id#1(hidden), t.src(hidden), t._row_id#2(hidden)], stream_key: [t._row_id, t._row_id#1, p2, t._row_id#2, t.src, p1], pk_columns: [t._row_id, t._row_id#1, p2, t._row_id#2, t.src, p1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t.src = t.dst AND t.src = t.dst, output: [t.src, t.dst, t.dst, t._row_id, t._row_id, t.src, t._row_id] }
       ├─StreamExchange { dist: HashShard(t.src) }
       | └─StreamHashJoin { type: Inner, predicate: t.dst = t.src, output: [t.src, t.dst, t.src, t.dst, t._row_id, t._row_id] }
@@ -638,66 +638,49 @@
       |     └─StreamTableScan { table: t, columns: [t.src, t.dst, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
       └─StreamExchange { dist: HashShard(t.dst) }
         └─StreamTableScan { table: t, columns: [t.dst, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [p1, p2, p3, t._row_id(hidden), t._row_id#1(hidden), t.src(hidden), t._row_id#2(hidden)], pk_columns: [t._row_id, t._row_id#1, p2, t._row_id#2, t.src, p1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: Inner, predicate: t.src = t.dst AND t.src = t.dst, output: [t.src, t.dst, t.dst, t._row_id, t._row_id, t.src, t._row_id] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamExchange Hash([0]) from 4
+    StreamMaterialize { columns: [p1, p2, p3, t._row_id(hidden), t._row_id#1(hidden), t.src(hidden), t._row_id#2(hidden)], stream_key: [t._row_id, t._row_id#1, p2, t._row_id#2, t.src, p1], pk_columns: [t._row_id, t._row_id#1, p2, t._row_id#2, t.src, p1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: Inner, predicate: t.src = t.dst AND t.src = t.dst, output: [t.src, t.dst, t.dst, t._row_id, t._row_id, t.src, t._row_id] } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([0]) from 1
+        └──  StreamExchange Hash([0]) from 4
 
     Fragment 1
-      StreamHashJoin { type: Inner, predicate: t.dst = t.src, output: [t.src, t.dst, t.src, t.dst, t._row_id, t._row_id] }
-          left table: 4, right table 6, left degree table: 5, right degree table: 7,
-        StreamExchange Hash([1]) from 2
-        StreamExchange Hash([0]) from 3
+    StreamHashJoin { type: Inner, predicate: t.dst = t.src, output: [t.src, t.dst, t.src, t.dst, t._row_id, t._row_id] } { left table: 4, right table: 6, left degree table: 5, right degree table: 7 }
+    ├──  StreamExchange Hash([1]) from 2
+    └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      Chain { table: t, columns: [t.src, t.dst, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: t, columns: [t.src, t.dst, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      Chain { table: t, columns: [t.src, t.dst, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: t, columns: [t.src, t.dst, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 4
-      Chain { table: t, columns: [t.dst, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: t, columns: [t.dst, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0 { columns: [ t_src, t_dst, t_src_0, t_dst_0, t__row_id, t__row_id_0 ], primary key: [ $2 ASC, $0 ASC, $4 ASC, $5 ASC, $1 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 1 { columns: [ t_src, t_src_0, t__row_id, t__row_id_0, t_dst, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC ], value indices: [ 5 ], distribution key: [ 1 ], read pk prefix len hint: 2 }
+
+    Table 2 { columns: [ t_dst, t__row_id ], primary key: [ $0 ASC, $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 3 { columns: [ t_dst, t_dst_0, t__row_id, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 1 ], read pk prefix len hint: 2 }
+
+    Table 4 { columns: [ t_src, t_dst, t__row_id ], primary key: [ $1 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ t_dst, t__row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ t_src, t_dst, t__row_id ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ t_src, t__row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ p1, p2, p3, t._row_id, t._row_id#1, t.src, t._row_id#2 ], primary key: [ $3 ASC, $4 ASC, $1 ASC, $6 ASC, $5 ASC, $0 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 0 ], read pk prefix len hint: 6 }
 
-     Table 0 { columns: [t_src, t_dst, t_src_0, t_dst_0, t__row_id, t__row_id_0], primary key: [$2 ASC, $0 ASC, $4 ASC, $5 ASC, $1 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [0], read pk prefix len hint: 2 }
-     Table 1 { columns: [t_src, t_src_0, t__row_id, t__row_id_0, t_dst, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC], value indices: [5], distribution key: [1], read pk prefix len hint: 2 }
-     Table 2 { columns: [t_dst, t__row_id], primary key: [$0 ASC, $0 ASC, $1 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 2 }
-     Table 3 { columns: [t_dst, t_dst_0, t__row_id, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [1], read pk prefix len hint: 2 }
-     Table 4 { columns: [t_src, t_dst, t__row_id], primary key: [$1 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [1], read pk prefix len hint: 1 }
-     Table 5 { columns: [t_dst, t__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [t_src, t_dst, t__row_id], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [t_src, t__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [p1, p2, p3, t._row_id, t._row_id#1, t.src, t._row_id#2], primary key: [$3 ASC, $4 ASC, $1 ASC, $6 ASC, $5 ASC, $0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [0], read pk prefix len hint: 6 }
-- name: Fix hash join distribution key (https://github.com/risingwavelabs/risingwave/issues/8537)
-  sql: |
-    CREATE TABLE part (
-      p INTEGER,
-      c VARCHAR,
-      PRIMARY KEY (p)
-    );
-    CREATE TABLE B (
-      b INTEGER,
-      d VARCHAR,
-      PRIMARY KEY (b)
-    );
-    select B.* from part join B on part.c = B.d join part p1 on p1.p = part.p and p1.p = B.b;
-  stream_plan: |
-    StreamMaterialize { columns: [b, d, part.p(hidden), part.c(hidden), part.p#1(hidden)], pk_columns: [part.p, b, part.c, part.p#1], pk_conflict: "no check" }
-    └─StreamHashJoin { type: Inner, predicate: part.p = part.p AND b.b = part.p, output: [b.b, b.d, part.p, part.c, part.p] }
-      ├─StreamExchange { dist: HashShard(part.p, b.b) }
-      | └─StreamHashJoin { type: Inner, predicate: part.c = b.d, output: [part.p, b.b, b.d, part.c] }
-      |   ├─StreamExchange { dist: HashShard(part.c) }
-      |   | └─StreamTableScan { table: part, columns: [part.p, part.c], pk: [part.p], dist: UpstreamHashShard(part.p) }
-      |   └─StreamExchange { dist: HashShard(b.d) }
-      |     └─StreamTableScan { table: b, columns: [b.b, b.d], pk: [b.b], dist: UpstreamHashShard(b.b) }
-      └─StreamExchange { dist: HashShard(part.p, part.p) }
-        └─StreamTableScan { table: part, columns: [part.p], pk: [part.p], dist: UpstreamHashShard(part.p) }
diff --git a/src/frontend/planner_test/tests/testdata/mv_column_name.yaml b/src/frontend/planner_test/tests/testdata/mv_column_name.yaml
index 45be21ecfec04..2c297f55c65ed 100644
--- a/src/frontend/planner_test/tests/testdata/mv_column_name.yaml
+++ b/src/frontend/planner_test/tests/testdata/mv_column_name.yaml
@@ -14,7 +14,7 @@
     create table t (a int);
     select a is null as is_null from t;
   stream_plan: |
-    StreamMaterialize { columns: [is_null, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [is_null, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [IsNull(t.a) as $expr1, t._row_id] }
       └─StreamTableScan { table: t, columns: [t.a, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - name: is_true with alias
@@ -22,7 +22,7 @@
     create table t (a bool);
     select a, a is true as is_true from t;
   stream_plan: |
-    StreamMaterialize { columns: [a, is_true, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, is_true, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.a, IsTrue(t.a) as $expr1, t._row_id] }
       └─StreamTableScan { table: t, columns: [t.a, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - name: column name specified more than once
@@ -53,7 +53,7 @@
     create table t (a int);
     select count(*), max(a) from t;
   stream_plan: |
-    StreamMaterialize { columns: [count, max], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [count, max], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum0(count), max(max(t.a))] }
       └─StreamGlobalSimpleAgg { aggs: [sum0(count), max(max(t.a)), count] }
         └─StreamExchange { dist: Single }
diff --git a/src/frontend/planner_test/tests/testdata/mv_on_mv.yaml b/src/frontend/planner_test/tests/testdata/mv_on_mv.yaml
index 12476e93eaacd..aa6c377348bc0 100644
--- a/src/frontend/planner_test/tests/testdata/mv_on_mv.yaml
+++ b/src/frontend/planner_test/tests/testdata/mv_on_mv.yaml
@@ -11,7 +11,7 @@
   sql: |
     select m1.v1 as m1v1, m1.v2 as m1v2, m2.v1 as m2v1, m2.v2 as m2v2 from m1 join m2 on m1.v1 = m2.v1;
   stream_plan: |
-    StreamMaterialize { columns: [m1v1, m1v2, m2v1, m2v2, m1.t1._row_id(hidden), m2.t1._row_id(hidden)], pk_columns: [m1.t1._row_id, m2.t1._row_id, m1v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [m1v1, m1v2, m2v1, m2v2, m1.t1._row_id(hidden), m2.t1._row_id(hidden)], stream_key: [m1.t1._row_id, m2.t1._row_id, m1v1], pk_columns: [m1.t1._row_id, m2.t1._row_id, m1v1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: m1.v1 = m2.v1, output: [m1.v1, m1.v2, m2.v1, m2.v2, m1.t1._row_id, m2.t1._row_id] }
       ├─StreamExchange { dist: HashShard(m1.v1) }
       | └─StreamTableScan { table: m1, columns: [m1.v1, m1.v2, m1.t1._row_id], pk: [m1.t1._row_id], dist: UpstreamHashShard(m1.t1._row_id) }
diff --git a/src/frontend/planner_test/tests/testdata/nexmark.yaml b/src/frontend/planner_test/tests/testdata/nexmark.yaml
index 6c3ba568f537a..a3040c5ee4d68 100644
--- a/src/frontend/planner_test/tests/testdata/nexmark.yaml
+++ b/src/frontend/planner_test/tests/testdata/nexmark.yaml
@@ -42,18 +42,29 @@
   batch_plan: |
     BatchExchange { order: [], dist: Single }
     └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time], distribution: SomeShard }
+  sink_plan: |
+    StreamSink { type: append-only, columns: [auction, bidder, price, date_time] }
+    └─StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.date_time] }
+      └─StreamExchange { dist: Single }
+        └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, date_time, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, bidder, price, date_time, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
     └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, date_time, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamMaterialize { columns: [auction, bidder, price, date_time, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, date_time, bid._row_id ]
+    ├── primary key: [ $4 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4 ]
+    ├── distribution key: [ 4 ]
+    └── read pk prefix len hint: 1
 
-     Table 4294967294 { columns: [auction, bidder, price, date_time, bid._row_id], primary key: [$4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [4], read pk prefix len hint: 1 }
 - id: nexmark_q1
   before:
   - create_tables
@@ -68,20 +79,32 @@
     BatchExchange { order: [], dist: Single }
     └─BatchProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, bid.date_time] }
       └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time], distribution: SomeShard }
+  sink_plan: |
+    StreamSink { type: append-only, columns: [auction, bidder, price, date_time] }
+    └─StreamProject { exprs: [bid.auction, bid.bidder, $expr1, bid.date_time] }
+      └─StreamExchange { dist: Single }
+        └─StreamProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, bid.date_time, bid._row_id] }
+          └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, date_time, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, bidder, price, date_time, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, bid.date_time, bid._row_id] }
       └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, date_time, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, bid.date_time, bid._row_id] }
-          Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-            Upstream
-            BatchPlanNode
-
-     Table 4294967294 { columns: [auction, bidder, price, date_time, bid._row_id], primary key: [$4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [4], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [auction, bidder, price, date_time, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, bid.date_time, bid._row_id] }
+        └── Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, date_time, bid._row_id ]
+    ├── primary key: [ $4 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4 ]
+    ├── distribution key: [ 4 ]
+    └── read pk prefix len hint: 1
+
 - id: nexmark_q2
   before:
   - create_tables
@@ -90,20 +113,26 @@
     BatchExchange { order: [], dist: Single }
     └─BatchFilter { predicate: (((((bid.auction = 1007:Int32) OR (bid.auction = 1020:Int32)) OR (bid.auction = 2001:Int32)) OR (bid.auction = 2019:Int32)) OR (bid.auction = 2087:Int32)) }
       └─BatchScan { table: bid, columns: [bid.auction, bid.price], distribution: SomeShard }
+  sink_plan: |
+    StreamSink { type: append-only, columns: [auction, price] }
+    └─StreamProject { exprs: [bid.auction, bid.price] }
+      └─StreamExchange { dist: Single }
+        └─StreamFilter { predicate: (((((bid.auction = 1007:Int32) OR (bid.auction = 1020:Int32)) OR (bid.auction = 2001:Int32)) OR (bid.auction = 2019:Int32)) OR (bid.auction = 2087:Int32)) }
+          └─StreamTableScan { table: bid, columns: [bid.auction, bid.price, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, price, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, price, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
     └─StreamFilter { predicate: (((((bid.auction = 1007:Int32) OR (bid.auction = 1020:Int32)) OR (bid.auction = 2001:Int32)) OR (bid.auction = 2019:Int32)) OR (bid.auction = 2087:Int32)) }
       └─StreamTableScan { table: bid, columns: [bid.auction, bid.price, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, price, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamFilter { predicate: (((((bid.auction = 1007:Int32) OR (bid.auction = 1020:Int32)) OR (bid.auction = 2001:Int32)) OR (bid.auction = 2019:Int32)) OR (bid.auction = 2087:Int32)) }
-          Chain { table: bid, columns: [bid.auction, bid.price, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-            Upstream
-            BatchPlanNode
-
-     Table 4294967294 { columns: [auction, price, bid._row_id], primary key: [$2 ASC], value indices: [0, 1, 2], distribution key: [2], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [auction, price, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamFilter { predicate: (((((bid.auction = 1007:Int32) OR (bid.auction = 1020:Int32)) OR (bid.auction = 2001:Int32)) OR (bid.auction = 2019:Int32)) OR (bid.auction = 2087:Int32)) }
+        └── Chain { table: bid, columns: [bid.auction, bid.price, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 4294967294 { columns: [ auction, price, bid._row_id ], primary key: [ $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
 - id: nexmark_q3
   before:
   - create_tables
@@ -122,7 +151,7 @@
           └─BatchFilter { predicate: (auction.category = 10:Int32) }
             └─BatchScan { table: auction, columns: [auction.id, auction.seller, auction.category], distribution: UpstreamHashShard(auction.id) }
   stream_plan: |
-    StreamMaterialize { columns: [name, city, state, id, auction.seller(hidden), person.id(hidden)], pk_columns: [id, person.id, auction.seller], pk_conflict: "no check" }
+    StreamMaterialize { columns: [name, city, state, id, auction.seller(hidden), person.id(hidden)], stream_key: [id, person.id, auction.seller], pk_columns: [id, person.id, auction.seller], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: auction.seller = person.id, output: [person.name, person.city, person.state, auction.id, auction.seller, person.id] }
       ├─StreamExchange { dist: HashShard(auction.seller) }
       | └─StreamProject { exprs: [auction.id, auction.seller] }
@@ -131,33 +160,46 @@
       └─StreamExchange { dist: HashShard(person.id) }
         └─StreamFilter { predicate: (((person.state = 'or':Varchar) OR (person.state = 'id':Varchar)) OR (person.state = 'ca':Varchar)) }
           └─StreamTableScan { table: person, columns: [person.id, person.name, person.city, person.state], pk: [person.id], dist: UpstreamHashShard(person.id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [name, city, state, id, auction.seller(hidden), person.id(hidden)], pk_columns: [id, person.id, auction.seller], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: Inner, predicate: auction.seller = person.id, output: [person.name, person.city, person.state, auction.id, auction.seller, person.id] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([1]) from 1
-          StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [name, city, state, id, auction.seller(hidden), person.id(hidden)], stream_key: [id, person.id, auction.seller], pk_columns: [id, person.id, auction.seller], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: Inner, predicate: auction.seller = person.id, output: [person.name, person.city, person.state, auction.id, auction.seller, person.id] }
+        ├── left table: 0
+        ├── right table: 2
+        ├── left degree table: 1
+        ├── right degree table: 3
+        ├──  StreamExchange Hash([1]) from 1
+        └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      StreamProject { exprs: [auction.id, auction.seller] }
-        StreamFilter { predicate: (auction.category = 10:Int32) }
-          Chain { table: auction, columns: [auction.id, auction.seller, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [auction.id, auction.seller] }
+    └── StreamFilter { predicate: (auction.category = 10:Int32) }
+        └── Chain { table: auction, columns: [auction.id, auction.seller, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 2
-      StreamFilter { predicate: (((person.state = 'or':Varchar) OR (person.state = 'id':Varchar)) OR (person.state = 'ca':Varchar)) }
-        Chain { table: person, columns: [person.id, person.name, person.city, person.state], pk: [person.id], dist: UpstreamHashShard(person.id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [auction_id, auction_seller], primary key: [$1 ASC, $0 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 1 { columns: [auction_seller, auction_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [person_id, person_name, person_city, person_state], primary key: [$0 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [person_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [name, city, state, id, auction.seller, person.id], primary key: [$3 ASC, $5 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [4], read pk prefix len hint: 3 }
+    StreamFilter { predicate: (((person.state = 'or':Varchar) OR (person.state = 'id':Varchar)) OR (person.state = 'ca':Varchar)) }
+    └── Chain { table: person, columns: [person.id, person.name, person.city, person.state], pk: [person.id], dist: UpstreamHashShard(person.id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0 { columns: [ auction_id, auction_seller ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ auction_seller, auction_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ person_id, person_name, person_city, person_state ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ person_id, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ name, city, state, id, auction.seller, person.id ]
+    ├── primary key: [ $3 ASC, $5 ASC, $4 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5 ]
+    ├── distribution key: [ 4 ]
+    └── read pk prefix len hint: 3
+
 - id: nexmark_q4
   before:
   - create_tables
@@ -184,7 +226,7 @@
               └─BatchExchange { order: [], dist: HashShard(bid.auction) }
                 └─BatchScan { table: bid, columns: [bid.auction, bid.price, bid.date_time], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [category, avg], pk_columns: [category], pk_conflict: "no check" }
+    StreamMaterialize { columns: [category, avg], stream_key: [category], pk_columns: [category], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [auction.category, (sum(max(bid.price)) / count(max(bid.price))) as $expr1] }
       └─StreamHashAgg { group_key: [auction.category], aggs: [sum(max(bid.price)), count(max(bid.price)), count] }
         └─StreamExchange { dist: HashShard(auction.category) }
@@ -197,44 +239,89 @@
                     | └─StreamTableScan { table: auction, columns: [auction.id, auction.date_time, auction.expires, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
                     └─StreamExchange { dist: HashShard(bid.auction) }
                       └─StreamTableScan { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [category, avg], pk_columns: [category], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [auction.category, (sum(max(bid.price)) / count(max(bid.price))) as $expr1] }
-          StreamHashAgg { group_key: [auction.category], aggs: [sum(max(bid.price)), count(max(bid.price)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([1]) from 1
+    StreamMaterialize { columns: [category, avg], stream_key: [category], pk_columns: [category], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [auction.category, (sum(max(bid.price)) / count(max(bid.price))) as $expr1] }
+        └── StreamHashAgg { group_key: [auction.category], aggs: [sum(max(bid.price)), count(max(bid.price)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([1]) from 1
 
     Fragment 1
-      StreamProject { exprs: [auction.id, auction.category, max(bid.price)] }
-        StreamHashAgg { group_key: [auction.id, auction.category], aggs: [max(bid.price), count] }
-            result table: 2, state tables: [1], distinct tables: []
-          StreamProject { exprs: [auction.id, auction.category, bid.price, bid._row_id] }
-            StreamFilter { predicate: (bid.date_time >= auction.date_time) AND (bid.date_time <= auction.expires) }
-              StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
-                  left table: 3, right table 5, left degree table: 4, right degree table: 6,
-                StreamExchange Hash([0]) from 2
-                StreamExchange Hash([0]) from 3
+    StreamProject { exprs: [auction.id, auction.category, max(bid.price)] }
+    └── StreamHashAgg { group_key: [auction.id, auction.category], aggs: [max(bid.price), count] }
+        ├── result table: 2
+        ├── state tables: [ 1 ]
+        ├── distinct tables: []
+        └── StreamProject { exprs: [auction.id, auction.category, bid.price, bid._row_id] }
+            └── StreamFilter { predicate: (bid.date_time >= auction.date_time) AND (bid.date_time <= auction.expires) }
+                └── StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
+                    ├── left table: 3
+                    ├── right table: 5
+                    ├── left degree table: 4
+                    ├── right degree table: 6
+                    ├──  StreamExchange Hash([0]) from 2
+                    └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      Chain { table: auction, columns: [auction.id, auction.date_time, auction.expires, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: auction, columns: [auction.id, auction.date_time, auction.expires, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      Chain { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [auction_category, sum(max(bid_price)), count(max(bid_price)), count], primary key: [$0 ASC], value indices: [1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [auction_id, auction_category, bid_price, bid__row_id], primary key: [$0 ASC, $1 ASC, $2 DESC, $3 ASC], value indices: [0, 2, 3], distribution key: [0], read pk prefix len hint: 2 }
-     Table 2 { columns: [auction_id, auction_category, max(bid_price), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0], read pk prefix len hint: 2 }
-     Table 3 { columns: [auction_id, auction_date_time, auction_expires, auction_category], primary key: [$0 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [auction_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [bid_auction, bid_price, bid_date_time, bid__row_id], primary key: [$0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [bid_auction, bid__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [category, avg], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
+    Chain { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ auction_category, sum(max(bid_price)), count(max(bid_price)), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ auction_id, auction_category, bid_price, bid__row_id ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 DESC, $3 ASC ]
+    ├── value indices: [ 0, 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
+    Table 2
+    ├── columns: [ auction_id, auction_category, max(bid_price), count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
+    Table 3
+    ├── columns: [ auction_id, auction_date_time, auction_expires, auction_category ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4 { columns: [ auction_id, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5
+    ├── columns: [ bid_auction, bid_price, bid_date_time, bid__row_id ]
+    ├── primary key: [ $0 ASC, $3 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 6
+    ├── columns: [ bid_auction, bid__row_id, _degree ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294 { columns: [ category, avg ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: nexmark_q5
   before:
   - create_tables
@@ -286,7 +373,7 @@
                   └─BatchFilter { predicate: IsNotNull(bid.date_time) }
                     └─BatchScan { table: bid, columns: [bid.auction, bid.date_time], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], pk_columns: [auction, window_start, window_start#1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], stream_key: [auction, window_start, window_start#1], pk_columns: [auction, window_start, window_start#1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [bid.auction, count, window_start, window_start] }
       └─StreamFilter { predicate: (count >= max(count)) }
         └─StreamHashJoin { type: Inner, predicate: window_start = window_start, output: all }
@@ -308,48 +395,53 @@
                         └─StreamHopWindow { time_col: bid.date_time, slide: 00:00:02, size: 00:00:10, output: [bid.auction, window_start, bid._row_id] }
                           └─StreamFilter { predicate: IsNotNull(bid.date_time) }
                             └─StreamTableScan { table: bid, columns: [bid.auction, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], pk_columns: [auction, window_start, window_start#1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [bid.auction, count, window_start, window_start] }
-          StreamFilter { predicate: (count >= max(count)) }
-            StreamHashJoin { type: Inner, predicate: window_start = window_start, output: all }
-                left table: 0, right table 2, left degree table: 1, right degree table: 3,
-              StreamExchange Hash([2]) from 1
-              StreamProject { exprs: [max(count), window_start] }
-                StreamHashAgg { group_key: [window_start], aggs: [max(count), count] }
-                    result table: 6, state tables: [5], distinct tables: []
-                  StreamExchange Hash([1]) from 4
+    StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], stream_key: [auction, window_start, window_start#1], pk_columns: [auction, window_start, window_start#1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [bid.auction, count, window_start, window_start] }
+        └── StreamFilter { predicate: (count >= max(count)) }
+            └── StreamHashJoin { type: Inner, predicate: window_start = window_start, output: all } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+                ├──  StreamExchange Hash([2]) from 1
+                └── StreamProject { exprs: [max(count), window_start] }
+                    └── StreamHashAgg { group_key: [window_start], aggs: [max(count), count] } { result table: 6, state tables: [ 5 ], distinct tables: [] }
+                        └──  StreamExchange Hash([1]) from 4
 
     Fragment 1
-      StreamProject { exprs: [bid.auction, count, window_start] }
-        StreamExchange Hash([0, 1]) from 2
+    StreamProject { exprs: [bid.auction, count, window_start] }
+    └──  StreamExchange Hash([0, 1]) from 2
 
     Fragment 2
-      StreamAppendOnlyHashAgg { group_key: [bid.auction, window_start], aggs: [count] }
-          result table: 4, state tables: [], distinct tables: []
-        StreamExchange Hash([0, 1]) from 3
+    StreamAppendOnlyHashAgg { group_key: [bid.auction, window_start], aggs: [count] } { result table: 4, state tables: [], distinct tables: [] }
+    └──  StreamExchange Hash([0, 1]) from 3
 
     Fragment 3
-      StreamHopWindow { time_col: bid.date_time, slide: 00:00:02, size: 00:00:10, output: [bid.auction, window_start, bid._row_id] }
-        StreamFilter { predicate: IsNotNull(bid.date_time) }
-          Chain { table: bid, columns: [bid.auction, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-            Upstream
-            BatchPlanNode
+    StreamHopWindow { time_col: bid.date_time, slide: 00:00:02, size: 00:00:10, output: [bid.auction, window_start, bid._row_id] }
+    └── StreamFilter { predicate: IsNotNull(bid.date_time) }
+        └── Chain { table: bid, columns: [bid.auction, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 4
-      StreamProject { exprs: [bid.auction, window_start, count] }
-        StreamExchange Hash([0, 1]) from 2
-
-     Table 0 { columns: [bid_auction, count, window_start], primary key: [$2 ASC, $0 ASC], value indices: [0, 1, 2], distribution key: [2], read pk prefix len hint: 1 }
-     Table 1 { columns: [window_start, bid_auction, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [max(count), window_start], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 3 { columns: [window_start, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [bid_auction, window_start, count], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 5 { columns: [window_start, count, bid_auction], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [window_start, max(count), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, num, window_start, window_start#1], primary key: [$0 ASC, $2 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [2], read pk prefix len hint: 3 }
+    StreamProject { exprs: [bid.auction, window_start, count] }
+    └──  StreamExchange Hash([0, 1]) from 2
+
+    Table 0 { columns: [ bid_auction, count, window_start ], primary key: [ $2 ASC, $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ window_start, bid_auction, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ max(count), window_start ], primary key: [ $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ window_start, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ bid_auction, window_start, count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 5 { columns: [ window_start, count, bid_auction ], primary key: [ $0 ASC, $1 DESC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ window_start, max(count), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ auction, num, window_start, window_start#1 ], primary key: [ $0 ASC, $2 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 2 ], read pk prefix len hint: 3 }
+
 - id: nexmark_q6
   before:
   - create_tables
@@ -403,7 +495,7 @@
               └─BatchProject { exprs: [(TumbleStart(bid.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr1, bid.price] }
                 └─BatchScan { table: bid, columns: [bid.price, bid.date_time], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [auction, price, bidder, date_time, bid._row_id(hidden), $expr1(hidden)], pk_columns: [bid._row_id, $expr1, price], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, price, bidder, date_time, bid._row_id(hidden), $expr1(hidden)], stream_key: [bid._row_id, $expr1, price], pk_columns: [bid._row_id, $expr1, price], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [bid.auction, bid.price, bid.bidder, bid.date_time, bid._row_id, $expr1] }
       └─StreamFilter { predicate: (bid.date_time >= $expr2) AND (bid.date_time <= $expr1) }
         └─StreamHashJoin { type: Inner, predicate: bid.price = max(bid.price), output: all }
@@ -415,40 +507,49 @@
                 └─StreamExchange { dist: HashShard($expr1) }
                   └─StreamProject { exprs: [(TumbleStart(bid.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr1, bid.price, bid._row_id] }
                     └─StreamTableScan { table: bid, columns: [bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, price, bidder, date_time, bid._row_id(hidden), $expr1(hidden)], pk_columns: [bid._row_id, $expr1, price], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [bid.auction, bid.price, bid.bidder, bid.date_time, bid._row_id, $expr1] }
-          StreamFilter { predicate: (bid.date_time >= $expr2) AND (bid.date_time <= $expr1) }
-            StreamHashJoin { type: Inner, predicate: bid.price = max(bid.price), output: all }
-                left table: 0, right table 2, left degree table: 1, right degree table: 3,
-              StreamExchange Hash([2]) from 1
-              StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [auction, price, bidder, date_time, bid._row_id(hidden), $expr1(hidden)], stream_key: [bid._row_id, $expr1, price], pk_columns: [bid._row_id, $expr1, price], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [bid.auction, bid.price, bid.bidder, bid.date_time, bid._row_id, $expr1] }
+        └── StreamFilter { predicate: (bid.date_time >= $expr2) AND (bid.date_time <= $expr1) }
+            └── StreamHashJoin { type: Inner, predicate: bid.price = max(bid.price), output: all } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+                ├──  StreamExchange Hash([2]) from 1
+                └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      StreamProject { exprs: [max(bid.price), $expr1, ($expr1 - '00:00:10':Interval) as $expr2] }
-        StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [max(bid.price), count] }
-            result table: 4, state tables: [], distinct tables: []
-          StreamExchange Hash([0]) from 3
+    StreamProject { exprs: [max(bid.price), $expr1, ($expr1 - '00:00:10':Interval) as $expr2] }
+    └── StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [max(bid.price), count] } { result table: 4, state tables: [], distinct tables: [] }
+        └──  StreamExchange Hash([0]) from 3
 
     Fragment 3
-      StreamProject { exprs: [(TumbleStart(bid.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr1, bid.price, bid._row_id] }
-        Chain { table: bid, columns: [bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [bid_auction, bid_bidder, bid_price, bid_date_time, bid__row_id], primary key: [$2 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2], read pk prefix len hint: 1 }
-     Table 1 { columns: [bid_price, bid__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [max(bid_price), $expr1, $expr2], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [max(bid_price), $expr1, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [$expr1, max(bid_price), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, price, bidder, date_time, bid._row_id, $expr1], primary key: [$4 ASC, $5 ASC, $1 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [1], read pk prefix len hint: 3 }
+    StreamProject { exprs: [(TumbleStart(bid.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr1, bid.price, bid._row_id] }
+    └── Chain { table: bid, columns: [bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0 { columns: [ bid_auction, bid_bidder, bid_price, bid_date_time, bid__row_id ], primary key: [ $2 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ bid_price, bid__row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ max(bid_price), $expr1, $expr2 ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ max(bid_price), $expr1, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ $expr1, max(bid_price), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction, price, bidder, date_time, bid._row_id, $expr1 ]
+    ├── primary key: [ $4 ASC, $5 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 3
+
 - id: nexmark_q8
   before:
   - create_tables
@@ -497,7 +598,7 @@
           └─BatchProject { exprs: [auction.seller, TumbleStart(auction.date_time, '00:00:10':Interval) as $expr3, (TumbleStart(auction.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr4] }
             └─BatchScan { table: auction, columns: [auction.date_time, auction.seller], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [id, name, starttime, $expr2(hidden), auction.seller(hidden), $expr3(hidden), $expr4(hidden)], pk_columns: [id, name, starttime, $expr2, auction.seller, $expr3, $expr4], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, name, starttime, $expr2(hidden), auction.seller(hidden), $expr3(hidden), $expr4(hidden)], stream_key: [id, name, starttime, $expr2, auction.seller, $expr3, $expr4], pk_columns: [id, name, starttime, $expr2, auction.seller, $expr3, $expr4], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: person.id = auction.seller AND $expr1 = $expr3 AND $expr2 = $expr4, output: all }
       ├─StreamExchange { dist: HashShard(person.id, $expr1, $expr2) }
       | └─StreamProject { exprs: [person.id, person.name, $expr1, $expr2] }
@@ -509,40 +610,44 @@
           └─StreamExchange { dist: HashShard(auction.seller, $expr3, $expr4) }
             └─StreamProject { exprs: [auction.seller, TumbleStart(auction.date_time, '00:00:10':Interval) as $expr3, (TumbleStart(auction.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr4, auction.id] }
               └─StreamTableScan { table: auction, columns: [auction.date_time, auction.seller, auction.id], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [id, name, starttime, $expr2(hidden), auction.seller(hidden), $expr3(hidden), $expr4(hidden)], pk_columns: [id, name, starttime, $expr2, auction.seller, $expr3, $expr4], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: Inner, predicate: person.id = auction.seller AND $expr1 = $expr3 AND $expr2 = $expr4, output: all }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0, 2, 3]) from 1
-          StreamProject { exprs: [auction.seller, $expr3, $expr4] }
-            StreamHashAgg { group_key: [auction.seller, $expr3, $expr4], aggs: [count] }
-                result table: 5, state tables: [], distinct tables: []
-              StreamExchange Hash([0, 1, 2]) from 2
+    StreamMaterialize { columns: [id, name, starttime, $expr2(hidden), auction.seller(hidden), $expr3(hidden), $expr4(hidden)], stream_key: [id, name, starttime, $expr2, auction.seller, $expr3, $expr4], pk_columns: [id, name, starttime, $expr2, auction.seller, $expr3, $expr4], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: Inner, predicate: person.id = auction.seller AND $expr1 = $expr3 AND $expr2 = $expr4, output: all } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([0, 2, 3]) from 1
+        └── StreamProject { exprs: [auction.seller, $expr3, $expr4] }
+            └── StreamHashAgg { group_key: [auction.seller, $expr3, $expr4], aggs: [count] } { result table: 5, state tables: [], distinct tables: [] }
+                └──  StreamExchange Hash([0, 1, 2]) from 2
 
     Fragment 1
-      StreamProject { exprs: [person.id, person.name, $expr1, $expr2] }
-        StreamHashAgg { group_key: [person.id, person.name, $expr1, $expr2], aggs: [count] }
-            result table: 4, state tables: [], distinct tables: []
-          StreamProject { exprs: [person.id, person.name, TumbleStart(person.date_time, '00:00:10':Interval) as $expr1, (TumbleStart(person.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr2] }
-            Chain { table: person, columns: [person.id, person.name, person.date_time], pk: [person.id], dist: UpstreamHashShard(person.id) }
-              Upstream
-              BatchPlanNode
+    StreamProject { exprs: [person.id, person.name, $expr1, $expr2] }
+    └── StreamHashAgg { group_key: [person.id, person.name, $expr1, $expr2], aggs: [count] } { result table: 4, state tables: [], distinct tables: [] }
+        └── StreamProject { exprs: [person.id, person.name, TumbleStart(person.date_time, '00:00:10':Interval) as $expr1, (TumbleStart(person.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr2] }
+            └── Chain { table: person, columns: [person.id, person.name, person.date_time], pk: [person.id], dist: UpstreamHashShard(person.id) }
+                ├──  Upstream
+                └──  BatchPlanNode
 
     Fragment 2
-      StreamProject { exprs: [auction.seller, TumbleStart(auction.date_time, '00:00:10':Interval) as $expr3, (TumbleStart(auction.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr4, auction.id] }
-        Chain { table: auction, columns: [auction.date_time, auction.seller, auction.id], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [person_id, person_name, $expr1, $expr2], primary key: [$0 ASC, $2 ASC, $3 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [0, 2, 3], read pk prefix len hint: 3 }
-     Table 1 { columns: [person_id, $expr1, $expr2, person_name, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 2 { columns: [auction_seller, $expr3, $expr4], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 3 { columns: [auction_seller, $expr3, $expr4, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 4 { columns: [person_id, person_name, $expr1, $expr2, count], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 4 }
-     Table 5 { columns: [auction_seller, $expr3, $expr4, count], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 4294967294 { columns: [id, name, starttime, $expr2, auction.seller, $expr3, $expr4], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [0, 2, 3], read pk prefix len hint: 7 }
+    StreamProject { exprs: [auction.seller, TumbleStart(auction.date_time, '00:00:10':Interval) as $expr3, (TumbleStart(auction.date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr4, auction.id] }
+    └── Chain { table: auction, columns: [auction.date_time, auction.seller, auction.id], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0 { columns: [ person_id, person_name, $expr1, $expr2 ], primary key: [ $0 ASC, $2 ASC, $3 ASC, $1 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0, 2, 3 ], read pk prefix len hint: 3 }
+
+    Table 1 { columns: [ person_id, $expr1, $expr2, person_name, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 2 { columns: [ auction_seller, $expr3, $expr4 ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 3 { columns: [ auction_seller, $expr3, $expr4, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 4 { columns: [ person_id, person_name, $expr1, $expr2, count ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 4 }
+
+    Table 5 { columns: [ auction_seller, $expr3, $expr4, count ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 4294967294 { columns: [ id, name, starttime, $expr2, auction.seller, $expr3, $expr4 ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 0, 2, 3 ], read pk prefix len hint: 7 }
+
 - id: nexmark_q9
   before:
   - create_tables
@@ -582,7 +687,7 @@
           └─BatchExchange { order: [], dist: HashShard(bid.auction) }
             └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id], distribution: UpstreamHashShard(bid._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, bid._row_id(hidden)], pk_columns: [id, bid._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, bid._row_id(hidden)], stream_key: [id, bid._row_id], pk_columns: [id, bid._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [auction.id, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category, bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id] }
       └─StreamGroupTopN { order: "[bid.price DESC, bid.date_time ASC]", limit: 1, offset: 0, group_key: [0] }
         └─StreamFilter { predicate: (bid.date_time >= auction.date_time) AND (bid.date_time <= auction.expires) }
@@ -591,35 +696,71 @@
             | └─StreamTableScan { table: auction, columns: [auction.id, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
             └─StreamExchange { dist: HashShard(bid.auction) }
               └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, bid._row_id(hidden)], pk_columns: [id, bid._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [auction.id, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category, bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id] }
-          StreamGroupTopN { order: "[bid.price DESC, bid.date_time ASC]", limit: 1, offset: 0, group_key: [0] }
-              state table: 0
-            StreamFilter { predicate: (bid.date_time >= auction.date_time) AND (bid.date_time <= auction.expires) }
-              StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
-                  left table: 1, right table 3, left degree table: 2, right degree table: 4,
-                StreamExchange Hash([0]) from 1
-                StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, bid._row_id(hidden)], stream_key: [id, bid._row_id], pk_columns: [id, bid._row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [auction.id, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category, bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id] }
+        └── StreamGroupTopN { order: "[bid.price DESC, bid.date_time ASC]", limit: 1, offset: 0, group_key: [0] } { state table: 0 }
+            └── StreamFilter { predicate: (bid.date_time >= auction.date_time) AND (bid.date_time <= auction.expires) }
+                └── StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all } { left table: 1, right table: 3, left degree table: 2, right degree table: 4 }
+                    ├──  StreamExchange Hash([0]) from 1
+                    └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      Chain { table: auction, columns: [auction.id, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: auction, columns: [auction.id, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [auction_id, auction_item_name, auction_description, auction_initial_bid, auction_reserve, auction_date_time, auction_expires, auction_seller, auction_category, bid_auction, bid_bidder, bid_price, bid_channel, bid_url, bid_date_time, bid_extra, bid__row_id], primary key: [$0 ASC, $11 DESC, $14 ASC, $16 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [auction_id, auction_item_name, auction_description, auction_initial_bid, auction_reserve, auction_date_time, auction_expires, auction_seller, auction_category], primary key: [$0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [auction_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [bid_auction, bid_bidder, bid_price, bid_channel, bid_url, bid_date_time, bid_extra, bid__row_id], primary key: [$0 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [bid_auction, bid__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, bid._row_id], primary key: [$0 ASC, $13 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13], distribution key: [0], read pk prefix len hint: 2 }
+    Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns:
+    │   ┌── auction_id
+    │   ├── auction_item_name
+    │   ├── auction_description
+    │   ├── auction_initial_bid
+    │   ├── auction_reserve
+    │   ├── auction_date_time
+    │   ├── auction_expires
+    │   ├── auction_seller
+    │   ├── auction_category
+    │   ├── bid_auction
+    │   ├── bid_bidder
+    │   ├── bid_price
+    │   ├── bid_channel
+    │   ├── bid_url
+    │   ├── bid_date_time
+    │   ├── bid_extra
+    │   └── bid__row_id
+    ├── primary key: [ $0 ASC, $11 DESC, $14 ASC, $16 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ auction_id, auction_item_name, auction_description, auction_initial_bid, auction_reserve, auction_date_time, auction_expires, auction_seller, auction_category ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 2 { columns: [ auction_id, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ bid_auction, bid_bidder, bid_price, bid_channel, bid_url, bid_date_time, bid_extra, bid__row_id ], primary key: [ $0 ASC, $7 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ bid_auction, bid__row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, bid._row_id ]
+    ├── primary key: [ $0 ASC, $13 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
 - id: nexmark_q10
   before:
   - create_tables
@@ -629,20 +770,32 @@
     BatchExchange { order: [], dist: Single }
     └─BatchProject { exprs: [bid.auction, bid.bidder, bid.price, bid.date_time, ToChar(bid.date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(bid.date_time, 'HH:MI':Varchar) as $expr2] }
       └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time], distribution: SomeShard }
+  sink_plan: |
+    StreamSink { type: append-only, columns: [auction, bidder, price, date_time, date, time] }
+    └─StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.date_time, $expr1, $expr2] }
+      └─StreamExchange { dist: Single }
+        └─StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.date_time, ToChar(bid.date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(bid.date_time, 'HH:MI':Varchar) as $expr2, bid._row_id] }
+          └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, date_time, date, time, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, bidder, price, date_time, date, time, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.date_time, ToChar(bid.date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(bid.date_time, 'HH:MI':Varchar) as $expr2, bid._row_id] }
       └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, date_time, date, time, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.date_time, ToChar(bid.date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(bid.date_time, 'HH:MI':Varchar) as $expr2, bid._row_id] }
-          Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-            Upstream
-            BatchPlanNode
-
-     Table 4294967294 { columns: [auction, bidder, price, date_time, date, time, bid._row_id], primary key: [$6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [6], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [auction, bidder, price, date_time, date, time, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.date_time, ToChar(bid.date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(bid.date_time, 'HH:MI':Varchar) as $expr2, bid._row_id] }
+        └── Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, date_time, date, time, bid._row_id ]
+    ├── primary key: [ $6 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6 ]
+    ├── distribution key: [ 6 ]
+    └── read pk prefix len hint: 1
+
 - id: nexmark_q11
   before:
   - create_tables
@@ -717,22 +870,29 @@
     └─BatchProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, Case(((Extract('HOUR':Varchar, bid.date_time) >= 8:Int32) AND (Extract('HOUR':Varchar, bid.date_time) <= 18:Int32)), 'dayTime':Varchar, ((Extract('HOUR':Varchar, bid.date_time) <= 6:Int32) OR (Extract('HOUR':Varchar, bid.date_time) >= 20:Int32)), 'nightTime':Varchar, 'otherTime':Varchar) as $expr2, bid.date_time, bid.extra] }
       └─BatchFilter { predicate: ((0.908:Decimal * bid.price) > 1000000:Int32) AND ((0.908:Decimal * bid.price) < 50000000:Int32) }
         └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid.extra], distribution: SomeShard }
+  sink_plan: |
+    StreamSink { type: append-only, columns: [auction, bidder, price, bidtimetype, date_time, extra] }
+    └─StreamProject { exprs: [bid.auction, bid.bidder, $expr1, $expr2, bid.date_time, bid.extra] }
+      └─StreamExchange { dist: Single }
+        └─StreamProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, Case(((Extract('HOUR':Varchar, bid.date_time) >= 8:Int32) AND (Extract('HOUR':Varchar, bid.date_time) <= 18:Int32)), 'dayTime':Varchar, ((Extract('HOUR':Varchar, bid.date_time) <= 6:Int32) OR (Extract('HOUR':Varchar, bid.date_time) >= 20:Int32)), 'nightTime':Varchar, 'otherTime':Varchar) as $expr2, bid.date_time, bid.extra, bid._row_id] }
+          └─StreamFilter { predicate: ((0.908:Decimal * bid.price) > 1000000:Int32) AND ((0.908:Decimal * bid.price) < 50000000:Int32) }
+            └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, bidtimetype, date_time, extra, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, bidder, price, bidtimetype, date_time, extra, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, Case(((Extract('HOUR':Varchar, bid.date_time) >= 8:Int32) AND (Extract('HOUR':Varchar, bid.date_time) <= 18:Int32)), 'dayTime':Varchar, ((Extract('HOUR':Varchar, bid.date_time) <= 6:Int32) OR (Extract('HOUR':Varchar, bid.date_time) >= 20:Int32)), 'nightTime':Varchar, 'otherTime':Varchar) as $expr2, bid.date_time, bid.extra, bid._row_id] }
       └─StreamFilter { predicate: ((0.908:Decimal * bid.price) > 1000000:Int32) AND ((0.908:Decimal * bid.price) < 50000000:Int32) }
         └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, bidtimetype, date_time, extra, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, Case(((Extract('HOUR':Varchar, bid.date_time) >= 8:Int32) AND (Extract('HOUR':Varchar, bid.date_time) <= 18:Int32)), 'dayTime':Varchar, ((Extract('HOUR':Varchar, bid.date_time) <= 6:Int32) OR (Extract('HOUR':Varchar, bid.date_time) >= 20:Int32)), 'nightTime':Varchar, 'otherTime':Varchar) as $expr2, bid.date_time, bid.extra, bid._row_id] }
-          StreamFilter { predicate: ((0.908:Decimal * bid.price) > 1000000:Int32) AND ((0.908:Decimal * bid.price) < 50000000:Int32) }
-            Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-              Upstream
-              BatchPlanNode
-
-     Table 4294967294 { columns: [auction, bidder, price, bidtimetype, date_time, extra, bid._row_id], primary key: [$6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [6], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [auction, bidder, price, bidtimetype, date_time, extra, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamProject { exprs: [bid.auction, bid.bidder, (0.908:Decimal * bid.price) as $expr1, Case(((Extract('HOUR':Varchar, bid.date_time) >= 8:Int32) AND (Extract('HOUR':Varchar, bid.date_time) <= 18:Int32)), 'dayTime':Varchar, ((Extract('HOUR':Varchar, bid.date_time) <= 6:Int32) OR (Extract('HOUR':Varchar, bid.date_time) >= 20:Int32)), 'nightTime':Varchar, 'otherTime':Varchar) as $expr2, bid.date_time, bid.extra, bid._row_id] }
+        └── StreamFilter { predicate: ((0.908:Decimal * bid.price) > 1000000:Int32) AND ((0.908:Decimal * bid.price) < 50000000:Int32) }
+            └── Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 4294967294 { columns: [ auction, bidder, price, bidtimetype, date_time, extra, bid._row_id ], primary key: [ $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 6 ], read pk prefix len hint: 1 }
+
 - id: nexmark_q15
   before:
   - create_tables
@@ -764,29 +924,39 @@
                 └─BatchProject { exprs: [ToChar(bid.date_time, 'yyyy-MM-dd':Varchar) as $expr1, bid.price, bid.bidder, bid.auction] }
                   └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], pk_columns: [day], pk_conflict: "no check" }
+    StreamMaterialize { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], stream_key: [day], pk_columns: [day], pk_conflict: "NoCheck" }
     └─StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), count(distinct bid.bidder), count(distinct bid.bidder) filter((bid.price < 10000:Int32)), count(distinct bid.bidder) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.bidder) filter((bid.price >= 1000000:Int32)), count(distinct bid.auction), count(distinct bid.auction) filter((bid.price < 10000:Int32)), count(distinct bid.auction) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.auction) filter((bid.price >= 1000000:Int32))] }
       └─StreamExchange { dist: HashShard($expr1) }
         └─StreamProject { exprs: [ToChar(bid.date_time, 'yyyy-MM-dd':Varchar) as $expr1, bid.price, bid.bidder, bid.auction, bid._row_id] }
           └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], pk_columns: [day], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), count(distinct bid.bidder), count(distinct bid.bidder) filter((bid.price < 10000:Int32)), count(distinct bid.bidder) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.bidder) filter((bid.price >= 1000000:Int32)), count(distinct bid.auction), count(distinct bid.auction) filter((bid.price < 10000:Int32)), count(distinct bid.auction) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.auction) filter((bid.price >= 1000000:Int32))] }
-            result table: 0, state tables: [], distinct tables: [(distinct key: bid.bidder, table id: 1), (distinct key: bid.auction, table id: 2)]
-          StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], stream_key: [day], pk_columns: [day], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), count(distinct bid.bidder), count(distinct bid.bidder) filter((bid.price < 10000:Int32)), count(distinct bid.bidder) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.bidder) filter((bid.price >= 1000000:Int32)), count(distinct bid.auction), count(distinct bid.auction) filter((bid.price < 10000:Int32)), count(distinct bid.auction) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.auction) filter((bid.price >= 1000000:Int32))] }
+        ├── result table: 0
+        ├── state tables: []
+        ├── distinct tables: [ (distinct key: bid.bidder, table id: 1), (distinct key: bid.auction, table id: 2) ]
+        └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamProject { exprs: [ToChar(bid.date_time, 'yyyy-MM-dd':Varchar) as $expr1, bid.price, bid.bidder, bid.auction, bid._row_id] }
-        Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [$expr1, count, count filter((bid_price < 10000:Int32)), count filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count filter((bid_price >= 1000000:Int32)), count(distinct bid_bidder), count(distinct bid_bidder) filter((bid_price < 10000:Int32)), count(distinct bid_bidder) filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count(distinct bid_bidder) filter((bid_price >= 1000000:Int32)), count(distinct bid_auction), count(distinct bid_auction) filter((bid_price < 10000:Int32)), count(distinct bid_auction) filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count(distinct bid_auction) filter((bid_price >= 1000000:Int32))], primary key: [$0 ASC], value indices: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [$expr1, bid_bidder, count_for_agg_call_4, count_for_agg_call_5, count_for_agg_call_6, count_for_agg_call_7], primary key: [$0 ASC, $1 ASC], value indices: [2, 3, 4, 5], distribution key: [0], read pk prefix len hint: 2 }
-     Table 2 { columns: [$expr1, bid_auction, count_for_agg_call_8, count_for_agg_call_9, count_for_agg_call_10, count_for_agg_call_11], primary key: [$0 ASC, $1 ASC], value indices: [2, 3, 4, 5], distribution key: [0], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], primary key: [$0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], distribution key: [0], read pk prefix len hint: 1 }
+    StreamProject { exprs: [ToChar(bid.date_time, 'yyyy-MM-dd':Varchar) as $expr1, bid.price, bid.bidder, bid.auction, bid._row_id] }
+    └── Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ $expr1, count, count filter((bid_price < 10000:Int32)), count filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count filter((bid_price >= 1000000:Int32)), count(distinct bid_bidder), count(distinct bid_bidder) filter((bid_price < 10000:Int32)), count(distinct bid_bidder) filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count(distinct bid_bidder) filter((bid_price >= 1000000:Int32)), count(distinct bid_auction), count(distinct bid_auction) filter((bid_price < 10000:Int32)), count(distinct bid_auction) filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count(distinct bid_auction) filter((bid_price >= 1000000:Int32)) ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1 { columns: [ $expr1, bid_bidder, count_for_agg_call_4, count_for_agg_call_5, count_for_agg_call_6, count_for_agg_call_7 ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3, 4, 5 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 2 { columns: [ $expr1, bid_auction, count_for_agg_call_8, count_for_agg_call_9, count_for_agg_call_10, count_for_agg_call_11 ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3, 4, 5 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 4294967294 { columns: [ day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: nexmark_q16
   before:
   - create_tables
@@ -820,29 +990,39 @@
                 └─BatchProject { exprs: [bid.channel, ToChar(bid.date_time, 'yyyy-MM-dd':Varchar) as $expr1, ToChar(bid.date_time, 'HH:mm':Varchar) as $expr2, bid.price, bid.bidder, bid.auction] }
                   └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.date_time], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], pk_columns: [channel, day], pk_conflict: "no check" }
+    StreamMaterialize { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], stream_key: [channel, day], pk_columns: [channel, day], pk_conflict: "NoCheck" }
     └─StreamAppendOnlyHashAgg { group_key: [bid.channel, $expr1], aggs: [max($expr2), count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), count(distinct bid.bidder), count(distinct bid.bidder) filter((bid.price < 10000:Int32)), count(distinct bid.bidder) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.bidder) filter((bid.price >= 1000000:Int32)), count(distinct bid.auction), count(distinct bid.auction) filter((bid.price < 10000:Int32)), count(distinct bid.auction) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.auction) filter((bid.price >= 1000000:Int32))] }
       └─StreamExchange { dist: HashShard(bid.channel, $expr1) }
         └─StreamProject { exprs: [bid.channel, ToChar(bid.date_time, 'yyyy-MM-dd':Varchar) as $expr1, ToChar(bid.date_time, 'HH:mm':Varchar) as $expr2, bid.price, bid.bidder, bid.auction, bid._row_id] }
           └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], pk_columns: [channel, day], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamAppendOnlyHashAgg { group_key: [bid.channel, $expr1], aggs: [max($expr2), count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), count(distinct bid.bidder), count(distinct bid.bidder) filter((bid.price < 10000:Int32)), count(distinct bid.bidder) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.bidder) filter((bid.price >= 1000000:Int32)), count(distinct bid.auction), count(distinct bid.auction) filter((bid.price < 10000:Int32)), count(distinct bid.auction) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.auction) filter((bid.price >= 1000000:Int32))] }
-            result table: 0, state tables: [], distinct tables: [(distinct key: bid.bidder, table id: 1), (distinct key: bid.auction, table id: 2)]
-          StreamExchange Hash([0, 1]) from 1
+    StreamMaterialize { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], stream_key: [channel, day], pk_columns: [channel, day], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamAppendOnlyHashAgg { group_key: [bid.channel, $expr1], aggs: [max($expr2), count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), count(distinct bid.bidder), count(distinct bid.bidder) filter((bid.price < 10000:Int32)), count(distinct bid.bidder) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.bidder) filter((bid.price >= 1000000:Int32)), count(distinct bid.auction), count(distinct bid.auction) filter((bid.price < 10000:Int32)), count(distinct bid.auction) filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count(distinct bid.auction) filter((bid.price >= 1000000:Int32))] }
+        ├── result table: 0
+        ├── state tables: []
+        ├── distinct tables: [ (distinct key: bid.bidder, table id: 1), (distinct key: bid.auction, table id: 2) ]
+        └──  StreamExchange Hash([0, 1]) from 1
 
     Fragment 1
-      StreamProject { exprs: [bid.channel, ToChar(bid.date_time, 'yyyy-MM-dd':Varchar) as $expr1, ToChar(bid.date_time, 'HH:mm':Varchar) as $expr2, bid.price, bid.bidder, bid.auction, bid._row_id] }
-        Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [bid_channel, $expr1, max($expr2), count, count filter((bid_price < 10000:Int32)), count filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count filter((bid_price >= 1000000:Int32)), count(distinct bid_bidder), count(distinct bid_bidder) filter((bid_price < 10000:Int32)), count(distinct bid_bidder) filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count(distinct bid_bidder) filter((bid_price >= 1000000:Int32)), count(distinct bid_auction), count(distinct bid_auction) filter((bid_price < 10000:Int32)), count(distinct bid_auction) filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count(distinct bid_auction) filter((bid_price >= 1000000:Int32))], primary key: [$0 ASC, $1 ASC], value indices: [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 1 { columns: [bid_channel, $expr1, bid_bidder, count_for_agg_call_5, count_for_agg_call_6, count_for_agg_call_7, count_for_agg_call_8], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3, 4, 5, 6], distribution key: [0, 1], read pk prefix len hint: 3 }
-     Table 2 { columns: [bid_channel, $expr1, bid_auction, count_for_agg_call_9, count_for_agg_call_10, count_for_agg_call_11, count_for_agg_call_12], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3, 4, 5, 6], distribution key: [0, 1], read pk prefix len hint: 3 }
-     Table 4294967294 { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], distribution key: [0, 1], read pk prefix len hint: 2 }
+    StreamProject { exprs: [bid.channel, ToChar(bid.date_time, 'yyyy-MM-dd':Varchar) as $expr1, ToChar(bid.date_time, 'HH:mm':Varchar) as $expr2, bid.price, bid.bidder, bid.auction, bid._row_id] }
+    └── Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ bid_channel, $expr1, max($expr2), count, count filter((bid_price < 10000:Int32)), count filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count filter((bid_price >= 1000000:Int32)), count(distinct bid_bidder), count(distinct bid_bidder) filter((bid_price < 10000:Int32)), count(distinct bid_bidder) filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count(distinct bid_bidder) filter((bid_price >= 1000000:Int32)), count(distinct bid_auction), count(distinct bid_auction) filter((bid_price < 10000:Int32)), count(distinct bid_auction) filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count(distinct bid_auction) filter((bid_price >= 1000000:Int32)) ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 1 { columns: [ bid_channel, $expr1, bid_bidder, count_for_agg_call_5, count_for_agg_call_6, count_for_agg_call_7, count_for_agg_call_8 ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3, 4, 5, 6 ], distribution key: [ 0, 1 ], read pk prefix len hint: 3 }
+
+    Table 2 { columns: [ bid_channel, $expr1, bid_auction, count_for_agg_call_9, count_for_agg_call_10, count_for_agg_call_11, count_for_agg_call_12 ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3, 4, 5, 6 ], distribution key: [ 0, 1 ], read pk prefix len hint: 3 }
+
+    Table 4294967294 { columns: [ channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
 - id: nexmark_q17
   before:
   - create_tables
@@ -868,29 +1048,37 @@
           └─BatchProject { exprs: [bid.auction, ToChar(bid.date_time, 'YYYY-MM-DD':Varchar) as $expr1, bid.price] }
             └─BatchScan { table: bid, columns: [bid.auction, bid.price, bid.date_time], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], pk_columns: [auction, day], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], stream_key: [auction, day], pk_columns: [auction, day], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [bid.auction, $expr1, count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), min(bid.price), max(bid.price), (sum(bid.price) / count(bid.price)) as $expr2, sum(bid.price)] }
       └─StreamAppendOnlyHashAgg { group_key: [bid.auction, $expr1], aggs: [count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), min(bid.price), max(bid.price), sum(bid.price), count(bid.price)] }
         └─StreamExchange { dist: HashShard(bid.auction, $expr1) }
           └─StreamProject { exprs: [bid.auction, ToChar(bid.date_time, 'YYYY-MM-DD':Varchar) as $expr1, bid.price, bid._row_id] }
             └─StreamTableScan { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], pk_columns: [auction, day], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [bid.auction, $expr1, count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), min(bid.price), max(bid.price), (sum(bid.price) / count(bid.price)) as $expr2, sum(bid.price)] }
-          StreamAppendOnlyHashAgg { group_key: [bid.auction, $expr1], aggs: [count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), min(bid.price), max(bid.price), sum(bid.price), count(bid.price)] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0, 1]) from 1
+    StreamMaterialize { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], stream_key: [auction, day], pk_columns: [auction, day], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamProject { exprs: [bid.auction, $expr1, count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), min(bid.price), max(bid.price), (sum(bid.price) / count(bid.price)) as $expr2, sum(bid.price)] }
+        └── StreamAppendOnlyHashAgg { group_key: [bid.auction, $expr1], aggs: [count, count filter((bid.price < 10000:Int32)), count filter((bid.price >= 10000:Int32) AND (bid.price < 1000000:Int32)), count filter((bid.price >= 1000000:Int32)), min(bid.price), max(bid.price), sum(bid.price), count(bid.price)] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0, 1]) from 1
 
     Fragment 1
-      StreamProject { exprs: [bid.auction, ToChar(bid.date_time, 'YYYY-MM-DD':Varchar) as $expr1, bid.price, bid._row_id] }
-        Chain { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [bid.auction, ToChar(bid.date_time, 'YYYY-MM-DD':Varchar) as $expr1, bid.price, bid._row_id] }
+    └── Chain { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ bid_auction, $expr1, count, count filter((bid_price < 10000:Int32)), count filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count filter((bid_price >= 1000000:Int32)), min(bid_price), max(bid_price), sum(bid_price), count(bid_price) ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2, 3, 4, 5, 6, 7, 8, 9 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 4294967294 { columns: [ auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
 
-     Table 0 { columns: [bid_auction, $expr1, count, count filter((bid_price < 10000:Int32)), count filter((bid_price >= 10000:Int32) AND (bid_price < 1000000:Int32)), count filter((bid_price >= 1000000:Int32)), min(bid_price), max(bid_price), sum(bid_price), count(bid_price)], primary key: [$0 ASC, $1 ASC], value indices: [2, 3, 4, 5, 6, 7, 8, 9], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], distribution key: [0, 1], read pk prefix len hint: 2 }
 - id: nexmark_q18
   before:
   - create_tables
@@ -912,31 +1100,42 @@
         └─BatchExchange { order: [], dist: HashShard(bid.bidder, bid.auction) }
           └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id], distribution: UpstreamHashShard(bid._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_time, extra, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_time, extra, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(bid._row_id) }
       └─StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id] }
         └─StreamAppendOnlyGroupTopN { order: "[bid.date_time DESC]", limit: 1, offset: 0, group_key: [1, 0] }
           └─StreamExchange { dist: HashShard(bid.bidder, bid.auction) }
             └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, channel, url, date_time, extra, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([7]) from 1
+    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_time, extra, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └──  StreamExchange Hash([7]) from 1
 
     Fragment 1
-      StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id] }
-        StreamAppendOnlyGroupTopN { order: "[bid.date_time DESC]", limit: 1, offset: 0, group_key: [1, 0] }
-            state table: 0
-          StreamExchange Hash([1, 0]) from 2
+    StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id] }
+    └── StreamAppendOnlyGroupTopN { order: "[bid.date_time DESC]", limit: 1, offset: 0, group_key: [1, 0] } { state table: 0 }
+        └──  StreamExchange Hash([1, 0]) from 2
 
     Fragment 2
-      Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid.extra, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ bid_auction, bid_bidder, bid_price, bid_channel, bid_url, bid_date_time, bid_extra, bid__row_id ]
+    ├── primary key: [ $1 ASC, $0 ASC, $5 DESC, $7 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ]
+    ├── distribution key: [ 1, 0 ]
+    └── read pk prefix len hint: 2
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, channel, url, date_time, extra, bid._row_id ]
+    ├── primary key: [ $7 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ]
+    ├── distribution key: [ 7 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [bid_auction, bid_bidder, bid_price, bid_channel, bid_url, bid_date_time, bid_extra, bid__row_id], primary key: [$1 ASC, $0 ASC, $5 DESC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [1, 0], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [auction, bidder, price, channel, url, date_time, extra, bid._row_id], primary key: [$7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [7], read pk prefix len hint: 1 }
 - id: nexmark_q19
   before:
   - create_tables
@@ -972,38 +1171,51 @@
       └─BatchExchange { order: [], dist: UpstreamHashShard(bid.auction) }
         └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, bid._row_id(hidden), auction.id(hidden)], pk_columns: [bid._row_id, auction.id, auction], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, bid._row_id(hidden), auction.id(hidden)], stream_key: [bid._row_id, auction.id, auction], pk_columns: [bid._row_id, auction.id, auction], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: bid.auction = auction.id, output: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category, bid._row_id, auction.id] }
       ├─StreamExchange { dist: HashShard(bid.auction) }
       | └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
       └─StreamExchange { dist: HashShard(auction.id) }
         └─StreamFilter { predicate: (auction.category = 10:Int32) }
           └─StreamTableScan { table: auction, columns: [auction.id, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, bid._row_id(hidden), auction.id(hidden)], pk_columns: [bid._row_id, auction.id, auction], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: Inner, predicate: bid.auction = auction.id, output: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category, bid._row_id, auction.id] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, bid._row_id(hidden), auction.id(hidden)], stream_key: [bid._row_id, auction.id, auction], pk_columns: [bid._row_id, auction.id, auction], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: Inner, predicate: bid.auction = auction.id, output: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category, bid._row_id, auction.id] }
+        ├── left table: 0
+        ├── right table: 2
+        ├── left degree table: 1
+        ├── right degree table: 3
+        ├──  StreamExchange Hash([0]) from 1
+        └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      StreamFilter { predicate: (auction.category = 10:Int32) }
-        Chain { table: auction, columns: [auction.id, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [bid_auction, bid_bidder, bid_price, bid_channel, bid_url, bid_date_time, bid__row_id], primary key: [$0 ASC, $6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [bid_auction, bid__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [auction_id, auction_item_name, auction_description, auction_initial_bid, auction_reserve, auction_date_time, auction_expires, auction_seller, auction_category], primary key: [$0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [auction_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, bid._row_id, auction.id], primary key: [$14 ASC, $15 ASC, $0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], distribution key: [0], read pk prefix len hint: 3 }
+    StreamFilter { predicate: (auction.category = 10:Int32) }
+    └── Chain { table: auction, columns: [auction.id, auction.item_name, auction.description, auction.initial_bid, auction.reserve, auction.date_time, auction.expires, auction.seller, auction.category], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0 { columns: [ bid_auction, bid_bidder, bid_price, bid_channel, bid_url, bid_date_time, bid__row_id ], primary key: [ $0 ASC, $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ bid_auction, bid__row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ auction_id, auction_item_name, auction_description, auction_initial_bid, auction_reserve, auction_date_time, auction_expires, auction_seller, auction_category ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ auction_id, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, bid._row_id, auction.id ]
+    ├── primary key: [ $14 ASC, $15 ASC, $0 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 3
+
 - id: nexmark_q21
   before:
   - create_tables
@@ -1036,20 +1248,26 @@
     BatchExchange { order: [], dist: Single }
     └─BatchProject { exprs: [bid.auction, bid.bidder, bid.price, bid.channel, SplitPart(bid.url, '/':Varchar, 4:Int32) as $expr1, SplitPart(bid.url, '/':Varchar, 5:Int32) as $expr2, SplitPart(bid.url, '/':Varchar, 6:Int32) as $expr3] }
       └─BatchScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url], distribution: SomeShard }
+  sink_plan: |
+    StreamSink { type: append-only, columns: [auction, bidder, price, channel, dir1, dir2, dir3] }
+    └─StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.channel, $expr1, $expr2, $expr3] }
+      └─StreamExchange { dist: Single }
+        └─StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.channel, SplitPart(bid.url, '/':Varchar, 4:Int32) as $expr1, SplitPart(bid.url, '/':Varchar, 5:Int32) as $expr2, SplitPart(bid.url, '/':Varchar, 6:Int32) as $expr3, bid._row_id] }
+          └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, channel, dir1, dir2, dir3, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, bidder, price, channel, dir1, dir2, dir3, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.channel, SplitPart(bid.url, '/':Varchar, 4:Int32) as $expr1, SplitPart(bid.url, '/':Varchar, 5:Int32) as $expr2, SplitPart(bid.url, '/':Varchar, 6:Int32) as $expr3, bid._row_id] }
       └─StreamTableScan { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, channel, dir1, dir2, dir3, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.channel, SplitPart(bid.url, '/':Varchar, 4:Int32) as $expr1, SplitPart(bid.url, '/':Varchar, 5:Int32) as $expr2, SplitPart(bid.url, '/':Varchar, 6:Int32) as $expr3, bid._row_id] }
-          Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-            Upstream
-            BatchPlanNode
-
-     Table 4294967294 { columns: [auction, bidder, price, channel, dir1, dir2, dir3, bid._row_id], primary key: [$7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [7], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [auction, bidder, price, channel, dir1, dir2, dir3, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamProject { exprs: [bid.auction, bid.bidder, bid.price, bid.channel, SplitPart(bid.url, '/':Varchar, 4:Int32) as $expr1, SplitPart(bid.url, '/':Varchar, 5:Int32) as $expr2, SplitPart(bid.url, '/':Varchar, 6:Int32) as $expr3, bid._row_id] }
+        └── Chain { table: bid, columns: [bid.auction, bid.bidder, bid.price, bid.channel, bid.url, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 4294967294 { columns: [ auction, bidder, price, channel, dir1, dir2, dir3, bid._row_id ], primary key: [ $7 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ], distribution key: [ 7 ], read pk prefix len hint: 1 }
+
 - id: nexmark_q101
   before:
   - create_tables
@@ -1079,7 +1297,7 @@
         └─BatchExchange { order: [], dist: HashShard(bid.auction) }
           └─BatchScan { table: bid, columns: [bid.auction, bid.price], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name, current_highest_bid, bid.auction(hidden)], pk_columns: [auction_id, bid.auction], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name, current_highest_bid, bid.auction(hidden)], stream_key: [auction_id, bid.auction], pk_columns: [auction_id, bid.auction], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: LeftOuter, predicate: auction.id = bid.auction, output: [auction.id, auction.item_name, max(bid.price), bid.auction] }
       ├─StreamExchange { dist: HashShard(auction.id) }
       | └─StreamTableScan { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
@@ -1087,34 +1305,47 @@
         └─StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [max(bid.price), count] }
           └─StreamExchange { dist: HashShard(bid.auction) }
             └─StreamTableScan { table: bid, columns: [bid.auction, bid.price, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name, current_highest_bid, bid.auction(hidden)], pk_columns: [auction_id, bid.auction], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: LeftOuter, predicate: auction.id = bid.auction, output: [auction.id, auction.item_name, max(bid.price), bid.auction] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamProject { exprs: [bid.auction, max(bid.price)] }
-            StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [max(bid.price), count] }
-                result table: 4, state tables: [], distinct tables: []
-              StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [auction_id, auction_item_name, current_highest_bid, bid.auction(hidden)], stream_key: [auction_id, bid.auction], pk_columns: [auction_id, bid.auction], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: LeftOuter, predicate: auction.id = bid.auction, output: [auction.id, auction.item_name, max(bid.price), bid.auction] }
+        ├── left table: 0
+        ├── right table: 2
+        ├── left degree table: 1
+        ├── right degree table: 3
+        ├──  StreamExchange Hash([0]) from 1
+        └── StreamProject { exprs: [bid.auction, max(bid.price)] }
+            └── StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [max(bid.price), count] } { result table: 4, state tables: [], distinct tables: [] }
+                └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      Chain { table: bid, columns: [bid.auction, bid.price, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [auction_id, auction_item_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [auction_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [bid_auction, max(bid_price)], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [bid_auction, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [bid_auction, max(bid_price), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name, current_highest_bid, bid.auction], primary key: [$0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 2 }
+    Chain { table: bid, columns: [bid.auction, bid.price, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0 { columns: [ auction_id, auction_item_name ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ auction_id, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ bid_auction, max(bid_price) ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ bid_auction, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ bid_auction, max(bid_price), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction_id, auction_item_name, current_highest_bid, bid.auction ]
+    ├── primary key: [ $0 ASC, $3 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
 - id: nexmark_q102
   before:
   - create_tables
@@ -1149,7 +1380,7 @@
             └─BatchExchange { order: [], dist: HashShard(bid.auction) }
               └─BatchScan { table: bid, columns: [bid.auction], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], pk_columns: [auction_id, auction_item_name], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], stream_key: [auction_id, auction_item_name], pk_columns: [auction_id, auction_item_name], pk_conflict: "NoCheck" }
     └─StreamDynamicFilter { predicate: (count(bid.auction) >= $expr1), output: [auction.id, auction.item_name, count(bid.auction)] }
       ├─StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction)] }
       | └─StreamHashAgg { group_key: [auction.id, auction.item_name], aggs: [count(bid.auction), count] }
@@ -1165,57 +1396,77 @@
               └─StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [count] }
                 └─StreamExchange { dist: HashShard(bid.auction) }
                   └─StreamTableScan { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], pk_columns: [auction_id, auction_item_name], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamDynamicFilter { predicate: (count(bid.auction) >= $expr1), output: [auction.id, auction.item_name, count(bid.auction)] }
-            left table: 0, right table 1
-          StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction)] }
-            StreamHashAgg { group_key: [auction.id, auction.item_name], aggs: [count(bid.auction), count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
-                  left table: 3, right table 5, left degree table: 4, right degree table: 6,
-                StreamExchange Hash([0]) from 1
-                StreamExchange Hash([0]) from 2
-          StreamExchange Broadcast from 3
+    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], stream_key: [auction_id, auction_item_name], pk_columns: [auction_id, auction_item_name], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamDynamicFilter { predicate: (count(bid.auction) >= $expr1), output: [auction.id, auction.item_name, count(bid.auction)] } { left table: 0, right table: 1 }
+        ├── StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction)] }
+        │   └── StreamHashAgg { group_key: [auction.id, auction.item_name], aggs: [count(bid.auction), count] } { result table: 2, state tables: [], distinct tables: [] }
+        │       └── StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all } { left table: 3, right table: 5, left degree table: 4, right degree table: 6 }
+        │           ├──  StreamExchange Hash([0]) from 1
+        │           └──  StreamExchange Hash([0]) from 2
+        └──  StreamExchange Broadcast from 3
 
     Fragment 1
-      Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      StreamProject { exprs: [(sum0(count) / count(bid.auction)) as $expr1] }
-        StreamGlobalSimpleAgg { aggs: [sum0(count), count(bid.auction), count] }
-            result table: 7, state tables: [], distinct tables: []
-          StreamExchange Single from 4
+    StreamProject { exprs: [(sum0(count) / count(bid.auction)) as $expr1] }
+    └── StreamGlobalSimpleAgg { aggs: [sum0(count), count(bid.auction), count] } { result table: 7, state tables: [], distinct tables: [] }
+        └──  StreamExchange Single from 4
 
     Fragment 4
-      StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [count] }
-          result table: 8, state tables: [], distinct tables: []
-        StreamExchange Hash([0]) from 5
+    StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [count] } { result table: 8, state tables: [], distinct tables: [] }
+    └──  StreamExchange Hash([0]) from 5
 
     Fragment 5
-      Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [auction_id, auction_item_name, count(bid_auction)], primary key: [$2 ASC, $0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [$expr1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
-     Table 2 { columns: [auction_id, auction_item_name, count(bid_auction), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0], read pk prefix len hint: 2 }
-     Table 3 { columns: [auction_id, auction_item_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [auction_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [bid_auction, bid__row_id], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [bid_auction, bid__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [sum0(count), count(bid_auction), count], primary key: [], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 8 { columns: [bid_auction, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name, bid_count], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 2 }
+    Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ auction_id, auction_item_name, count(bid_auction) ]
+    ├── primary key: [ $2 ASC, $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1 { columns: [ $expr1 ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 2
+    ├── columns: [ auction_id, auction_item_name, count(bid_auction), count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
+    Table 3 { columns: [ auction_id, auction_item_name ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ auction_id, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ bid_auction, bid__row_id ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ bid_auction, bid__row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ sum0(count), count(bid_auction), count ], primary key: [], value indices: [ 0, 1, 2 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 8 { columns: [ bid_auction, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction_id, auction_item_name, bid_count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
 - id: nexmark_q103
   before:
   - create_tables
@@ -1243,7 +1494,7 @@
             └─BatchExchange { order: [], dist: HashShard(bid.auction) }
               └─BatchScan { table: bid, columns: [bid.auction], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name], pk_columns: [auction_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name], stream_key: [auction_id], pk_columns: [auction_id], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: LeftSemi, predicate: auction.id = bid.auction, output: all }
       ├─StreamExchange { dist: HashShard(auction.id) }
       | └─StreamTableScan { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
@@ -1252,35 +1503,71 @@
           └─StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [count] }
             └─StreamExchange { dist: HashShard(bid.auction) }
               └─StreamTableScan { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name], pk_columns: [auction_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: LeftSemi, predicate: auction.id = bid.auction, output: all }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamProject { exprs: [bid.auction] }
-            StreamFilter { predicate: (count >= 20:Int32) }
-              StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [count] }
-                  result table: 4, state tables: [], distinct tables: []
-                StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [auction_id, auction_item_name], stream_key: [auction_id], pk_columns: [auction_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: LeftSemi, predicate: auction.id = bid.auction, output: all }
+        ├── left table: 0
+        ├── right table: 2
+        ├── left degree table: 1
+        ├── right degree table: 3
+        ├──  StreamExchange Hash([0]) from 1
+        └── StreamProject { exprs: [bid.auction] }
+            └── StreamFilter { predicate: (count >= 20:Int32) }
+                └── StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [count] }
+                    ├── result table: 4
+                    ├── state tables: []
+                    ├── distinct tables: []
+                    └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [auction_id, auction_item_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [auction_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [bid_auction], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [bid_auction, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [bid_auction, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
+    Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ auction_id, auction_item_name ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ auction_id, _degree ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 2 { columns: [ bid_auction ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3
+    ├── columns: [ bid_auction, _degree ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4
+    ├── columns: [ bid_auction, count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ auction_id, auction_item_name ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
 - id: nexmark_q104
   before:
   - create_tables
@@ -1308,7 +1595,7 @@
             └─BatchExchange { order: [], dist: HashShard(bid.auction) }
               └─BatchScan { table: bid, columns: [bid.auction], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name], pk_columns: [auction_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name], stream_key: [auction_id], pk_columns: [auction_id], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: LeftAnti, predicate: auction.id = bid.auction, output: all }
       ├─StreamExchange { dist: HashShard(auction.id) }
       | └─StreamTableScan { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
@@ -1317,35 +1604,71 @@
           └─StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [count] }
             └─StreamExchange { dist: HashShard(bid.auction) }
               └─StreamTableScan { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name], pk_columns: [auction_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: LeftAnti, predicate: auction.id = bid.auction, output: all }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamProject { exprs: [bid.auction] }
-            StreamFilter { predicate: (count < 20:Int32) }
-              StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [count] }
-                  result table: 4, state tables: [], distinct tables: []
-                StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [auction_id, auction_item_name], stream_key: [auction_id], pk_columns: [auction_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: LeftAnti, predicate: auction.id = bid.auction, output: all }
+        ├── left table: 0
+        ├── right table: 2
+        ├── left degree table: 1
+        ├── right degree table: 3
+        ├──  StreamExchange Hash([0]) from 1
+        └── StreamProject { exprs: [bid.auction] }
+            └── StreamFilter { predicate: (count < 20:Int32) }
+                └── StreamAppendOnlyHashAgg { group_key: [bid.auction], aggs: [count] }
+                    ├── result table: 4
+                    ├── state tables: []
+                    ├── distinct tables: []
+                    └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 2
-      Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [auction_id, auction_item_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [auction_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [bid_auction], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [bid_auction, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [bid_auction, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
+    Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ auction_id, auction_item_name ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ auction_id, _degree ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 2 { columns: [ bid_auction ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3
+    ├── columns: [ bid_auction, _degree ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4
+    ├── columns: [ bid_auction, count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ auction_id, auction_item_name ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
 - id: nexmark_q105
   before:
   - create_tables
@@ -1373,58 +1696,71 @@
             └─BatchExchange { order: [], dist: HashShard(bid.auction) }
               └─BatchScan { table: bid, columns: [bid.auction], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], pk_columns: [auction_id, auction_item_name], order_descs: [bid_count, auction_id, auction_item_name], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], stream_key: [auction_id, auction_item_name], pk_columns: [bid_count, auction_id, auction_item_name], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction)] }
       └─StreamTopN { order: "[count(bid.auction) DESC]", limit: 1000, offset: 0 }
         └─StreamExchange { dist: Single }
           └─StreamGroupTopN { order: "[count(bid.auction) DESC]", limit: 1000, offset: 0, group_key: [3] }
             └─StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction), Vnode(auction.id) as $expr1] }
-              └─StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction)] }
-                └─StreamHashAgg { group_key: [auction.id, auction.item_name], aggs: [count(bid.auction), count] }
-                  └─StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
-                    ├─StreamExchange { dist: HashShard(auction.id) }
-                    | └─StreamTableScan { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-                    └─StreamExchange { dist: HashShard(bid.auction) }
-                      └─StreamTableScan { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+              └─StreamHashAgg { group_key: [auction.id, auction.item_name], aggs: [count(bid.auction), count] }
+                └─StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
+                  ├─StreamExchange { dist: HashShard(auction.id) }
+                  | └─StreamTableScan { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+                  └─StreamExchange { dist: HashShard(bid.auction) }
+                    └─StreamTableScan { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], pk_columns: [auction_id, auction_item_name], order_descs: [bid_count, auction_id, auction_item_name], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction)] }
-          StreamTopN { order: "[count(bid.auction) DESC]", limit: 1000, offset: 0 }
-              state table: 0
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], stream_key: [auction_id, auction_item_name], pk_columns: [bid_count, auction_id, auction_item_name], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction)] }
+        └── StreamTopN { order: "[count(bid.auction) DESC]", limit: 1000, offset: 0 } { state table: 0 }
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamGroupTopN { order: "[count(bid.auction) DESC]", limit: 1000, offset: 0, group_key: [3] }
-          state table: 1
-        StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction), Vnode(auction.id) as $expr1] }
-          StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction)] }
-            StreamHashAgg { group_key: [auction.id, auction.item_name], aggs: [count(bid.auction), count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
-                  left table: 3, right table 5, left degree table: 4, right degree table: 6,
-                StreamExchange Hash([0]) from 2
-                StreamExchange Hash([0]) from 3
+    StreamGroupTopN { order: "[count(bid.auction) DESC]", limit: 1000, offset: 0, group_key: [3] } { state table: 1 }
+    └── StreamProject { exprs: [auction.id, auction.item_name, count(bid.auction), Vnode(auction.id) as $expr1] }
+        └── StreamHashAgg { group_key: [auction.id, auction.item_name], aggs: [count(bid.auction), count] } { result table: 2, state tables: [], distinct tables: [] }
+            └── StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all } { left table: 3, right table: 5, left degree table: 4, right degree table: 6 }
+                ├──  StreamExchange Hash([0]) from 2
+                └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: auction, columns: [auction.id, auction.item_name], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [auction_id, auction_item_name, count(bid_auction), $expr1], primary key: [$2 DESC, $0 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [auction_id, auction_item_name, count(bid_auction), $expr1], primary key: [$3 ASC, $2 DESC, $0 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1, vnode column idx: 3 }
-     Table 2 { columns: [auction_id, auction_item_name, count(bid_auction), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0], read pk prefix len hint: 2 }
-     Table 3 { columns: [auction_id, auction_item_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [auction_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [bid_auction, bid__row_id], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [bid_auction, bid__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name, bid_count], primary key: [$2 DESC, $0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 2 }
+    Chain { table: bid, columns: [bid.auction, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ auction_id, auction_item_name, count(bid_auction), $expr1 ]
+    ├── primary key: [ $2 DESC, $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ auction_id, auction_item_name, count(bid_auction), $expr1 ]
+    ├── primary key: [ $3 ASC, $2 DESC, $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: [ 0 ]
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 3
+
+    Table 2 { columns: [ auction_id, auction_item_name, count(bid_auction), count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 3 { columns: [ auction_id, auction_item_name ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ auction_id, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ bid_auction, bid__row_id ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ bid_auction, bid__row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ auction_id, auction_item_name, bid_count ], primary key: [ $2 DESC, $0 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [], read pk prefix len hint: 2 }
+
 - id: nexmark_q106
   before:
   - create_tables
@@ -1459,62 +1795,132 @@
             └─BatchExchange { order: [], dist: HashShard(bid.auction) }
               └─BatchScan { table: bid, columns: [bid.auction, bid.price, bid.date_time], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [min_final], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [min_final], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [min(min(max(bid.price)))] }
       └─StreamGlobalSimpleAgg { aggs: [min(min(max(bid.price))), count] }
         └─StreamExchange { dist: Single }
           └─StreamHashAgg { group_key: [$expr1], aggs: [min(max(bid.price)), count] }
             └─StreamProject { exprs: [auction.id, max(bid.price), Vnode(auction.id) as $expr1] }
-              └─StreamProject { exprs: [auction.id, max(bid.price)] }
-                └─StreamHashAgg { group_key: [auction.id], aggs: [max(bid.price), count] }
-                  └─StreamProject { exprs: [auction.id, bid.price, bid._row_id] }
-                    └─StreamFilter { predicate: (bid.date_time >= auction.date_time) AND (bid.date_time <= auction.expires) }
-                      └─StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
-                        ├─StreamExchange { dist: HashShard(auction.id) }
-                        | └─StreamTableScan { table: auction, columns: [auction.id, auction.date_time, auction.expires], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-                        └─StreamExchange { dist: HashShard(bid.auction) }
-                          └─StreamTableScan { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-  stream_dist_plan: |
+              └─StreamHashAgg { group_key: [auction.id], aggs: [max(bid.price), count] }
+                └─StreamProject { exprs: [auction.id, bid.price, bid._row_id] }
+                  └─StreamFilter { predicate: (bid.date_time >= auction.date_time) AND (bid.date_time <= auction.expires) }
+                    └─StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
+                      ├─StreamExchange { dist: HashShard(auction.id) }
+                      | └─StreamTableScan { table: auction, columns: [auction.id, auction.date_time, auction.expires], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+                      └─StreamExchange { dist: HashShard(bid.auction) }
+                        └─StreamTableScan { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [min_final], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [min(min(max(bid.price)))] }
-          StreamGlobalSimpleAgg { aggs: [min(min(max(bid.price))), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [min_final], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [min(min(max(bid.price)))] }
+        └── StreamGlobalSimpleAgg { aggs: [min(min(max(bid.price))), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamHashAgg { group_key: [$expr1], aggs: [min(max(bid.price)), count] }
-          result table: 3, state tables: [2], distinct tables: []
-        StreamProject { exprs: [auction.id, max(bid.price), Vnode(auction.id) as $expr1] }
-          StreamProject { exprs: [auction.id, max(bid.price)] }
-            StreamHashAgg { group_key: [auction.id], aggs: [max(bid.price), count] }
-                result table: 5, state tables: [4], distinct tables: []
-              StreamProject { exprs: [auction.id, bid.price, bid._row_id] }
-                StreamFilter { predicate: (bid.date_time >= auction.date_time) AND (bid.date_time <= auction.expires) }
-                  StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
-                      left table: 6, right table 8, left degree table: 7, right degree table: 9,
-                    StreamExchange Hash([0]) from 2
-                    StreamExchange Hash([0]) from 3
+    StreamHashAgg { group_key: [$expr1], aggs: [min(max(bid.price)), count] }
+    ├── result table: 3
+    ├── state tables: [ 2 ]
+    ├── distinct tables: []
+    └── StreamProject { exprs: [auction.id, max(bid.price), Vnode(auction.id) as $expr1] }
+        └── StreamHashAgg { group_key: [auction.id], aggs: [max(bid.price), count] }
+            ├── result table: 5
+            ├── state tables: [ 4 ]
+            ├── distinct tables: []
+            └── StreamProject { exprs: [auction.id, bid.price, bid._row_id] }
+                └── StreamFilter { predicate: (bid.date_time >= auction.date_time) AND (bid.date_time <= auction.expires) }
+                    └── StreamHashJoin { type: Inner, predicate: auction.id = bid.auction, output: all }
+                        ├── left table: 6
+                        ├── right table: 8
+                        ├── left degree table: 7
+                        ├── right degree table: 9
+                        ├──  StreamExchange Hash([0]) from 2
+                        └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      Chain { table: auction, columns: [auction.id, auction.date_time, auction.expires], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: auction, columns: [auction.id, auction.date_time, auction.expires], pk: [auction.id], dist: UpstreamHashShard(auction.id) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      Chain { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [min(max(bid_price)), $expr1], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [min(min(max(bid_price))), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 2 { columns: [$expr1, max(bid_price), auction_id], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [1, 2], distribution key: [2], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 3 { columns: [$expr1, min(max(bid_price)), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 4 { columns: [auction_id, bid_price, bid__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [auction_id, max(bid_price), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [auction_id, auction_date_time, auction_expires], primary key: [$0 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [auction_id, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [bid_auction, bid_price, bid_date_time, bid__row_id], primary key: [$0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [bid_auction, bid__row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [min_final], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    Chain { table: bid, columns: [bid.auction, bid.price, bid.date_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ min(max(bid_price)), $expr1 ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ min(min(max(bid_price))), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 2
+    ├── columns: [ $expr1, max(bid_price), auction_id ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 2 ]
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 0
+
+    Table 3
+    ├── columns: [ $expr1, min(max(bid_price)), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: []
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 0
+
+    Table 4
+    ├── columns: [ auction_id, bid_price, bid__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 5
+    ├── columns: [ auction_id, max(bid_price), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 6
+    ├── columns: [ auction_id, auction_date_time, auction_expires ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 7
+    ├── columns: [ auction_id, _degree ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 8
+    ├── columns: [ bid_auction, bid_price, bid_date_time, bid__row_id ]
+    ├── primary key: [ $0 ASC, $3 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 9
+    ├── columns: [ bid_auction, bid__row_id, _degree ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294 { columns: [ min_final ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
diff --git a/src/frontend/planner_test/tests/testdata/nexmark_source.yaml b/src/frontend/planner_test/tests/testdata/nexmark_source.yaml
index 9e2b78cf7450f..24228d1179e06 100644
--- a/src/frontend/planner_test/tests/testdata/nexmark_source.yaml
+++ b/src/frontend/planner_test/tests/testdata/nexmark_source.yaml
@@ -2,24 +2,25 @@
 - id: create_sources
   sql: |
     create source auction (
-      id INTEGER,
+      id BIGINT,
       item_name VARCHAR,
       description VARCHAR,
-      initial_bid INTEGER,
-      reserve INTEGER,
+      initial_bid BIGINT,
+      reserve BIGINT,
       date_time TIMESTAMP,
       expires TIMESTAMP,
-      seller INTEGER,
-      category INTEGER)
+      seller BIGINT,
+      category BIGINT,
+      extra VARCHAR)
     with (
       connector = 'nexmark',
       nexmark.table.type = 'Auction'
     );
 
     create source bid (
-      auction INTEGER,
-      bidder INTEGER,
-      price INTEGER,
+      auction BIGINT,
+      bidder BIGINT,
+      price BIGINT,
       channel VARCHAR,
       url VARCHAR,
       date_time TIMESTAMP,
@@ -30,13 +31,14 @@
     );
 
     create source person (
-      id INTEGER,
+      id BIGINT,
       name VARCHAR,
       email_address VARCHAR,
       credit_card VARCHAR,
       city VARCHAR,
       state VARCHAR,
-      date_time TIMESTAMP)
+      date_time TIMESTAMP,
+      extra VARCHAR)
     with (
       connector = 'nexmark',
       nexmark.table.type = 'Person'
@@ -51,25 +53,28 @@
     └─BatchProject { exprs: [auction, bidder, price, date_time] }
       └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, date_time, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-    └─StreamExchange { dist: HashShard(_row_id) }
-      └─StreamProject { exprs: [auction, bidder, price, date_time, _row_id] }
-        └─StreamRowIdGen { row_id_index: 7 }
-          └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+    StreamMaterialize { columns: [auction, bidder, price, date_time, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [auction, bidder, price, date_time, _row_id] }
+      └─StreamRowIdGen { row_id_index: 7 }
+        └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, date_time, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([4]) from 1
+    StreamMaterialize { columns: [auction, bidder, price, date_time, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [auction, bidder, price, date_time, _row_id] }
+        └── StreamRowIdGen { row_id_index: 7 }
+            └── StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+                └── source state table: 0
+
+    Table 0 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, date_time, _row_id ]
+    ├── primary key: [ $4 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4 ]
+    ├── distribution key: [ 4 ]
+    └── read pk prefix len hint: 1
 
-    Fragment 1
-      StreamProject { exprs: [auction, bidder, price, date_time, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 0
-
-     Table 0 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, bidder, price, date_time, _row_id], primary key: [$4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [4], read pk prefix len hint: 1 }
 - id: nexmark_q1
   before:
   - create_sources
@@ -85,25 +90,28 @@
     └─BatchProject { exprs: [auction, bidder, (0.908:Decimal * price) as $expr1, date_time] }
       └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, date_time, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-    └─StreamExchange { dist: HashShard(_row_id) }
-      └─StreamProject { exprs: [auction, bidder, (0.908:Decimal * price) as $expr1, date_time, _row_id] }
-        └─StreamRowIdGen { row_id_index: 7 }
-          └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+    StreamMaterialize { columns: [auction, bidder, price, date_time, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [auction, bidder, (0.908:Decimal * price) as $expr1, date_time, _row_id] }
+      └─StreamRowIdGen { row_id_index: 7 }
+        └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, date_time, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([4]) from 1
-
-    Fragment 1
-      StreamProject { exprs: [auction, bidder, (0.908:Decimal * price) as $expr1, date_time, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 0
+    StreamMaterialize { columns: [auction, bidder, price, date_time, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [auction, bidder, (0.908:Decimal * price) as $expr1, date_time, _row_id] }
+        └── StreamRowIdGen { row_id_index: 7 }
+            └── StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+                └── source state table: 0
+
+    Table 0 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, date_time, _row_id ]
+    ├── primary key: [ $4 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4 ]
+    ├── distribution key: [ 4 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, bidder, price, date_time, _row_id], primary key: [$4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [4], read pk prefix len hint: 1 }
 - id: nexmark_q2
   before:
   - create_sources
@@ -114,27 +122,23 @@
       └─BatchFilter { predicate: (((((auction = 1007:Int32) OR (auction = 1020:Int32)) OR (auction = 2001:Int32)) OR (auction = 2019:Int32)) OR (auction = 2087:Int32)) }
         └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, price, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-    └─StreamExchange { dist: HashShard(_row_id) }
-      └─StreamProject { exprs: [auction, price, _row_id] }
-        └─StreamFilter { predicate: (((((auction = 1007:Int32) OR (auction = 1020:Int32)) OR (auction = 2001:Int32)) OR (auction = 2019:Int32)) OR (auction = 2087:Int32)) }
-          └─StreamRowIdGen { row_id_index: 7 }
-            └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+    StreamMaterialize { columns: [auction, price, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [auction, price, _row_id] }
+      └─StreamFilter { predicate: (((((auction = 1007:Int32) OR (auction = 1020:Int32)) OR (auction = 2001:Int32)) OR (auction = 2019:Int32)) OR (auction = 2087:Int32)) }
+        └─StreamRowIdGen { row_id_index: 7 }
+          └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, price, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([2]) from 1
+    StreamMaterialize { columns: [auction, price, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamProject { exprs: [auction, price, _row_id] }
+        └── StreamFilter { predicate: (((((auction = 1007:Int32) OR (auction = 1020:Int32)) OR (auction = 2001:Int32)) OR (auction = 2019:Int32)) OR (auction = 2087:Int32)) }
+            └── StreamRowIdGen { row_id_index: 7 }
+                └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 0 }
+
+    Table 0 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ auction, price, _row_id ], primary key: [ $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
 
-    Fragment 1
-      StreamProject { exprs: [auction, price, _row_id] }
-        StreamFilter { predicate: (((((auction = 1007:Int32) OR (auction = 1020:Int32)) OR (auction = 2001:Int32)) OR (auction = 2019:Int32)) OR (auction = 2087:Int32)) }
-          StreamRowIdGen { row_id_index: 7 }
-            StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-                source state table: 0
-
-     Table 0 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, price, _row_id], primary key: [$2 ASC], value indices: [0, 1, 2], distribution key: [2], read pk prefix len hint: 1 }
 - id: nexmark_q3
   before:
   - create_sources
@@ -151,54 +155,63 @@
       ├─BatchExchange { order: [], dist: HashShard(seller) }
       | └─BatchProject { exprs: [id, seller] }
       |   └─BatchFilter { predicate: (category = 10:Int32) }
-      |     └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+      |     └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
       └─BatchExchange { order: [], dist: HashShard(id) }
         └─BatchProject { exprs: [id, name, city, state] }
           └─BatchFilter { predicate: (((state = 'or':Varchar) OR (state = 'id':Varchar)) OR (state = 'ca':Varchar)) }
-            └─BatchSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "_row_id"], filter: (None, None) }
+            └─BatchSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [name, city, state, id, _row_id(hidden), seller(hidden), _row_id#1(hidden)], pk_columns: [_row_id, _row_id#1, seller], pk_conflict: "no check" }
+    StreamMaterialize { columns: [name, city, state, id, _row_id(hidden), seller(hidden), _row_id#1(hidden)], stream_key: [_row_id, _row_id#1, seller], pk_columns: [_row_id, _row_id#1, seller], pk_conflict: "NoCheck" }
     └─StreamAppendOnlyHashJoin { type: Inner, predicate: seller = id, output: [name, city, state, id, _row_id, seller, _row_id] }
       ├─StreamExchange { dist: HashShard(seller) }
       | └─StreamProject { exprs: [id, seller, _row_id] }
       |   └─StreamFilter { predicate: (category = 10:Int32) }
-      |     └─StreamRowIdGen { row_id_index: 9 }
-      |       └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
+      |     └─StreamRowIdGen { row_id_index: 10 }
+      |       └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
       └─StreamExchange { dist: HashShard(id) }
         └─StreamProject { exprs: [id, name, city, state, _row_id] }
           └─StreamFilter { predicate: (((state = 'or':Varchar) OR (state = 'id':Varchar)) OR (state = 'ca':Varchar)) }
-            └─StreamRowIdGen { row_id_index: 7 }
-              └─StreamSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "_row_id"] }
-  stream_dist_plan: |
+            └─StreamRowIdGen { row_id_index: 8 }
+              └─StreamSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [name, city, state, id, _row_id(hidden), seller(hidden), _row_id#1(hidden)], pk_columns: [_row_id, _row_id#1, seller], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamAppendOnlyHashJoin { type: Inner, predicate: seller = id, output: [name, city, state, id, _row_id, seller, _row_id] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([1]) from 1
-          StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [name, city, state, id, _row_id(hidden), seller(hidden), _row_id#1(hidden)], stream_key: [_row_id, _row_id#1, seller], pk_columns: [_row_id, _row_id#1, seller], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamAppendOnlyHashJoin { type: Inner, predicate: seller = id, output: [name, city, state, id, _row_id, seller, _row_id] } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([1]) from 1
+        └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      StreamProject { exprs: [id, seller, _row_id] }
-        StreamFilter { predicate: (category = 10:Int32) }
-          StreamRowIdGen { row_id_index: 9 }
-            StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-                source state table: 4
+    StreamProject { exprs: [id, seller, _row_id] }
+    └── StreamFilter { predicate: (category = 10:Int32) }
+        └── StreamRowIdGen { row_id_index: 10 }
+            └──  StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] } { source state table: 4 }
 
     Fragment 2
-      StreamProject { exprs: [id, name, city, state, _row_id] }
-        StreamFilter { predicate: (((state = 'or':Varchar) OR (state = 'id':Varchar)) OR (state = 'ca':Varchar)) }
-          StreamRowIdGen { row_id_index: 7 }
-            StreamSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "_row_id"] }
-                source state table: 5
-
-     Table 0 { columns: [id, seller, _row_id], primary key: [$1 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [1], read pk prefix len hint: 1 }
-     Table 1 { columns: [seller, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [id, name, city, state, _row_id], primary key: [$0 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 5 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [name, city, state, id, _row_id, seller, _row_id#1], primary key: [$4 ASC, $6 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [5], read pk prefix len hint: 3 }
+    StreamProject { exprs: [id, name, city, state, _row_id] }
+    └── StreamFilter { predicate: (((state = 'or':Varchar) OR (state = 'id':Varchar)) OR (state = 'ca':Varchar)) }
+        └── StreamRowIdGen { row_id_index: 8 }
+            └──  StreamSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "extra", "_row_id"] } { source state table: 5 }
+
+    Table 0 { columns: [ id, seller, _row_id ], primary key: [ $1 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ seller, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ id, name, city, state, _row_id ], primary key: [ $0 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ name, city, state, id, _row_id, seller, _row_id#1 ]
+    ├── primary key: [ $4 ASC, $6 ASC, $5 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6 ]
+    ├── distribution key: [ 5 ]
+    └── read pk prefix len hint: 3
+
 - id: nexmark_q4
   before:
   - create_sources
@@ -215,20 +228,20 @@
     GROUP BY Q.category;
   batch_plan: |
     BatchExchange { order: [], dist: Single }
-    └─BatchProject { exprs: [category, (sum(max(price))::Decimal / count(max(price))) as $expr1] }
+    └─BatchProject { exprs: [category, (sum(max(price)) / count(max(price))) as $expr1] }
       └─BatchHashAgg { group_key: [category], aggs: [sum(max(price)), count(max(price))] }
         └─BatchExchange { order: [], dist: HashShard(category) }
           └─BatchHashAgg { group_key: [id, category], aggs: [max(price)] }
             └─BatchHashJoin { type: Inner, predicate: id = auction AND (date_time >= date_time) AND (date_time <= expires), output: [id, category, price] }
               ├─BatchExchange { order: [], dist: HashShard(id) }
               | └─BatchProject { exprs: [id, date_time, expires, category] }
-              |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+              |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
               └─BatchExchange { order: [], dist: HashShard(auction) }
                 └─BatchProject { exprs: [auction, price, date_time] }
                   └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [category, avg], pk_columns: [category], pk_conflict: "no check" }
-    └─StreamProject { exprs: [category, (sum(max(price))::Decimal / count(max(price))) as $expr1] }
+    StreamMaterialize { columns: [category, avg], stream_key: [category], pk_columns: [category], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [category, (sum(max(price)) / count(max(price))) as $expr1] }
       └─StreamHashAgg { group_key: [category], aggs: [sum(max(price)), count(max(price)), count] }
         └─StreamExchange { dist: HashShard(category) }
           └─StreamProject { exprs: [id, category, max(price)] }
@@ -238,53 +251,78 @@
                   └─StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all }
                     ├─StreamExchange { dist: HashShard(id) }
                     | └─StreamProject { exprs: [id, date_time, expires, category, _row_id] }
-                    |   └─StreamRowIdGen { row_id_index: 9 }
-                    |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
+                    |   └─StreamRowIdGen { row_id_index: 10 }
+                    |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
                     └─StreamExchange { dist: HashShard(auction) }
                       └─StreamProject { exprs: [auction, price, date_time, _row_id] }
                         └─StreamRowIdGen { row_id_index: 7 }
                           └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [category, avg], pk_columns: [category], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [category, (sum(max(price))::Decimal / count(max(price))) as $expr1] }
-          StreamHashAgg { group_key: [category], aggs: [sum(max(price)), count(max(price)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([1]) from 1
+    StreamMaterialize { columns: [category, avg], stream_key: [category], pk_columns: [category], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [category, (sum(max(price)) / count(max(price))) as $expr1] }
+        └── StreamHashAgg { group_key: [category], aggs: [sum(max(price)), count(max(price)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([1]) from 1
 
     Fragment 1
-      StreamProject { exprs: [id, category, max(price)] }
-        StreamAppendOnlyHashAgg { group_key: [id, category], aggs: [max(price), count] }
-            result table: 1, state tables: [], distinct tables: []
-          StreamProject { exprs: [id, category, price, _row_id, _row_id] }
-            StreamFilter { predicate: (date_time >= date_time) AND (date_time <= expires) }
-              StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all }
-                  left table: 2, right table 4, left degree table: 3, right degree table: 5,
-                StreamExchange Hash([0]) from 2
-                StreamExchange Hash([0]) from 3
+    StreamProject { exprs: [id, category, max(price)] }
+    └── StreamAppendOnlyHashAgg { group_key: [id, category], aggs: [max(price), count] }
+        ├── result table: 1
+        ├── state tables: []
+        ├── distinct tables: []
+        └── StreamProject { exprs: [id, category, price, _row_id, _row_id] }
+            └── StreamFilter { predicate: (date_time >= date_time) AND (date_time <= expires) }
+                └── StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all }
+                    ├── left table: 2
+                    ├── right table: 4
+                    ├── left degree table: 3
+                    ├── right degree table: 5
+                    ├──  StreamExchange Hash([0]) from 2
+                    └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      StreamProject { exprs: [id, date_time, expires, category, _row_id] }
-        StreamRowIdGen { row_id_index: 9 }
-          StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-              source state table: 6
+    StreamProject { exprs: [id, date_time, expires, category, _row_id] }
+    └── StreamRowIdGen { row_id_index: 10 }
+        └── StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+            └── source state table: 6
 
     Fragment 3
-      StreamProject { exprs: [auction, price, date_time, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 7
-
-     Table 0 { columns: [category, sum(max(price)), count(max(price)), count], primary key: [$0 ASC], value indices: [1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [id, category, max(price), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0], read pk prefix len hint: 2 }
-     Table 2 { columns: [id, date_time, expires, category, _row_id], primary key: [$0 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [auction, price, date_time, _row_id], primary key: [$0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [auction, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 7 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [category, avg], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
+    StreamProject { exprs: [auction, price, date_time, _row_id] }
+    └── StreamRowIdGen { row_id_index: 7 }
+        └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 7 }
+
+    Table 0
+    ├── columns: [ category, sum(max(price)), count(max(price)), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2, 3 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1 { columns: [ id, category, max(price), count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 2
+    ├── columns: [ id, date_time, expires, category, _row_id ]
+    ├── primary key: [ $0 ASC, $4 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 3 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ auction, price, date_time, _row_id ], primary key: [ $0 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ auction, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ category, avg ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: nexmark_q5
   before:
   - create_sources
@@ -338,7 +376,7 @@
                     └─BatchFilter { predicate: IsNotNull(date_time) }
                       └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], pk_columns: [auction, window_start, window_start#1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], stream_key: [auction, window_start, window_start#1], pk_columns: [auction, window_start, window_start#1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [auction, count, window_start, window_start] }
       └─StreamFilter { predicate: (count >= max(count)) }
         └─StreamHashJoin { type: Inner, predicate: window_start = window_start, output: all }
@@ -364,50 +402,55 @@
                             └─StreamFilter { predicate: IsNotNull(date_time) }
                               └─StreamRowIdGen { row_id_index: 7 }
                                 └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], pk_columns: [auction, window_start, window_start#1], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [auction, count, window_start, window_start] }
-          StreamFilter { predicate: (count >= max(count)) }
-            StreamHashJoin { type: Inner, predicate: window_start = window_start, output: all }
-                left table: 0, right table 2, left degree table: 1, right degree table: 3,
-              StreamExchange Hash([2]) from 1
-              StreamProject { exprs: [max(count), window_start] }
-                StreamHashAgg { group_key: [window_start], aggs: [max(count), count] }
-                    result table: 7, state tables: [6], distinct tables: []
-                  StreamExchange Hash([1]) from 4
+    StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], stream_key: [auction, window_start, window_start#1], pk_columns: [auction, window_start, window_start#1], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [auction, count, window_start, window_start] }
+        └── StreamFilter { predicate: (count >= max(count)) }
+            └── StreamHashJoin { type: Inner, predicate: window_start = window_start, output: all } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+                ├──  StreamExchange Hash([2]) from 1
+                └── StreamProject { exprs: [max(count), window_start] }
+                    └── StreamHashAgg { group_key: [window_start], aggs: [max(count), count] } { result table: 7, state tables: [ 6 ], distinct tables: [] }
+                        └──  StreamExchange Hash([1]) from 4
 
     Fragment 1
-      StreamProject { exprs: [auction, count, window_start] }
-        StreamExchange Hash([0, 1]) from 2
+    StreamProject { exprs: [auction, count, window_start] }
+    └──  StreamExchange Hash([0, 1]) from 2
 
     Fragment 2
-      StreamAppendOnlyHashAgg { group_key: [auction, window_start], aggs: [count] }
-          result table: 4, state tables: [], distinct tables: []
-        StreamExchange Hash([0, 1]) from 3
+    StreamAppendOnlyHashAgg { group_key: [auction, window_start], aggs: [count] } { result table: 4, state tables: [], distinct tables: [] }
+    └──  StreamExchange Hash([0, 1]) from 3
 
     Fragment 3
-      StreamHopWindow { time_col: date_time, slide: 00:00:02, size: 00:00:10, output: [auction, window_start, _row_id] }
-        StreamProject { exprs: [auction, date_time, _row_id] }
-          StreamFilter { predicate: IsNotNull(date_time) }
-            StreamRowIdGen { row_id_index: 7 }
-              StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-                  source state table: 5
+    StreamHopWindow { time_col: date_time, slide: 00:00:02, size: 00:00:10, output: [auction, window_start, _row_id] }
+    └── StreamProject { exprs: [auction, date_time, _row_id] }
+        └── StreamFilter { predicate: IsNotNull(date_time) }
+            └── StreamRowIdGen { row_id_index: 7 }
+                └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 5 }
 
     Fragment 4
-      StreamProject { exprs: [auction, window_start, count] }
-        StreamExchange Hash([0, 1]) from 2
-
-     Table 0 { columns: [auction, count, window_start], primary key: [$2 ASC, $0 ASC], value indices: [0, 1, 2], distribution key: [2], read pk prefix len hint: 1 }
-     Table 1 { columns: [window_start, auction, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [max(count), window_start], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 3 { columns: [window_start, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [auction, window_start, count], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 5 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 6 { columns: [window_start, count, auction], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [window_start, max(count), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, num, window_start, window_start#1], primary key: [$0 ASC, $2 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [2], read pk prefix len hint: 3 }
+    StreamProject { exprs: [auction, window_start, count] }
+    └──  StreamExchange Hash([0, 1]) from 2
+
+    Table 0 { columns: [ auction, count, window_start ], primary key: [ $2 ASC, $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ window_start, auction, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ max(count), window_start ], primary key: [ $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ window_start, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ auction, window_start, count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 5 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ window_start, count, auction ], primary key: [ $0 ASC, $1 DESC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ window_start, max(count), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ auction, num, window_start, window_start#1 ], primary key: [ $0 ASC, $2 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 2 ], read pk prefix len hint: 3 }
+
 - id: nexmark_q6
   before:
   - create_sources
@@ -462,7 +505,7 @@
               └─BatchProject { exprs: [(TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr1, price] }
                 └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, price, bidder, date_time, _row_id(hidden), $expr1(hidden)], pk_columns: [_row_id, $expr1, price], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, price, bidder, date_time, _row_id(hidden), $expr1(hidden)], stream_key: [_row_id, $expr1, price], pk_columns: [_row_id, $expr1, price], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [auction, price, bidder, date_time, _row_id, $expr1] }
       └─StreamFilter { predicate: (date_time >= $expr2) AND (date_time <= $expr1) }
         └─StreamHashJoin { type: Inner, predicate: price = max(price), output: all }
@@ -481,44 +524,53 @@
                       └─StreamProject { exprs: [auction, bidder, price, date_time, _row_id] }
                         └─StreamRowIdGen { row_id_index: 7 }
                           └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, price, bidder, date_time, _row_id(hidden), $expr1(hidden)], pk_columns: [_row_id, $expr1, price], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [auction, price, bidder, date_time, _row_id, $expr1] }
-          StreamFilter { predicate: (date_time >= $expr2) AND (date_time <= $expr1) }
-            StreamHashJoin { type: Inner, predicate: price = max(price), output: all }
-                left table: 0, right table 2, left degree table: 1, right degree table: 3,
-              StreamExchange Hash([2]) from 1
-              StreamExchange Hash([0]) from 3
+    StreamMaterialize { columns: [auction, price, bidder, date_time, _row_id(hidden), $expr1(hidden)], stream_key: [_row_id, $expr1, price], pk_columns: [_row_id, $expr1, price], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [auction, price, bidder, date_time, _row_id, $expr1] }
+        └── StreamFilter { predicate: (date_time >= $expr2) AND (date_time <= $expr1) }
+            └── StreamHashJoin { type: Inner, predicate: price = max(price), output: all } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+                ├──  StreamExchange Hash([2]) from 1
+                └──  StreamExchange Hash([0]) from 3
 
     Fragment 1
-      StreamProject { exprs: [auction, bidder, price, date_time, _row_id] }
-        StreamExchange Hash([4]) from 2
+    StreamProject { exprs: [auction, bidder, price, date_time, _row_id] }
+    └──  StreamExchange Hash([4]) from 2
 
     Fragment 2
-      StreamProject { exprs: [auction, bidder, price, date_time, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 4
+    StreamProject { exprs: [auction, bidder, price, date_time, _row_id] }
+    └── StreamRowIdGen { row_id_index: 7 }
+        └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 4 }
 
     Fragment 3
-      StreamProject { exprs: [max(price), $expr1, ($expr1 - '00:00:10':Interval) as $expr2] }
-        StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [max(price), count] }
-            result table: 5, state tables: [], distinct tables: []
-          StreamExchange Hash([0]) from 4
+    StreamProject { exprs: [max(price), $expr1, ($expr1 - '00:00:10':Interval) as $expr2] }
+    └── StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [max(price), count] } { result table: 5, state tables: [], distinct tables: [] }
+        └──  StreamExchange Hash([0]) from 4
 
     Fragment 4
-      StreamProject { exprs: [(TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr1, price, _row_id] }
-        StreamExchange Hash([4]) from 2
-
-     Table 0 { columns: [auction, bidder, price, date_time, _row_id], primary key: [$2 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2], read pk prefix len hint: 1 }
-     Table 1 { columns: [price, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [max(price), $expr1, $expr2], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [max(price), $expr1, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 5 { columns: [$expr1, max(price), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, price, bidder, date_time, _row_id, $expr1], primary key: [$4 ASC, $5 ASC, $1 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [1], read pk prefix len hint: 3 }
+    StreamProject { exprs: [(TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr1, price, _row_id] }
+    └──  StreamExchange Hash([4]) from 2
+
+    Table 0 { columns: [ auction, bidder, price, date_time, _row_id ], primary key: [ $2 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ price, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ max(price), $expr1, $expr2 ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ max(price), $expr1, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ $expr1, max(price), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction, price, bidder, date_time, _row_id, $expr1 ]
+    ├── primary key: [ $4 ASC, $5 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 3
+
 - id: nexmark_q8
   before:
   - create_sources
@@ -562,66 +614,70 @@
       | └─BatchHashAgg { group_key: [id, name, $expr1, $expr2], aggs: [] }
       |   └─BatchExchange { order: [], dist: HashShard(id, name, $expr1, $expr2) }
       |     └─BatchProject { exprs: [id, name, TumbleStart(date_time, '00:00:10':Interval) as $expr1, (TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr2] }
-      |       └─BatchSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "_row_id"], filter: (None, None) }
+      |       └─BatchSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "extra", "_row_id"], filter: (None, None) }
       └─BatchHashAgg { group_key: [seller, $expr3, $expr4], aggs: [] }
         └─BatchExchange { order: [], dist: HashShard(seller, $expr3, $expr4) }
           └─BatchProject { exprs: [seller, TumbleStart(date_time, '00:00:10':Interval) as $expr3, (TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr4] }
-            └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+            └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [id, name, starttime, $expr2(hidden), seller(hidden), $expr3(hidden), $expr4(hidden)], pk_columns: [id, name, starttime, $expr2, seller, $expr3, $expr4], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, name, starttime, $expr2(hidden), seller(hidden), $expr3(hidden), $expr4(hidden)], stream_key: [id, name, starttime, $expr2, seller, $expr3, $expr4], pk_columns: [id, name, starttime, $expr2, seller, $expr3, $expr4], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: id = seller AND $expr1 = $expr3 AND $expr2 = $expr4, output: all }
       ├─StreamExchange { dist: HashShard(id, $expr1, $expr2) }
       | └─StreamProject { exprs: [id, name, $expr1, $expr2] }
       |   └─StreamAppendOnlyHashAgg { group_key: [id, name, $expr1, $expr2], aggs: [count] }
       |     └─StreamExchange { dist: HashShard(id, name, $expr1, $expr2) }
       |       └─StreamProject { exprs: [id, name, TumbleStart(date_time, '00:00:10':Interval) as $expr1, (TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr2, _row_id] }
-      |         └─StreamRowIdGen { row_id_index: 7 }
-      |           └─StreamSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "_row_id"] }
+      |         └─StreamRowIdGen { row_id_index: 8 }
+      |           └─StreamSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "extra", "_row_id"] }
       └─StreamProject { exprs: [seller, $expr3, $expr4] }
         └─StreamAppendOnlyHashAgg { group_key: [seller, $expr3, $expr4], aggs: [count] }
           └─StreamExchange { dist: HashShard(seller, $expr3, $expr4) }
             └─StreamProject { exprs: [seller, TumbleStart(date_time, '00:00:10':Interval) as $expr3, (TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr4, _row_id] }
-              └─StreamRowIdGen { row_id_index: 9 }
-                └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-  stream_dist_plan: |
+              └─StreamRowIdGen { row_id_index: 10 }
+                └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [id, name, starttime, $expr2(hidden), seller(hidden), $expr3(hidden), $expr4(hidden)], pk_columns: [id, name, starttime, $expr2, seller, $expr3, $expr4], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: Inner, predicate: id = seller AND $expr1 = $expr3 AND $expr2 = $expr4, output: all }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0, 2, 3]) from 1
-          StreamProject { exprs: [seller, $expr3, $expr4] }
-            StreamAppendOnlyHashAgg { group_key: [seller, $expr3, $expr4], aggs: [count] }
-                result table: 6, state tables: [], distinct tables: []
-              StreamExchange Hash([0, 1, 2]) from 3
+    StreamMaterialize { columns: [id, name, starttime, $expr2(hidden), seller(hidden), $expr3(hidden), $expr4(hidden)], stream_key: [id, name, starttime, $expr2, seller, $expr3, $expr4], pk_columns: [id, name, starttime, $expr2, seller, $expr3, $expr4], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: Inner, predicate: id = seller AND $expr1 = $expr3 AND $expr2 = $expr4, output: all } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([0, 2, 3]) from 1
+        └── StreamProject { exprs: [seller, $expr3, $expr4] }
+            └── StreamAppendOnlyHashAgg { group_key: [seller, $expr3, $expr4], aggs: [count] } { result table: 6, state tables: [], distinct tables: [] }
+                └──  StreamExchange Hash([0, 1, 2]) from 3
 
     Fragment 1
-      StreamProject { exprs: [id, name, $expr1, $expr2] }
-        StreamAppendOnlyHashAgg { group_key: [id, name, $expr1, $expr2], aggs: [count] }
-            result table: 4, state tables: [], distinct tables: []
-          StreamExchange Hash([0, 1, 2, 3]) from 2
+    StreamProject { exprs: [id, name, $expr1, $expr2] }
+    └── StreamAppendOnlyHashAgg { group_key: [id, name, $expr1, $expr2], aggs: [count] } { result table: 4, state tables: [], distinct tables: [] }
+        └──  StreamExchange Hash([0, 1, 2, 3]) from 2
 
     Fragment 2
-      StreamProject { exprs: [id, name, TumbleStart(date_time, '00:00:10':Interval) as $expr1, (TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr2, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "_row_id"] }
-              source state table: 5
+    StreamProject { exprs: [id, name, TumbleStart(date_time, '00:00:10':Interval) as $expr1, (TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr2, _row_id] }
+    └── StreamRowIdGen { row_id_index: 8 }
+        └──  StreamSource { source: "person", columns: ["id", "name", "email_address", "credit_card", "city", "state", "date_time", "extra", "_row_id"] } { source state table: 5 }
 
     Fragment 3
-      StreamProject { exprs: [seller, TumbleStart(date_time, '00:00:10':Interval) as $expr3, (TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr4, _row_id] }
-        StreamRowIdGen { row_id_index: 9 }
-          StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-              source state table: 7
-
-     Table 0 { columns: [id, name, $expr1, $expr2], primary key: [$0 ASC, $2 ASC, $3 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [0, 2, 3], read pk prefix len hint: 3 }
-     Table 1 { columns: [id, $expr1, $expr2, name, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 2 { columns: [seller, $expr3, $expr4], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 3 { columns: [seller, $expr3, $expr4, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 4 { columns: [id, name, $expr1, $expr2, count], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0, 1, 2, 3], read pk prefix len hint: 4 }
-     Table 5 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 6 { columns: [seller, $expr3, $expr4, count], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 7 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [id, name, starttime, $expr2, seller, $expr3, $expr4], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [0, 2, 3], read pk prefix len hint: 7 }
+    StreamProject { exprs: [seller, TumbleStart(date_time, '00:00:10':Interval) as $expr3, (TumbleStart(date_time, '00:00:10':Interval) + '00:00:10':Interval) as $expr4, _row_id] }
+    └── StreamRowIdGen { row_id_index: 10 }
+        └──  StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] } { source state table: 7 }
+
+    Table 0 { columns: [ id, name, $expr1, $expr2 ], primary key: [ $0 ASC, $2 ASC, $3 ASC, $1 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0, 2, 3 ], read pk prefix len hint: 3 }
+
+    Table 1 { columns: [ id, $expr1, $expr2, name, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 2 { columns: [ seller, $expr3, $expr4 ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 3 { columns: [ seller, $expr3, $expr4, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 4 { columns: [ id, name, $expr1, $expr2, count ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0, 1, 2, 3 ], read pk prefix len hint: 4 }
+
+    Table 5 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ seller, $expr3, $expr4, count ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 7 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ id, name, starttime, $expr2, seller, $expr3, $expr4 ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 0, 2, 3 ], read pk prefix len hint: 7 }
+
 - id: nexmark_q9
   before:
   - create_sources
@@ -639,17 +695,17 @@
   logical_plan: |
     LogicalProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, date_time] }
     └─LogicalFilter { predicate: (ROW_NUMBER <= 1:Int32) }
-      └─LogicalProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, date_time, ROW_NUMBER] }
+      └─LogicalProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, extra, auction, bidder, price, date_time, ROW_NUMBER] }
         └─LogicalOverAgg { window_function: ROW_NUMBER() OVER(PARTITION BY id ORDER BY price DESC, date_time ASC) }
           └─LogicalFilter { predicate: (id = auction) AND (date_time >= date_time) AND (date_time <= expires) }
             └─LogicalJoin { type: Inner, on: true, output: all }
-              ├─LogicalSource { source: auction, columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id], time_range: [(Unbounded, Unbounded)] }
+              ├─LogicalSource { source: auction, columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, extra, _row_id], time_range: [(Unbounded, Unbounded)] }
               └─LogicalSource { source: bid, columns: [auction, bidder, price, channel, url, date_time, extra, _row_id], time_range: [(Unbounded, Unbounded)] }
   optimized_logical_plan_for_batch: |
     LogicalProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, date_time] }
     └─LogicalTopN { order: "[price DESC, date_time ASC]", limit: 1, offset: 0, group_key: [0] }
       └─LogicalJoin { type: Inner, on: (id = auction) AND (date_time >= date_time) AND (date_time <= expires), output: all }
-        ├─LogicalSource { source: auction, columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id], time_range: [(Unbounded, Unbounded)] }
+        ├─LogicalSource { source: auction, columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, extra, _row_id], time_range: [(Unbounded, Unbounded)] }
         └─LogicalSource { source: bid, columns: [auction, bidder, price, channel, url, date_time, extra, _row_id], time_range: [(Unbounded, Unbounded)] }
   batch_plan: |
     BatchExchange { order: [], dist: Single }
@@ -657,52 +713,66 @@
       └─BatchGroupTopN { order: "[price DESC, date_time ASC]", limit: 1, offset: 0, group_key: [0] }
         └─BatchHashJoin { type: Inner, predicate: id = auction AND (date_time >= date_time) AND (date_time <= expires), output: all }
           ├─BatchExchange { order: [], dist: HashShard(id) }
-          | └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+          | └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
           └─BatchExchange { order: [], dist: HashShard(auction) }
             └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, _row_id(hidden), _row_id#1(hidden)], pk_columns: [_row_id, _row_id#1, id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, _row_id(hidden), _row_id#1(hidden)], stream_key: [_row_id, _row_id#1, id], pk_columns: [_row_id, _row_id#1, id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, date_time, _row_id, _row_id] }
       └─StreamAppendOnlyGroupTopN { order: "[price DESC, date_time ASC]", limit: 1, offset: 0, group_key: [0] }
         └─StreamFilter { predicate: (date_time >= date_time) AND (date_time <= expires) }
           └─StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all }
             ├─StreamExchange { dist: HashShard(id) }
-            | └─StreamRowIdGen { row_id_index: 9 }
-            |   └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
+            | └─StreamRowIdGen { row_id_index: 10 }
+            |   └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
             └─StreamExchange { dist: HashShard(auction) }
               └─StreamRowIdGen { row_id_index: 7 }
                 └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, _row_id(hidden), _row_id#1(hidden)], pk_columns: [_row_id, _row_id#1, id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, date_time, _row_id, _row_id] }
-          StreamAppendOnlyGroupTopN { order: "[price DESC, date_time ASC]", limit: 1, offset: 0, group_key: [0] }
-              state table: 0
-            StreamFilter { predicate: (date_time >= date_time) AND (date_time <= expires) }
-              StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all }
-                  left table: 1, right table 3, left degree table: 2, right degree table: 4,
-                StreamExchange Hash([0]) from 1
-                StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, _row_id(hidden), _row_id#1(hidden)], stream_key: [_row_id, _row_id#1, id], pk_columns: [_row_id, _row_id#1, id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, date_time, _row_id, _row_id] }
+        └── StreamAppendOnlyGroupTopN { order: "[price DESC, date_time ASC]", limit: 1, offset: 0, group_key: [0] } { state table: 0 }
+            └── StreamFilter { predicate: (date_time >= date_time) AND (date_time <= expires) }
+                └── StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all } { left table: 1, right table: 3, left degree table: 2, right degree table: 4 }
+                    ├──  StreamExchange Hash([0]) from 1
+                    └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      StreamRowIdGen { row_id_index: 9 }
-        StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-            source state table: 5
+    StreamRowIdGen { row_id_index: 10 }
+    └──  StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] } { source state table: 5 }
 
     Fragment 2
-      StreamRowIdGen { row_id_index: 7 }
-        StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-            source state table: 6
-
-     Table 0 { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id, auction, bidder, price, channel, url, date_time_0, extra, _row_id_0], primary key: [$0 ASC, $12 DESC, $15 ASC, $9 ASC, $17 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id], primary key: [$0 ASC, $9 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [auction, bidder, price, channel, url, date_time, extra, _row_id], primary key: [$0 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [auction, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 6 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, _row_id, _row_id#1], primary key: [$13 ASC, $14 ASC, $0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], distribution key: [0], read pk prefix len hint: 3 }
+    StreamRowIdGen { row_id_index: 7 }
+    └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 6 }
+
+    Table 0
+    ├── columns: [ id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, extra, _row_id, auction, bidder, price, channel, url, date_time_0, extra_0, _row_id_0 ]
+    ├── primary key: [ $0 ASC, $13 DESC, $16 ASC, $10 ASC, $18 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1 { columns: [ id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, extra, _row_id ], primary key: [ $0 ASC, $10 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ auction, bidder, price, channel, url, date_time, extra, _row_id ], primary key: [ $0 ASC, $7 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ auction, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, auction, bidder, price, bid_date_time, _row_id, _row_id#1 ]
+    ├── primary key: [ $13 ASC, $14 ASC, $0 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 3
+
 - id: nexmark_q10
   before:
   - create_sources
@@ -713,25 +783,27 @@
     └─BatchProject { exprs: [auction, bidder, price, date_time, ToChar(date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(date_time, 'HH:MI':Varchar) as $expr2] }
       └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, date_time, date, time, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-    └─StreamExchange { dist: HashShard(_row_id) }
-      └─StreamProject { exprs: [auction, bidder, price, date_time, ToChar(date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(date_time, 'HH:MI':Varchar) as $expr2, _row_id] }
-        └─StreamRowIdGen { row_id_index: 7 }
-          └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+    StreamMaterialize { columns: [auction, bidder, price, date_time, date, time, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [auction, bidder, price, date_time, ToChar(date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(date_time, 'HH:MI':Varchar) as $expr2, _row_id] }
+      └─StreamRowIdGen { row_id_index: 7 }
+        └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, date_time, date, time, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([6]) from 1
+    StreamMaterialize { columns: [auction, bidder, price, date_time, date, time, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [auction, bidder, price, date_time, ToChar(date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(date_time, 'HH:MI':Varchar) as $expr2, _row_id] }
+        └── StreamRowIdGen { row_id_index: 7 }
+            └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 0 }
 
-    Fragment 1
-      StreamProject { exprs: [auction, bidder, price, date_time, ToChar(date_time, 'YYYY-MM-DD':Varchar) as $expr1, ToChar(date_time, 'HH:MI':Varchar) as $expr2, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 0
+    Table 0 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, date_time, date, time, _row_id ]
+    ├── primary key: [ $6 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6 ]
+    ├── distribution key: [ 6 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, bidder, price, date_time, date, time, _row_id], primary key: [$6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [6], read pk prefix len hint: 1 }
 - id: nexmark_q11
   before:
   - create_sources
@@ -807,27 +879,23 @@
       └─BatchFilter { predicate: ((0.908:Decimal * price) > 1000000:Int32) AND ((0.908:Decimal * price) < 50000000:Int32) }
         └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, bidtimetype, date_time, extra, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-    └─StreamExchange { dist: HashShard(_row_id) }
-      └─StreamProject { exprs: [auction, bidder, (0.908:Decimal * price) as $expr1, Case(((Extract('HOUR':Varchar, date_time) >= 8:Int32) AND (Extract('HOUR':Varchar, date_time) <= 18:Int32)), 'dayTime':Varchar, ((Extract('HOUR':Varchar, date_time) <= 6:Int32) OR (Extract('HOUR':Varchar, date_time) >= 20:Int32)), 'nightTime':Varchar, 'otherTime':Varchar) as $expr2, date_time, extra, _row_id] }
-        └─StreamFilter { predicate: ((0.908:Decimal * price) > 1000000:Int32) AND ((0.908:Decimal * price) < 50000000:Int32) }
-          └─StreamRowIdGen { row_id_index: 7 }
-            └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+    StreamMaterialize { columns: [auction, bidder, price, bidtimetype, date_time, extra, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [auction, bidder, (0.908:Decimal * price) as $expr1, Case(((Extract('HOUR':Varchar, date_time) >= 8:Int32) AND (Extract('HOUR':Varchar, date_time) <= 18:Int32)), 'dayTime':Varchar, ((Extract('HOUR':Varchar, date_time) <= 6:Int32) OR (Extract('HOUR':Varchar, date_time) >= 20:Int32)), 'nightTime':Varchar, 'otherTime':Varchar) as $expr2, date_time, extra, _row_id] }
+      └─StreamFilter { predicate: ((0.908:Decimal * price) > 1000000:Int32) AND ((0.908:Decimal * price) < 50000000:Int32) }
+        └─StreamRowIdGen { row_id_index: 7 }
+          └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, bidtimetype, date_time, extra, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([6]) from 1
+    StreamMaterialize { columns: [auction, bidder, price, bidtimetype, date_time, extra, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamProject { exprs: [auction, bidder, (0.908:Decimal * price) as $expr1, Case(((Extract('HOUR':Varchar, date_time) >= 8:Int32) AND (Extract('HOUR':Varchar, date_time) <= 18:Int32)), 'dayTime':Varchar, ((Extract('HOUR':Varchar, date_time) <= 6:Int32) OR (Extract('HOUR':Varchar, date_time) >= 20:Int32)), 'nightTime':Varchar, 'otherTime':Varchar) as $expr2, date_time, extra, _row_id] }
+        └── StreamFilter { predicate: ((0.908:Decimal * price) > 1000000:Int32) AND ((0.908:Decimal * price) < 50000000:Int32) }
+            └── StreamRowIdGen { row_id_index: 7 }
+                └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 0 }
+
+    Table 0 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ auction, bidder, price, bidtimetype, date_time, extra, _row_id ], primary key: [ $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 6 ], read pk prefix len hint: 1 }
 
-    Fragment 1
-      StreamProject { exprs: [auction, bidder, (0.908:Decimal * price) as $expr1, Case(((Extract('HOUR':Varchar, date_time) >= 8:Int32) AND (Extract('HOUR':Varchar, date_time) <= 18:Int32)), 'dayTime':Varchar, ((Extract('HOUR':Varchar, date_time) <= 6:Int32) OR (Extract('HOUR':Varchar, date_time) >= 20:Int32)), 'nightTime':Varchar, 'otherTime':Varchar) as $expr2, date_time, extra, _row_id] }
-        StreamFilter { predicate: ((0.908:Decimal * price) > 1000000:Int32) AND ((0.908:Decimal * price) < 50000000:Int32) }
-          StreamRowIdGen { row_id_index: 7 }
-            StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-                source state table: 0
-
-     Table 0 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, bidder, price, bidtimetype, date_time, extra, _row_id], primary key: [$6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [6], read pk prefix len hint: 1 }
 - id: nexmark_q15
   before:
   - create_sources
@@ -859,31 +927,41 @@
                 └─BatchProject { exprs: [ToChar(date_time, 'yyyy-MM-dd':Varchar) as $expr1, price, bidder, auction] }
                   └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], pk_columns: [day], pk_conflict: "no check" }
+    StreamMaterialize { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], stream_key: [day], pk_columns: [day], pk_conflict: "NoCheck" }
     └─StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32))] }
       └─StreamExchange { dist: HashShard($expr1) }
         └─StreamProject { exprs: [ToChar(date_time, 'yyyy-MM-dd':Varchar) as $expr1, price, bidder, auction, _row_id] }
           └─StreamRowIdGen { row_id_index: 7 }
             └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], pk_columns: [day], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32))] }
-            result table: 0, state tables: [], distinct tables: [(distinct key: bidder, table id: 1), (distinct key: auction, table id: 2)]
-          StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], stream_key: [day], pk_columns: [day], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamAppendOnlyHashAgg { group_key: [$expr1], aggs: [count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32))] }
+        ├── result table: 0
+        ├── state tables: []
+        ├── distinct tables: [ (distinct key: bidder, table id: 1), (distinct key: auction, table id: 2) ]
+        └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamProject { exprs: [ToChar(date_time, 'yyyy-MM-dd':Varchar) as $expr1, price, bidder, auction, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 3
-
-     Table 0 { columns: [$expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32))], primary key: [$0 ASC], value indices: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [$expr1, bidder, count_for_agg_call_4, count_for_agg_call_5, count_for_agg_call_6, count_for_agg_call_7], primary key: [$0 ASC, $1 ASC], value indices: [2, 3, 4, 5], distribution key: [0], read pk prefix len hint: 2 }
-     Table 2 { columns: [$expr1, auction, count_for_agg_call_8, count_for_agg_call_9, count_for_agg_call_10, count_for_agg_call_11], primary key: [$0 ASC, $1 ASC], value indices: [2, 3, 4, 5], distribution key: [0], read pk prefix len hint: 2 }
-     Table 3 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], primary key: [$0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], distribution key: [0], read pk prefix len hint: 1 }
+    StreamProject { exprs: [ToChar(date_time, 'yyyy-MM-dd':Varchar) as $expr1, price, bidder, auction, _row_id] }
+    └── StreamRowIdGen { row_id_index: 7 }
+        └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 3 }
+
+    Table 0
+    ├── columns: [ $expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32)) ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1 { columns: [ $expr1, bidder, count_for_agg_call_4, count_for_agg_call_5, count_for_agg_call_6, count_for_agg_call_7 ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3, 4, 5 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 2 { columns: [ $expr1, auction, count_for_agg_call_8, count_for_agg_call_9, count_for_agg_call_10, count_for_agg_call_11 ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3, 4, 5 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 3 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ day, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: nexmark_q16
   before:
   - create_sources
@@ -917,31 +995,41 @@
                 └─BatchProject { exprs: [channel, ToChar(date_time, 'yyyy-MM-dd':Varchar) as $expr1, ToChar(date_time, 'HH:mm':Varchar) as $expr2, price, bidder, auction] }
                   └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], pk_columns: [channel, day], pk_conflict: "no check" }
+    StreamMaterialize { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], stream_key: [channel, day], pk_columns: [channel, day], pk_conflict: "NoCheck" }
     └─StreamAppendOnlyHashAgg { group_key: [channel, $expr1], aggs: [max($expr2), count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32))] }
       └─StreamExchange { dist: HashShard(channel, $expr1) }
         └─StreamProject { exprs: [channel, ToChar(date_time, 'yyyy-MM-dd':Varchar) as $expr1, ToChar(date_time, 'HH:mm':Varchar) as $expr2, price, bidder, auction, _row_id] }
           └─StreamRowIdGen { row_id_index: 7 }
             └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], pk_columns: [channel, day], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamAppendOnlyHashAgg { group_key: [channel, $expr1], aggs: [max($expr2), count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32))] }
-            result table: 0, state tables: [], distinct tables: [(distinct key: bidder, table id: 1), (distinct key: auction, table id: 2)]
-          StreamExchange Hash([0, 1]) from 1
+    StreamMaterialize { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], stream_key: [channel, day], pk_columns: [channel, day], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamAppendOnlyHashAgg { group_key: [channel, $expr1], aggs: [max($expr2), count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32))] }
+        ├── result table: 0
+        ├── state tables: []
+        ├── distinct tables: [ (distinct key: bidder, table id: 1), (distinct key: auction, table id: 2) ]
+        └──  StreamExchange Hash([0, 1]) from 1
 
     Fragment 1
-      StreamProject { exprs: [channel, ToChar(date_time, 'yyyy-MM-dd':Varchar) as $expr1, ToChar(date_time, 'HH:mm':Varchar) as $expr2, price, bidder, auction, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 3
-
-     Table 0 { columns: [channel, $expr1, max($expr2), count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32))], primary key: [$0 ASC, $1 ASC], value indices: [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 1 { columns: [channel, $expr1, bidder, count_for_agg_call_5, count_for_agg_call_6, count_for_agg_call_7, count_for_agg_call_8], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3, 4, 5, 6], distribution key: [0, 1], read pk prefix len hint: 3 }
-     Table 2 { columns: [channel, $expr1, auction, count_for_agg_call_9, count_for_agg_call_10, count_for_agg_call_11, count_for_agg_call_12], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3, 4, 5, 6], distribution key: [0, 1], read pk prefix len hint: 3 }
-     Table 3 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], distribution key: [0, 1], read pk prefix len hint: 2 }
+    StreamProject { exprs: [channel, ToChar(date_time, 'yyyy-MM-dd':Varchar) as $expr1, ToChar(date_time, 'HH:mm':Varchar) as $expr2, price, bidder, auction, _row_id] }
+    └── StreamRowIdGen { row_id_index: 7 }
+        └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 3 }
+
+    Table 0
+    ├── columns: [ channel, $expr1, max($expr2), count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), count(distinct bidder), count(distinct bidder) filter((price < 10000:Int32)), count(distinct bidder) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct bidder) filter((price >= 1000000:Int32)), count(distinct auction), count(distinct auction) filter((price < 10000:Int32)), count(distinct auction) filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count(distinct auction) filter((price >= 1000000:Int32)) ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 1 { columns: [ channel, $expr1, bidder, count_for_agg_call_5, count_for_agg_call_6, count_for_agg_call_7, count_for_agg_call_8 ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3, 4, 5, 6 ], distribution key: [ 0, 1 ], read pk prefix len hint: 3 }
+
+    Table 2 { columns: [ channel, $expr1, auction, count_for_agg_call_9, count_for_agg_call_10, count_for_agg_call_11, count_for_agg_call_12 ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3, 4, 5, 6 ], distribution key: [ 0, 1 ], read pk prefix len hint: 3 }
+
+    Table 3 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ channel, day, minute, total_bids, rank1_bids, rank2_bids, rank3_bids, total_bidders, rank1_bidders, rank2_bidders, rank3_bidders, total_auctions, rank1_auctions, rank2_auctions, rank3_auctions ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
 - id: nexmark_q17
   before:
   - create_sources
@@ -961,37 +1049,50 @@
     GROUP BY auction, to_char(date_time, 'YYYY-MM-DD');
   batch_plan: |
     BatchExchange { order: [], dist: Single }
-    └─BatchProject { exprs: [auction, $expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), (sum(price)::Decimal / count(price)) as $expr2, sum(price)] }
+    └─BatchProject { exprs: [auction, $expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), (sum(price) / count(price)) as $expr2, sum(price)] }
       └─BatchHashAgg { group_key: [auction, $expr1], aggs: [count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), sum(price), count(price)] }
         └─BatchExchange { order: [], dist: HashShard(auction, $expr1) }
           └─BatchProject { exprs: [auction, ToChar(date_time, 'YYYY-MM-DD':Varchar) as $expr1, price] }
             └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], pk_columns: [auction, day], pk_conflict: "no check" }
-    └─StreamProject { exprs: [auction, $expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), (sum(price)::Decimal / count(price)) as $expr2, sum(price)] }
+    StreamMaterialize { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], stream_key: [auction, day], pk_columns: [auction, day], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [auction, $expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), (sum(price) / count(price)) as $expr2, sum(price)] }
       └─StreamAppendOnlyHashAgg { group_key: [auction, $expr1], aggs: [count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), sum(price), count(price)] }
         └─StreamExchange { dist: HashShard(auction, $expr1) }
           └─StreamProject { exprs: [auction, ToChar(date_time, 'YYYY-MM-DD':Varchar) as $expr1, price, _row_id] }
             └─StreamRowIdGen { row_id_index: 7 }
               └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], pk_columns: [auction, day], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [auction, $expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), (sum(price)::Decimal / count(price)) as $expr2, sum(price)] }
-          StreamAppendOnlyHashAgg { group_key: [auction, $expr1], aggs: [count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), sum(price), count(price)] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0, 1]) from 1
+    StreamMaterialize { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], stream_key: [auction, day], pk_columns: [auction, day], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamProject { exprs: [auction, $expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), (sum(price) / count(price)) as $expr2, sum(price)] }
+        └── StreamAppendOnlyHashAgg { group_key: [auction, $expr1], aggs: [count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), sum(price), count(price)] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0, 1]) from 1
 
     Fragment 1
-      StreamProject { exprs: [auction, ToChar(date_time, 'YYYY-MM-DD':Varchar) as $expr1, price, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 1
-
-     Table 0 { columns: [auction, $expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), sum(price), count(price)], primary key: [$0 ASC, $1 ASC], value indices: [2, 3, 4, 5, 6, 7, 8, 9], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 1 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], distribution key: [0, 1], read pk prefix len hint: 2 }
+    StreamProject { exprs: [auction, ToChar(date_time, 'YYYY-MM-DD':Varchar) as $expr1, price, _row_id] }
+    └── StreamRowIdGen { row_id_index: 7 }
+        └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 1 }
+
+    Table 0
+    ├── columns: [ auction, $expr1, count, count filter((price < 10000:Int32)), count filter((price >= 10000:Int32) AND (price < 1000000:Int32)), count filter((price >= 1000000:Int32)), min(price), max(price), sum(price), count(price) ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2, 3, 4, 5, 6, 7, 8, 9 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
+    Table 1 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction, day, total_bids, rank1_bids, rank2_bids, rank3_bids, min_price, max_price, avg_price, sum_price ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    ├── distribution key: [ 0, 1 ]
+    └── read pk prefix len hint: 2
+
 - id: nexmark_q18
   before:
   - create_sources
@@ -1013,33 +1114,44 @@
         └─BatchExchange { order: [], dist: HashShard(bidder, auction) }
           └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_time, extra, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_time, extra, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(_row_id) }
       └─StreamProject { exprs: [auction, bidder, price, channel, url, date_time, extra, _row_id] }
         └─StreamAppendOnlyGroupTopN { order: "[date_time DESC]", limit: 1, offset: 0, group_key: [1, 0] }
           └─StreamExchange { dist: HashShard(bidder, auction) }
             └─StreamRowIdGen { row_id_index: 7 }
               └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, channel, url, date_time, extra, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([7]) from 1
+    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_time, extra, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └──  StreamExchange Hash([7]) from 1
 
     Fragment 1
-      StreamProject { exprs: [auction, bidder, price, channel, url, date_time, extra, _row_id] }
-        StreamAppendOnlyGroupTopN { order: "[date_time DESC]", limit: 1, offset: 0, group_key: [1, 0] }
-            state table: 0
-          StreamExchange Hash([1, 0]) from 2
+    StreamProject { exprs: [auction, bidder, price, channel, url, date_time, extra, _row_id] }
+    └── StreamAppendOnlyGroupTopN { order: "[date_time DESC]", limit: 1, offset: 0, group_key: [1, 0] } { state table: 0 }
+        └──  StreamExchange Hash([1, 0]) from 2
 
     Fragment 2
-      StreamRowIdGen { row_id_index: 7 }
-        StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-            source state table: 1
+    StreamRowIdGen { row_id_index: 7 }
+    └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 1 }
+
+    Table 0
+    ├── columns: [ auction, bidder, price, channel, url, date_time, extra, _row_id ]
+    ├── primary key: [ $1 ASC, $0 ASC, $5 DESC, $7 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ]
+    ├── distribution key: [ 1, 0 ]
+    └── read pk prefix len hint: 2
+
+    Table 1 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, channel, url, date_time, extra, _row_id ]
+    ├── primary key: [ $7 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ]
+    ├── distribution key: [ 7 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [auction, bidder, price, channel, url, date_time, extra, _row_id], primary key: [$1 ASC, $0 ASC, $5 DESC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [1, 0], read pk prefix len hint: 2 }
-     Table 1 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, bidder, price, channel, url, date_time, extra, _row_id], primary key: [$7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [7], read pk prefix len hint: 1 }
 - id: nexmark_q19
   before:
   - create_sources
@@ -1078,9 +1190,9 @@
       └─BatchExchange { order: [], dist: HashShard(id) }
         └─BatchProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category] }
           └─BatchFilter { predicate: (category = 10:Int32) }
-            └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+            └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, _row_id(hidden), _row_id#1(hidden)], pk_columns: [_row_id, _row_id#1, auction], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, _row_id(hidden), _row_id#1(hidden)], stream_key: [_row_id, _row_id#1, auction], pk_columns: [_row_id, _row_id#1, auction], pk_conflict: "NoCheck" }
     └─StreamAppendOnlyHashJoin { type: Inner, predicate: auction = id, output: [auction, bidder, price, channel, url, date_time, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id, _row_id] }
       ├─StreamExchange { dist: HashShard(auction) }
       | └─StreamProject { exprs: [auction, bidder, price, channel, url, date_time, _row_id] }
@@ -1089,37 +1201,46 @@
       └─StreamExchange { dist: HashShard(id) }
         └─StreamProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id] }
           └─StreamFilter { predicate: (category = 10:Int32) }
-            └─StreamRowIdGen { row_id_index: 9 }
-              └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-  stream_dist_plan: |
+            └─StreamRowIdGen { row_id_index: 10 }
+              └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, _row_id(hidden), _row_id#1(hidden)], pk_columns: [_row_id, _row_id#1, auction], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamAppendOnlyHashJoin { type: Inner, predicate: auction = id, output: [auction, bidder, price, channel, url, date_time, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id, _row_id] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, _row_id(hidden), _row_id#1(hidden)], stream_key: [_row_id, _row_id#1, auction], pk_columns: [_row_id, _row_id#1, auction], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamAppendOnlyHashJoin { type: Inner, predicate: auction = id, output: [auction, bidder, price, channel, url, date_time, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id, _row_id] } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([0]) from 1
+        └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      StreamProject { exprs: [auction, bidder, price, channel, url, date_time, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 4
+    StreamProject { exprs: [auction, bidder, price, channel, url, date_time, _row_id] }
+    └── StreamRowIdGen { row_id_index: 7 }
+        └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 4 }
 
     Fragment 2
-      StreamProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id] }
-        StreamFilter { predicate: (category = 10:Int32) }
-          StreamRowIdGen { row_id_index: 9 }
-            StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-                source state table: 5
-
-     Table 0 { columns: [auction, bidder, price, channel, url, date_time, _row_id], primary key: [$0 ASC, $6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [auction, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id], primary key: [$0 ASC, $9 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 5 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, _row_id, _row_id#1], primary key: [$14 ASC, $15 ASC, $0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], distribution key: [0], read pk prefix len hint: 3 }
+    StreamProject { exprs: [id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id] }
+    └── StreamFilter { predicate: (category = 10:Int32) }
+        └── StreamRowIdGen { row_id_index: 10 }
+            └──  StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] } { source state table: 5 }
+
+    Table 0 { columns: [ auction, bidder, price, channel, url, date_time, _row_id ], primary key: [ $0 ASC, $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ auction, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ id, item_name, description, initial_bid, reserve, date_time, expires, seller, category, _row_id ], primary key: [ $0 ASC, $9 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction, bidder, price, channel, url, date_timeb, item_name, description, initial_bid, reserve, date_timea, expires, seller, category, _row_id, _row_id#1 ]
+    ├── primary key: [ $14 ASC, $15 ASC, $0 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 3
+
 - id: nexmark_q21
   before:
   - create_sources
@@ -1153,25 +1274,21 @@
     └─BatchProject { exprs: [auction, bidder, price, channel, SplitPart(url, '/':Varchar, 4:Int32) as $expr1, SplitPart(url, '/':Varchar, 5:Int32) as $expr2, SplitPart(url, '/':Varchar, 6:Int32) as $expr3] }
       └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, bidder, price, channel, dir1, dir2, dir3, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-    └─StreamExchange { dist: HashShard(_row_id) }
-      └─StreamProject { exprs: [auction, bidder, price, channel, SplitPart(url, '/':Varchar, 4:Int32) as $expr1, SplitPart(url, '/':Varchar, 5:Int32) as $expr2, SplitPart(url, '/':Varchar, 6:Int32) as $expr3, _row_id] }
-        └─StreamRowIdGen { row_id_index: 7 }
-          └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+    StreamMaterialize { columns: [auction, bidder, price, channel, dir1, dir2, dir3, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [auction, bidder, price, channel, SplitPart(url, '/':Varchar, 4:Int32) as $expr1, SplitPart(url, '/':Varchar, 5:Int32) as $expr2, SplitPart(url, '/':Varchar, 6:Int32) as $expr3, _row_id] }
+      └─StreamRowIdGen { row_id_index: 7 }
+        └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction, bidder, price, channel, dir1, dir2, dir3, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamExchange Hash([7]) from 1
+    StreamMaterialize { columns: [auction, bidder, price, channel, dir1, dir2, dir3, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamProject { exprs: [auction, bidder, price, channel, SplitPart(url, '/':Varchar, 4:Int32) as $expr1, SplitPart(url, '/':Varchar, 5:Int32) as $expr2, SplitPart(url, '/':Varchar, 6:Int32) as $expr3, _row_id] }
+        └── StreamRowIdGen { row_id_index: 7 }
+            └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 0 }
 
-    Fragment 1
-      StreamProject { exprs: [auction, bidder, price, channel, SplitPart(url, '/':Varchar, 4:Int32) as $expr1, SplitPart(url, '/':Varchar, 5:Int32) as $expr2, SplitPart(url, '/':Varchar, 6:Int32) as $expr3, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 0
+    Table 0 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ auction, bidder, price, channel, dir1, dir2, dir3, _row_id ], primary key: [ $7 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ], distribution key: [ 7 ], read pk prefix len hint: 1 }
 
-     Table 0 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction, bidder, price, channel, dir1, dir2, dir3, _row_id], primary key: [$7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [7], read pk prefix len hint: 1 }
 - id: nexmark_q101
   before:
   - create_sources
@@ -1197,53 +1314,62 @@
     └─BatchHashJoin { type: LeftOuter, predicate: id = auction, output: [id, item_name, max(price)] }
       ├─BatchExchange { order: [], dist: HashShard(id) }
       | └─BatchProject { exprs: [id, item_name] }
-      |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+      |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
       └─BatchHashAgg { group_key: [auction], aggs: [max(price)] }
         └─BatchExchange { order: [], dist: HashShard(auction) }
           └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name, current_highest_bid, _row_id(hidden), auction(hidden)], pk_columns: [_row_id, auction, auction_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name, current_highest_bid, _row_id(hidden), auction(hidden)], stream_key: [_row_id, auction, auction_id], pk_columns: [_row_id, auction, auction_id], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: LeftOuter, predicate: id = auction, output: [id, item_name, max(price), _row_id, auction] }
       ├─StreamExchange { dist: HashShard(id) }
       | └─StreamProject { exprs: [id, item_name, _row_id] }
-      |   └─StreamRowIdGen { row_id_index: 9 }
-      |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
+      |   └─StreamRowIdGen { row_id_index: 10 }
+      |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
       └─StreamProject { exprs: [auction, max(price)] }
         └─StreamAppendOnlyHashAgg { group_key: [auction], aggs: [max(price), count] }
           └─StreamExchange { dist: HashShard(auction) }
             └─StreamRowIdGen { row_id_index: 7 }
               └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name, current_highest_bid, _row_id(hidden), auction(hidden)], pk_columns: [_row_id, auction, auction_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: LeftOuter, predicate: id = auction, output: [id, item_name, max(price), _row_id, auction] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamProject { exprs: [auction, max(price)] }
-            StreamAppendOnlyHashAgg { group_key: [auction], aggs: [max(price), count] }
-                result table: 5, state tables: [], distinct tables: []
-              StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [auction_id, auction_item_name, current_highest_bid, _row_id(hidden), auction(hidden)], stream_key: [_row_id, auction, auction_id], pk_columns: [_row_id, auction, auction_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: LeftOuter, predicate: id = auction, output: [id, item_name, max(price), _row_id, auction] } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([0]) from 1
+        └── StreamProject { exprs: [auction, max(price)] }
+            └── StreamAppendOnlyHashAgg { group_key: [auction], aggs: [max(price), count] } { result table: 5, state tables: [], distinct tables: [] }
+                └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      StreamProject { exprs: [id, item_name, _row_id] }
-        StreamRowIdGen { row_id_index: 9 }
-          StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-              source state table: 4
+    StreamProject { exprs: [id, item_name, _row_id] }
+    └── StreamRowIdGen { row_id_index: 10 }
+        └──  StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] } { source state table: 4 }
 
     Fragment 2
-      StreamRowIdGen { row_id_index: 7 }
-        StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-            source state table: 6
-
-     Table 0 { columns: [id, item_name, _row_id], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [auction, max(price)], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [auction, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 5 { columns: [auction, max(price), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name, current_highest_bid, _row_id, auction], primary key: [$3 ASC, $4 ASC, $0 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0], read pk prefix len hint: 3 }
+    StreamRowIdGen { row_id_index: 7 }
+    └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 6 }
+
+    Table 0 { columns: [ id, item_name, _row_id ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ auction, max(price) ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ auction, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ auction, max(price), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction_id, auction_item_name, current_highest_bid, _row_id, auction ]
+    ├── primary key: [ $3 ASC, $4 ASC, $0 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 3
+
 - id: nexmark_q102
   before:
   - create_sources
@@ -1269,7 +1395,7 @@
     |   └─BatchHashJoin { type: Inner, predicate: id = auction, output: all }
     |     ├─BatchExchange { order: [], dist: HashShard(id) }
     |     | └─BatchProject { exprs: [id, item_name] }
-    |     |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+    |     |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
     |     └─BatchExchange { order: [], dist: HashShard(auction) }
     |       └─BatchProject { exprs: [auction] }
     |         └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
@@ -1280,15 +1406,15 @@
             └─BatchExchange { order: [], dist: HashShard(auction) }
               └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], pk_columns: [auction_id, auction_item_name], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], stream_key: [auction_id, auction_item_name], pk_columns: [auction_id, auction_item_name], pk_conflict: "NoCheck" }
     └─StreamDynamicFilter { predicate: (count(auction) >= $expr1), output: [id, item_name, count(auction)] }
       ├─StreamProject { exprs: [id, item_name, count(auction)] }
       | └─StreamAppendOnlyHashAgg { group_key: [id, item_name], aggs: [count(auction), count] }
       |   └─StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: [id, item_name, auction, _row_id, _row_id] }
       |     ├─StreamExchange { dist: HashShard(id) }
       |     | └─StreamProject { exprs: [id, item_name, _row_id] }
-      |     |   └─StreamRowIdGen { row_id_index: 9 }
-      |     |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
+      |     |   └─StreamRowIdGen { row_id_index: 10 }
+      |     |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
       |     └─StreamExchange { dist: HashShard(auction) }
       |       └─StreamProject { exprs: [auction, _row_id] }
       |         └─StreamShare { id = 8 }
@@ -1306,64 +1432,79 @@
                       └─StreamProject { exprs: [auction, _row_id] }
                         └─StreamRowIdGen { row_id_index: 7 }
                           └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], pk_columns: [auction_id, auction_item_name], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamDynamicFilter { predicate: (count(auction) >= $expr1), output: [id, item_name, count(auction)] }
-            left table: 0, right table 1
-          StreamProject { exprs: [id, item_name, count(auction)] }
-            StreamAppendOnlyHashAgg { group_key: [id, item_name], aggs: [count(auction), count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: [id, item_name, auction, _row_id, _row_id] }
-                  left table: 3, right table 5, left degree table: 4, right degree table: 6,
-                StreamExchange Hash([0]) from 1
-                StreamExchange Hash([0]) from 2
-          StreamExchange Broadcast from 4
+    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], stream_key: [auction_id, auction_item_name], pk_columns: [auction_id, auction_item_name], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamDynamicFilter { predicate: (count(auction) >= $expr1), output: [id, item_name, count(auction)] } { left table: 0, right table: 1 }
+        ├── StreamProject { exprs: [id, item_name, count(auction)] }
+        │   └── StreamAppendOnlyHashAgg { group_key: [id, item_name], aggs: [count(auction), count] } { result table: 2, state tables: [], distinct tables: [] }
+        │       └── StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: [id, item_name, auction, _row_id, _row_id] }
+        │           ├── left table: 3
+        │           ├── right table: 5
+        │           ├── left degree table: 4
+        │           ├── right degree table: 6
+        │           ├──  StreamExchange Hash([0]) from 1
+        │           └──  StreamExchange Hash([0]) from 2
+        └──  StreamExchange Broadcast from 4
 
     Fragment 1
-      StreamProject { exprs: [id, item_name, _row_id] }
-        StreamRowIdGen { row_id_index: 9 }
-          StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-              source state table: 7
+    StreamProject { exprs: [id, item_name, _row_id] }
+    └── StreamRowIdGen { row_id_index: 10 }
+        └── StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+            └── source state table: 7
 
     Fragment 2
-      StreamProject { exprs: [auction, _row_id] }
-        StreamExchange Hash([1]) from 3
+    StreamProject { exprs: [auction, _row_id] }
+    └──  StreamExchange Hash([1]) from 3
 
     Fragment 3
-      StreamProject { exprs: [auction, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 8
+    StreamProject { exprs: [auction, _row_id] }
+    └── StreamRowIdGen { row_id_index: 7 }
+        └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 8 }
 
     Fragment 4
-      StreamProject { exprs: [(sum0(count) / count(auction)) as $expr1] }
-        StreamGlobalSimpleAgg { aggs: [sum0(count), count(auction), count] }
-            result table: 9, state tables: [], distinct tables: []
-          StreamExchange Single from 5
+    StreamProject { exprs: [(sum0(count) / count(auction)) as $expr1] }
+    └── StreamGlobalSimpleAgg { aggs: [sum0(count), count(auction), count] } { result table: 9, state tables: [], distinct tables: [] }
+        └──  StreamExchange Single from 5
 
     Fragment 5
-      StreamAppendOnlyHashAgg { group_key: [auction], aggs: [count] }
-          result table: 10, state tables: [], distinct tables: []
-        StreamExchange Hash([0]) from 6
+    StreamAppendOnlyHashAgg { group_key: [auction], aggs: [count] } { result table: 10, state tables: [], distinct tables: [] }
+    └──  StreamExchange Hash([0]) from 6
 
     Fragment 6
-      StreamProject { exprs: [auction, _row_id] }
-        StreamExchange Hash([1]) from 3
-
-     Table 0 { columns: [id, item_name, count(auction)], primary key: [$2 ASC, $0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [$expr1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
-     Table 2 { columns: [id, item_name, count(auction), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0], read pk prefix len hint: 2 }
-     Table 3 { columns: [id, item_name, _row_id], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [auction, _row_id], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [auction, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 8 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 9 { columns: [sum0(count), count(auction), count], primary key: [], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 10 { columns: [auction, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name, bid_count], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 2 }
+    StreamProject { exprs: [auction, _row_id] }
+    └──  StreamExchange Hash([1]) from 3
+
+    Table 0 { columns: [ id, item_name, count(auction) ], primary key: [ $2 ASC, $0 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ $expr1 ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 2 { columns: [ id, item_name, count(auction), count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 3 { columns: [ id, item_name, _row_id ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ auction, _row_id ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ auction, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ sum0(count), count(auction), count ], primary key: [], value indices: [ 0, 1, 2 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 10 { columns: [ auction, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction_id, auction_item_name, bid_count ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
 - id: nexmark_q103
   before:
   - create_sources
@@ -1385,57 +1526,67 @@
     └─BatchHashJoin { type: LeftSemi, predicate: id = auction, output: all }
       ├─BatchExchange { order: [], dist: HashShard(id) }
       | └─BatchProject { exprs: [id, item_name] }
-      |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+      |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
       └─BatchProject { exprs: [auction] }
         └─BatchFilter { predicate: (count >= 20:Int32) }
           └─BatchHashAgg { group_key: [auction], aggs: [count] }
             └─BatchExchange { order: [], dist: HashShard(auction) }
               └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name, _row_id(hidden)], pk_columns: [_row_id, auction_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name, _row_id(hidden)], stream_key: [_row_id, auction_id], pk_columns: [_row_id, auction_id], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: LeftSemi, predicate: id = auction, output: all }
       ├─StreamExchange { dist: HashShard(id) }
       | └─StreamProject { exprs: [id, item_name, _row_id] }
-      |   └─StreamRowIdGen { row_id_index: 9 }
-      |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
+      |   └─StreamRowIdGen { row_id_index: 10 }
+      |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
       └─StreamProject { exprs: [auction] }
         └─StreamFilter { predicate: (count >= 20:Int32) }
           └─StreamAppendOnlyHashAgg { group_key: [auction], aggs: [count] }
             └─StreamExchange { dist: HashShard(auction) }
               └─StreamRowIdGen { row_id_index: 7 }
                 └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name, _row_id(hidden)], pk_columns: [_row_id, auction_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: LeftSemi, predicate: id = auction, output: all }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamProject { exprs: [auction] }
-            StreamFilter { predicate: (count >= 20:Int32) }
-              StreamAppendOnlyHashAgg { group_key: [auction], aggs: [count] }
-                  result table: 5, state tables: [], distinct tables: []
-                StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [auction_id, auction_item_name, _row_id(hidden)], stream_key: [_row_id, auction_id], pk_columns: [_row_id, auction_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: LeftSemi, predicate: id = auction, output: all } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([0]) from 1
+        └── StreamProject { exprs: [auction] }
+            └── StreamFilter { predicate: (count >= 20:Int32) }
+                └── StreamAppendOnlyHashAgg { group_key: [auction], aggs: [count] } { result table: 5, state tables: [], distinct tables: [] }
+                    └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      StreamProject { exprs: [id, item_name, _row_id] }
-        StreamRowIdGen { row_id_index: 9 }
-          StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-              source state table: 4
+    StreamProject { exprs: [id, item_name, _row_id] }
+    └── StreamRowIdGen { row_id_index: 10 }
+        └── StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+            └── source state table: 4
 
     Fragment 2
-      StreamRowIdGen { row_id_index: 7 }
-        StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-            source state table: 6
-
-     Table 0 { columns: [id, item_name, _row_id], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [auction], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [auction, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 5 { columns: [auction, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name, _row_id], primary key: [$2 ASC, $0 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 2 }
+    StreamRowIdGen { row_id_index: 7 }
+    └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 6 }
+
+    Table 0 { columns: [ id, item_name, _row_id ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ auction ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ auction, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ auction, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction_id, auction_item_name, _row_id ]
+    ├── primary key: [ $2 ASC, $0 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
 - id: nexmark_q104
   before:
   - create_sources
@@ -1457,57 +1608,67 @@
     └─BatchHashJoin { type: LeftAnti, predicate: id = auction, output: all }
       ├─BatchExchange { order: [], dist: HashShard(id) }
       | └─BatchProject { exprs: [id, item_name] }
-      |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+      |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
       └─BatchProject { exprs: [auction] }
         └─BatchFilter { predicate: (count < 20:Int32) }
           └─BatchHashAgg { group_key: [auction], aggs: [count] }
             └─BatchExchange { order: [], dist: HashShard(auction) }
               └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name, _row_id(hidden)], pk_columns: [_row_id, auction_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name, _row_id(hidden)], stream_key: [_row_id, auction_id], pk_columns: [_row_id, auction_id], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: LeftAnti, predicate: id = auction, output: all }
       ├─StreamExchange { dist: HashShard(id) }
       | └─StreamProject { exprs: [id, item_name, _row_id] }
-      |   └─StreamRowIdGen { row_id_index: 9 }
-      |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
+      |   └─StreamRowIdGen { row_id_index: 10 }
+      |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
       └─StreamProject { exprs: [auction] }
         └─StreamFilter { predicate: (count < 20:Int32) }
           └─StreamAppendOnlyHashAgg { group_key: [auction], aggs: [count] }
             └─StreamExchange { dist: HashShard(auction) }
               └─StreamRowIdGen { row_id_index: 7 }
                 └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name, _row_id(hidden)], pk_columns: [_row_id, auction_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: LeftAnti, predicate: id = auction, output: all }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamProject { exprs: [auction] }
-            StreamFilter { predicate: (count < 20:Int32) }
-              StreamAppendOnlyHashAgg { group_key: [auction], aggs: [count] }
-                  result table: 5, state tables: [], distinct tables: []
-                StreamExchange Hash([0]) from 2
+    StreamMaterialize { columns: [auction_id, auction_item_name, _row_id(hidden)], stream_key: [_row_id, auction_id], pk_columns: [_row_id, auction_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: LeftAnti, predicate: id = auction, output: all } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([0]) from 1
+        └── StreamProject { exprs: [auction] }
+            └── StreamFilter { predicate: (count < 20:Int32) }
+                └── StreamAppendOnlyHashAgg { group_key: [auction], aggs: [count] } { result table: 5, state tables: [], distinct tables: [] }
+                    └──  StreamExchange Hash([0]) from 2
 
     Fragment 1
-      StreamProject { exprs: [id, item_name, _row_id] }
-        StreamRowIdGen { row_id_index: 9 }
-          StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-              source state table: 4
+    StreamProject { exprs: [id, item_name, _row_id] }
+    └── StreamRowIdGen { row_id_index: 10 }
+        └── StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+            └── source state table: 4
 
     Fragment 2
-      StreamRowIdGen { row_id_index: 7 }
-        StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-            source state table: 6
-
-     Table 0 { columns: [id, item_name, _row_id], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [auction], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [auction, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 5 { columns: [auction, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name, _row_id], primary key: [$2 ASC, $0 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 2 }
+    StreamRowIdGen { row_id_index: 7 }
+    └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 6 }
+
+    Table 0 { columns: [ id, item_name, _row_id ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ auction ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ auction, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ auction, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294
+    ├── columns: [ auction_id, auction_item_name, _row_id ]
+    ├── primary key: [ $2 ASC, $0 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 2
+
 - id: nexmark_q105
   before:
   - create_sources
@@ -1532,71 +1693,84 @@
           └─BatchHashJoin { type: Inner, predicate: id = auction, output: all }
             ├─BatchExchange { order: [], dist: HashShard(id) }
             | └─BatchProject { exprs: [id, item_name] }
-            |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+            |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
             └─BatchExchange { order: [], dist: HashShard(auction) }
               └─BatchProject { exprs: [auction] }
                 └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], pk_columns: [auction_id, auction_item_name], order_descs: [bid_count, auction_id, auction_item_name], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], stream_key: [auction_id, auction_item_name], pk_columns: [bid_count, auction_id, auction_item_name], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [id, item_name, count(auction)] }
       └─StreamTopN { order: "[count(auction) DESC]", limit: 1000, offset: 0 }
         └─StreamExchange { dist: Single }
           └─StreamGroupTopN { order: "[count(auction) DESC]", limit: 1000, offset: 0, group_key: [3] }
             └─StreamProject { exprs: [id, item_name, count(auction), Vnode(id) as $expr1] }
-              └─StreamProject { exprs: [id, item_name, count(auction)] }
-                └─StreamAppendOnlyHashAgg { group_key: [id, item_name], aggs: [count(auction), count] }
-                  └─StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: [id, item_name, auction, _row_id, _row_id] }
-                    ├─StreamExchange { dist: HashShard(id) }
-                    | └─StreamProject { exprs: [id, item_name, _row_id] }
-                    |   └─StreamRowIdGen { row_id_index: 9 }
-                    |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-                    └─StreamExchange { dist: HashShard(auction) }
-                      └─StreamProject { exprs: [auction, _row_id] }
-                        └─StreamRowIdGen { row_id_index: 7 }
-                          └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+              └─StreamAppendOnlyHashAgg { group_key: [id, item_name], aggs: [count(auction), count] }
+                └─StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: [id, item_name, auction, _row_id, _row_id] }
+                  ├─StreamExchange { dist: HashShard(id) }
+                  | └─StreamProject { exprs: [id, item_name, _row_id] }
+                  |   └─StreamRowIdGen { row_id_index: 10 }
+                  |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+                  └─StreamExchange { dist: HashShard(auction) }
+                    └─StreamProject { exprs: [auction, _row_id] }
+                      └─StreamRowIdGen { row_id_index: 7 }
+                        └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], pk_columns: [auction_id, auction_item_name], order_descs: [bid_count, auction_id, auction_item_name], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [id, item_name, count(auction)] }
-          StreamTopN { order: "[count(auction) DESC]", limit: 1000, offset: 0 }
-              state table: 0
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [auction_id, auction_item_name, bid_count], stream_key: [auction_id, auction_item_name], pk_columns: [bid_count, auction_id, auction_item_name], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [id, item_name, count(auction)] }
+        └── StreamTopN { order: "[count(auction) DESC]", limit: 1000, offset: 0 } { state table: 0 }
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamGroupTopN { order: "[count(auction) DESC]", limit: 1000, offset: 0, group_key: [3] }
-          state table: 1
-        StreamProject { exprs: [id, item_name, count(auction), Vnode(id) as $expr1] }
-          StreamProject { exprs: [id, item_name, count(auction)] }
-            StreamAppendOnlyHashAgg { group_key: [id, item_name], aggs: [count(auction), count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: [id, item_name, auction, _row_id, _row_id] }
-                  left table: 3, right table 5, left degree table: 4, right degree table: 6,
-                StreamExchange Hash([0]) from 2
-                StreamExchange Hash([0]) from 3
+    StreamGroupTopN { order: "[count(auction) DESC]", limit: 1000, offset: 0, group_key: [3] } { state table: 1 }
+    └── StreamProject { exprs: [id, item_name, count(auction), Vnode(id) as $expr1] }
+        └── StreamAppendOnlyHashAgg { group_key: [id, item_name], aggs: [count(auction), count] } { result table: 2, state tables: [], distinct tables: [] }
+            └── StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: [id, item_name, auction, _row_id, _row_id] }
+                ├── left table: 3
+                ├── right table: 5
+                ├── left degree table: 4
+                ├── right degree table: 6
+                ├──  StreamExchange Hash([0]) from 2
+                └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      StreamProject { exprs: [id, item_name, _row_id] }
-        StreamRowIdGen { row_id_index: 9 }
-          StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-              source state table: 7
+    StreamProject { exprs: [id, item_name, _row_id] }
+    └── StreamRowIdGen { row_id_index: 10 }
+        └── StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+            └── source state table: 7
 
     Fragment 3
-      StreamProject { exprs: [auction, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 8
-
-     Table 0 { columns: [id, item_name, count(auction), $expr1], primary key: [$2 DESC, $0 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [id, item_name, count(auction), $expr1], primary key: [$3 ASC, $2 DESC, $0 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1, vnode column idx: 3 }
-     Table 2 { columns: [id, item_name, count(auction), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0], read pk prefix len hint: 2 }
-     Table 3 { columns: [id, item_name, _row_id], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [auction, _row_id], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [auction, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 8 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [auction_id, auction_item_name, bid_count], primary key: [$2 DESC, $0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 2 }
+    StreamProject { exprs: [auction, _row_id] }
+    └── StreamRowIdGen { row_id_index: 7 }
+        └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 8 }
+
+    Table 0 { columns: [ id, item_name, count(auction), $expr1 ], primary key: [ $2 DESC, $0 ASC, $1 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 1
+    ├── columns: [ id, item_name, count(auction), $expr1 ]
+    ├── primary key: [ $3 ASC, $2 DESC, $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: [ 0 ]
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 3
+
+    Table 2 { columns: [ id, item_name, count(auction), count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 3 { columns: [ id, item_name, _row_id ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ auction, _row_id ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ auction, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ auction_id, auction_item_name, bid_count ], primary key: [ $2 DESC, $0 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [], read pk prefix len hint: 2 }
+
 - id: nexmark_q106
   before:
   - create_sources
@@ -1628,74 +1802,98 @@
           └─BatchHashJoin { type: Inner, predicate: id = auction AND (date_time >= date_time) AND (date_time <= expires), output: [id, price] }
             ├─BatchExchange { order: [], dist: HashShard(id) }
             | └─BatchProject { exprs: [id, date_time, expires] }
-            |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"], filter: (None, None) }
+            |   └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
             └─BatchExchange { order: [], dist: HashShard(auction) }
               └─BatchProject { exprs: [auction, price, date_time] }
                 └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [min_final], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [min_final], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [min(min(max(price)))] }
       └─StreamGlobalSimpleAgg { aggs: [min(min(max(price))), count] }
         └─StreamExchange { dist: Single }
           └─StreamHashAgg { group_key: [$expr1], aggs: [min(max(price)), count] }
             └─StreamProject { exprs: [id, max(price), Vnode(id) as $expr1] }
-              └─StreamProject { exprs: [id, max(price)] }
-                └─StreamAppendOnlyHashAgg { group_key: [id], aggs: [max(price), count] }
-                  └─StreamProject { exprs: [id, price, _row_id, _row_id] }
-                    └─StreamFilter { predicate: (date_time >= date_time) AND (date_time <= expires) }
-                      └─StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all }
-                        ├─StreamExchange { dist: HashShard(id) }
-                        | └─StreamProject { exprs: [id, date_time, expires, _row_id] }
-                        |   └─StreamRowIdGen { row_id_index: 9 }
-                        |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-                        └─StreamExchange { dist: HashShard(auction) }
-                          └─StreamProject { exprs: [auction, price, date_time, _row_id] }
-                            └─StreamRowIdGen { row_id_index: 7 }
-                              └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-  stream_dist_plan: |
+              └─StreamAppendOnlyHashAgg { group_key: [id], aggs: [max(price), count] }
+                └─StreamProject { exprs: [id, price, _row_id, _row_id] }
+                  └─StreamFilter { predicate: (date_time >= date_time) AND (date_time <= expires) }
+                    └─StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all }
+                      ├─StreamExchange { dist: HashShard(id) }
+                      | └─StreamProject { exprs: [id, date_time, expires, _row_id] }
+                      |   └─StreamRowIdGen { row_id_index: 10 }
+                      |     └─StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+                      └─StreamExchange { dist: HashShard(auction) }
+                        └─StreamProject { exprs: [auction, price, date_time, _row_id] }
+                          └─StreamRowIdGen { row_id_index: 7 }
+                            └─StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [min_final], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [min(min(max(price)))] }
-          StreamGlobalSimpleAgg { aggs: [min(min(max(price))), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [min_final], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [min(min(max(price)))] }
+        └── StreamGlobalSimpleAgg { aggs: [min(min(max(price))), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamHashAgg { group_key: [$expr1], aggs: [min(max(price)), count] }
-          result table: 3, state tables: [2], distinct tables: []
-        StreamProject { exprs: [id, max(price), Vnode(id) as $expr1] }
-          StreamProject { exprs: [id, max(price)] }
-            StreamAppendOnlyHashAgg { group_key: [id], aggs: [max(price), count] }
-                result table: 4, state tables: [], distinct tables: []
-              StreamProject { exprs: [id, price, _row_id, _row_id] }
-                StreamFilter { predicate: (date_time >= date_time) AND (date_time <= expires) }
-                  StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all }
-                      left table: 5, right table 7, left degree table: 6, right degree table: 8,
-                    StreamExchange Hash([0]) from 2
-                    StreamExchange Hash([0]) from 3
+    StreamHashAgg { group_key: [$expr1], aggs: [min(max(price)), count] }
+    ├── result table: 3
+    ├── state tables: [ 2 ]
+    ├── distinct tables: []
+    └── StreamProject { exprs: [id, max(price), Vnode(id) as $expr1] }
+        └── StreamAppendOnlyHashAgg { group_key: [id], aggs: [max(price), count] }
+            ├── result table: 4
+            ├── state tables: []
+            ├── distinct tables: []
+            └── StreamProject { exprs: [id, price, _row_id, _row_id] }
+                └── StreamFilter { predicate: (date_time >= date_time) AND (date_time <= expires) }
+                    └── StreamAppendOnlyHashJoin { type: Inner, predicate: id = auction, output: all }
+                        ├── left table: 5
+                        ├── right table: 7
+                        ├── left degree table: 6
+                        ├── right degree table: 8
+                        ├──  StreamExchange Hash([0]) from 2
+                        └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      StreamProject { exprs: [id, date_time, expires, _row_id] }
-        StreamRowIdGen { row_id_index: 9 }
-          StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "_row_id"] }
-              source state table: 9
+    StreamProject { exprs: [id, date_time, expires, _row_id] }
+    └── StreamRowIdGen { row_id_index: 10 }
+        └── StreamSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"] }
+            └── source state table: 9
 
     Fragment 3
-      StreamProject { exprs: [auction, price, date_time, _row_id] }
-        StreamRowIdGen { row_id_index: 7 }
-          StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] }
-              source state table: 10
-
-     Table 0 { columns: [min(max(price)), $expr1], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [min(min(max(price))), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 2 { columns: [$expr1, max(price), id], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [1, 2], distribution key: [2], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 3 { columns: [$expr1, min(max(price)), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 4 { columns: [id, max(price), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [id, date_time, expires, _row_id], primary key: [$0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [id, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [auction, price, date_time, _row_id], primary key: [$0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [auction, _row_id, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 10 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [min_final], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamProject { exprs: [auction, price, date_time, _row_id] }
+    └── StreamRowIdGen { row_id_index: 7 }
+        └──  StreamSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"] } { source state table: 10 }
+
+    Table 0 { columns: [ min(max(price)), $expr1 ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 1 { columns: [ min(min(max(price))), count ], primary key: [], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 2
+    ├── columns: [ $expr1, max(price), id ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 2 ]
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 0
+
+    Table 3 { columns: [ $expr1, min(max(price)), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [], read pk prefix len hint: 1, vnode column idx: 0 }
+
+    Table 4 { columns: [ id, max(price), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ id, date_time, expires, _row_id ], primary key: [ $0 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ id, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ auction, price, date_time, _row_id ], primary key: [ $0 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ auction, _row_id, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ min_final ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
diff --git a/src/frontend/planner_test/tests/testdata/order_by.yaml b/src/frontend/planner_test/tests/testdata/order_by.yaml
index c2daabadd75fd..f89cb179d0103 100644
--- a/src/frontend/planner_test/tests/testdata/order_by.yaml
+++ b/src/frontend/planner_test/tests/testdata/order_by.yaml
@@ -8,7 +8,7 @@
     └─BatchSort { order: [t.v1 DESC] }
       └─BatchScan { table: t, columns: [t.v1, t.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], pk_columns: [t._row_id], order_descs: [v1, t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [v1, t._row_id], pk_conflict: "NoCheck" }
     └─StreamTableScan { table: t, columns: [t.v1, t.v2, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - name: output names are not qualified after table names
   sql: |
@@ -64,7 +64,7 @@
         └─BatchProject { exprs: [t.v1, t.v2, 2:Int32] }
           └─BatchScan { table: t, columns: [t.v1, t.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, 2:Int32(hidden), t._row_id(hidden)], pk_columns: [t._row_id], order_descs: [2:Int32, t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, 2:Int32(hidden), t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [2:Int32, t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.v1, t.v2, 2:Int32, t._row_id] }
       └─StreamTableScan { table: t, columns: [t.v1, t.v2, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - sql: |
@@ -80,7 +80,7 @@
       └─BatchTopN { order: "[t.v1 DESC]", limit: 5, offset: 0 }
         └─BatchScan { table: t, columns: [t.v1, t.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], pk_columns: [t._row_id], order_descs: [v1, t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [v1, t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.v1, t.v2, t._row_id] }
       └─StreamTopN { order: "[t.v1 DESC]", limit: 5, offset: 0 }
         └─StreamExchange { dist: Single }
@@ -112,7 +112,7 @@
       └─BatchTopN { order: "[t.v1 DESC]", limit: 12, offset: 0 }
         └─BatchScan { table: t, columns: [t.v1, t.v2], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], pk_columns: [t._row_id], order_descs: [v1, t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [v1, t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.v1, t.v2, t._row_id] }
       └─StreamTopN { order: "[t.v1 DESC]", limit: 5, offset: 7 }
         └─StreamExchange { dist: Single }
@@ -133,7 +133,7 @@
         └─BatchProject { exprs: [t.x, t.y, (t.x + t.y) as $expr1, t.z] }
           └─BatchScan { table: t, columns: [t.x, t.y, t.z], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [x, y, $expr1(hidden), t.z(hidden), t._row_id(hidden)], pk_columns: [t._row_id], order_descs: [$expr1, t.z, t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [x, y, $expr1(hidden), t.z(hidden), t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [$expr1, t.z, t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.x, t.y, (t.x + t.y) as $expr1, t.z, t._row_id] }
       └─StreamTableScan { table: t, columns: [t.x, t.y, t.z, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - name: order by the number of an output column
diff --git a/src/frontend/planner_test/tests/testdata/over_window_function.yaml b/src/frontend/planner_test/tests/testdata/over_window_function.yaml
index 076c80d3eaccb..48638a90a01e6 100644
--- a/src/frontend/planner_test/tests/testdata/over_window_function.yaml
+++ b/src/frontend/planner_test/tests/testdata/over_window_function.yaml
@@ -104,7 +104,7 @@
           └─BatchFilter { predicate: (t.x > t.y) }
             └─BatchScan { table: t, columns: [t.x, t.y, t._row_id], distribution: UpstreamHashShard(t._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [x, y, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [x, y, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(t._row_id) }
       └─StreamProject { exprs: [t.x, t.y, t._row_id] }
         └─StreamGroupTopN { order: "[t.x ASC]", limit: 2, offset: 0, group_key: [1] }
@@ -132,7 +132,7 @@
         └─BatchExchange { order: [], dist: HashShard(t.y) }
           └─BatchScan { table: t, columns: [t.x, t.y, t._row_id], distribution: UpstreamHashShard(t._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [x, y, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [x, y, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(t._row_id) }
       └─StreamProject { exprs: [t.x, t.y, t._row_id] }
         └─StreamGroupTopN { order: "[t.x ASC]", limit: 3, offset: 0, group_key: [1], with_ties: true }
@@ -288,7 +288,7 @@
       )
     ) WHERE rownum <= 3;
   stream_plan: |
-    StreamMaterialize { columns: [window_start, window_end, supplier_id, price, cnt], pk_columns: [window_start, window_end, supplier_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [window_start, window_end, supplier_id, price, cnt], stream_key: [window_start, window_end, supplier_id], pk_columns: [window_start, window_end, supplier_id], pk_conflict: "NoCheck" }
     └─StreamGroupTopN { order: "[sum(bid.price) DESC]", limit: 3, offset: 0, group_key: [0, 1] }
       └─StreamExchange { dist: HashShard($expr1, $expr2) }
         └─StreamHashAgg { group_key: [$expr1, $expr2, bid.supplier_id], aggs: [sum(bid.price), count] }
@@ -307,7 +307,7 @@
           TUMBLE(Bid, bidtime, INTERVAL '10' MINUTE)
     ) WHERE rownum <= 3;
   stream_plan: |
-    StreamMaterialize { columns: [window_start, window_end, supplier_id, price, bid._row_id(hidden)], pk_columns: [bid._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [window_start, window_end, supplier_id, price, bid._row_id(hidden)], stream_key: [bid._row_id], pk_columns: [bid._row_id], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(bid._row_id) }
       └─StreamProject { exprs: [$expr1, $expr2, bid.supplier_id, bid.price, bid._row_id] }
         └─StreamGroupTopN { order: "[bid.price DESC]", limit: 3, offset: 0, group_key: [5, 6] }
@@ -331,7 +331,7 @@
     └─LogicalTopN { order: "[t.y ASC]", limit: 1, offset: 0, group_key: [0] }
       └─LogicalScan { table: t, columns: [t.x, t.y, t._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [x, y, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [x, y, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamExchange { dist: HashShard(t._row_id) }
       └─StreamProject { exprs: [t.x, t.y, t._row_id] }
         └─StreamGroupTopN { order: "[t.y ASC]", limit: 1, offset: 0, group_key: [0] }
diff --git a/src/frontend/planner_test/tests/testdata/pk_derive.yaml b/src/frontend/planner_test/tests/testdata/pk_derive.yaml
index 7637a46f8885c..9a771a9f396c1 100644
--- a/src/frontend/planner_test/tests/testdata/pk_derive.yaml
+++ b/src/frontend/planner_test/tests/testdata/pk_derive.yaml
@@ -20,7 +20,7 @@
     ON
         Tone.id = Ttwo.id;
   stream_plan: |
-    StreamMaterialize { columns: [max_v1, max_v2, t1.id(hidden), t2.id(hidden)], pk_columns: [t1.id, t2.id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_v1, max_v2, t1.id(hidden), t2.id(hidden)], stream_key: [t1.id, t2.id], pk_columns: [t1.id, t2.id], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t1.id = t2.id, output: [max(t1.v1), max(t2.v2), t1.id, t2.id] }
       ├─StreamProject { exprs: [max(t1.v1), t1.id] }
       | └─StreamHashAgg { group_key: [t1.id], aggs: [max(t1.v1), count] }
@@ -50,7 +50,7 @@
     ON
         Tone.id = Ttwo.id;
   stream_plan: |
-    StreamMaterialize { columns: [max_v, min_v, t.id(hidden), t.id#1(hidden)], pk_columns: [t.id, t.id#1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [max_v, min_v, t.id(hidden), t.id#1(hidden)], stream_key: [t.id, t.id#1], pk_columns: [t.id, t.id#1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t.id = t.id, output: [max(t.v), min(t.v), t.id, t.id] }
       ├─StreamProject { exprs: [max(t.v), t.id] }
       | └─StreamHashAgg { group_key: [t.id], aggs: [max(t.v), count] }
@@ -78,7 +78,7 @@
     LogicalAgg { group_key: [t.v1, t.v2, t.v3], aggs: [] }
     └─LogicalScan { table: t, columns: [t.v1, t.v2, t.v3] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, v3], pk_columns: [v1, v2, v3], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, v3], stream_key: [v1, v2, v3], pk_columns: [v1, v2, v3], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t.v1, t.v2, t.v3] }
       └─StreamHashAgg { group_key: [t.v1, t.v2, t.v3], aggs: [count] }
         └─StreamExchange { dist: HashShard(t.v1, t.v2, t.v3) }
@@ -103,6 +103,6 @@
   optimized_logical_plan_for_batch: |
     LogicalScan { table: mv, output_columns: [mv.v1], required_columns: [mv.v1, mv.v3], predicate: ((mv.v3 = 'world':Varchar) OR (mv.v3 = 'hello':Varchar)) }
   stream_plan: |
-    StreamMaterialize { columns: [v1, mv.v2(hidden), mv.v3(hidden)], pk_columns: [v1, mv.v2, mv.v3], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, mv.v2(hidden), mv.v3(hidden)], stream_key: [v1, mv.v2, mv.v3], pk_columns: [v1, mv.v2, mv.v3], pk_conflict: "NoCheck" }
     └─StreamFilter { predicate: ((mv.v3 = 'world':Varchar) OR (mv.v3 = 'hello':Varchar)) }
       └─StreamTableScan { table: mv, columns: [mv.v1, mv.v2, mv.v3], pk: [mv.v1, mv.v2, mv.v3], dist: UpstreamHashShard(mv.v1, mv.v2, mv.v3) }
diff --git a/src/frontend/planner_test/tests/testdata/predicate_pushdown.yaml b/src/frontend/planner_test/tests/testdata/predicate_pushdown.yaml
index 585e555870eba..f69991326119f 100644
--- a/src/frontend/planner_test/tests/testdata/predicate_pushdown.yaml
+++ b/src/frontend/planner_test/tests/testdata/predicate_pushdown.yaml
@@ -10,9 +10,7 @@
         └─LogicalProject { exprs: [t.v1] }
           └─LogicalScan { table: t, columns: [t.v1, t.v2, t.v3, t.v4, t._row_id] }
   optimized_logical_plan_for_batch: |
-    LogicalFilter { predicate: false:Boolean }
-    └─LogicalAgg { aggs: [min(t.v1)] }
-      └─LogicalScan { table: t, columns: [t.v1] }
+    LogicalValues { rows: [], schema: Schema { fields: [min(t.v1):Int32] } }
 - name: filter should not transpose limit
   sql: |
     create table t(v1 int, v2 int, v3 int, v4 int);
@@ -263,7 +261,7 @@
     | └─LogicalScan { table: t1, columns: [t1.v1] }
     └─LogicalScan { table: t2, columns: [t2.v2] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, t1._row_id(hidden), t2._row_id(hidden)], pk_columns: [t1._row_id, t2._row_id, v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, t1._row_id(hidden), t2._row_id(hidden)], stream_key: [t1._row_id, t2._row_id, v1], pk_columns: [t1._row_id, t2._row_id, v1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t1.v1 = t2.v2, output: [t1.v1, t2.v2, t1._row_id, t2._row_id] }
       ├─StreamExchange { dist: HashShard(t1.v1) }
       | └─StreamDynamicFilter { predicate: (t1.v1 > $expr1), output_watermarks: [t1.v1], output: [t1.v1, t1._row_id] }
@@ -303,7 +301,7 @@
     LogicalFilter { predicate: (t1.v1 > (Now + '00:30:00':Interval)) }
     └─LogicalScan { table: t1, columns: [t1.v1, t1.v2], predicate: (t1.v2 > 5:Int32) }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check", watermark_columns: [v1] }
+    StreamMaterialize { columns: [v1, v2, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck", watermark_columns: [v1] }
     └─StreamDynamicFilter { predicate: (t1.v1 > $expr1), output_watermarks: [t1.v1], output: [t1.v1, t1.v2, t1._row_id] }
       ├─StreamFilter { predicate: (t1.v2 > 5:Int32) }
       | └─StreamTableScan { table: t1, columns: [t1.v1, t1.v2, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -349,7 +347,7 @@
     | └─LogicalScan { table: t1, columns: [t1.v1] }
     └─LogicalScan { table: t2, columns: [t2.v2] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, v2, t1._row_id(hidden), t2._row_id(hidden)], pk_columns: [t1._row_id, t2._row_id, v1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [v1, v2, t1._row_id(hidden), t2._row_id(hidden)], stream_key: [t1._row_id, t2._row_id, v1], pk_columns: [t1._row_id, t2._row_id, v1], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: t1.v1 = t2.v2, output: [t1.v1, t2.v2, t1._row_id, t2._row_id] }
       ├─StreamExchange { dist: HashShard(t1.v1) }
       | └─StreamDynamicFilter { predicate: (t1.v1 > now), output_watermarks: [t1.v1], output: [t1.v1, t1._row_id] }
diff --git a/src/frontend/planner_test/tests/testdata/project_set.yaml b/src/frontend/planner_test/tests/testdata/project_set.yaml
index b2cbca50a1df1..2c211e3649491 100644
--- a/src/frontend/planner_test/tests/testdata/project_set.yaml
+++ b/src/frontend/planner_test/tests/testdata/project_set.yaml
@@ -26,7 +26,7 @@
       └─BatchProjectSet { select_list: [Unnest($0)] }
         └─BatchScan { table: t, columns: [t.x, t._row_id], distribution: UpstreamHashShard(t._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [projected_row_id(hidden), unnest, t._row_id(hidden)], pk_columns: [t._row_id, projected_row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [projected_row_id(hidden), unnest, t._row_id(hidden)], stream_key: [t._row_id, projected_row_id], pk_columns: [t._row_id, projected_row_id], pk_conflict: "NoCheck" }
     └─StreamProjectSet { select_list: [Unnest($0), $1] }
       └─StreamTableScan { table: t, columns: [t.x, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - name: table functions used with usual expressions
@@ -67,7 +67,7 @@
         └─BatchProjectSet { select_list: [$0, $1, Unnest($0), Unnest($0)] }
           └─BatchScan { table: t, columns: [t.x, t._row_id], distribution: UpstreamHashShard(t._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [projected_row_id(hidden), a, b, t._row_id(hidden), projected_row_id#1(hidden)], pk_columns: [t._row_id, projected_row_id#1, projected_row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [projected_row_id(hidden), a, b, t._row_id(hidden), projected_row_id#1(hidden)], stream_key: [t._row_id, projected_row_id#1, projected_row_id], pk_columns: [t._row_id, projected_row_id#1, projected_row_id], pk_conflict: "NoCheck" }
     └─StreamProjectSet { select_list: [($3 * $4), Unnest($1), $2, $0] }
       └─StreamProjectSet { select_list: [$0, $1, Unnest($0), Unnest($0)] }
         └─StreamTableScan { table: t, columns: [t.x, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
@@ -94,7 +94,7 @@
           └─BatchProjectSet { select_list: [Unnest($0)] }
             └─BatchScan { table: t, columns: [t.x, t._row_id], distribution: UpstreamHashShard(t._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [projected_row_id(hidden), unnest, t._row_id(hidden)], pk_columns: [t._row_id, projected_row_id], order_descs: [projected_row_id, t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [projected_row_id(hidden), unnest, t._row_id(hidden)], stream_key: [t._row_id, projected_row_id], pk_columns: [projected_row_id, t._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [projected_row_id, Unnest($0), t._row_id] }
       └─StreamTopN { order: "[projected_row_id ASC]", limit: 1, offset: 0 }
         └─StreamExchange { dist: Single }
@@ -114,7 +114,7 @@
         └─BatchProjectSet { select_list: [Unnest($0)] }
           └─BatchScan { table: t, columns: [t.x, t._row_id], distribution: UpstreamHashShard(t._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [unnest], pk_columns: [unnest], pk_conflict: "no check" }
+    StreamMaterialize { columns: [unnest], stream_key: [unnest], pk_columns: [unnest], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [Unnest($0)] }
       └─StreamHashAgg { group_key: [Unnest($0)], aggs: [count] }
         └─StreamExchange { dist: HashShard(Unnest($0)) }
@@ -130,7 +130,7 @@
         └─BatchProjectSet { select_list: [Unnest($0)] }
           └─BatchScan { table: t, columns: [t.x, t._row_id], distribution: UpstreamHashShard(t._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [unnest, t._row_id(hidden), projected_row_id(hidden)], pk_columns: [t._row_id, projected_row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [unnest, t._row_id(hidden), projected_row_id(hidden)], stream_key: [t._row_id, projected_row_id], pk_columns: [t._row_id, projected_row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [Unnest($0), t._row_id, projected_row_id] }
       └─StreamFilter { predicate: (Unnest($0) > 1:Int32) }
         └─StreamProjectSet { select_list: [Unnest($0), $1] }
@@ -153,7 +153,7 @@
           └─BatchProjectSet { select_list: [Unnest($0)] }
             └─BatchScan { table: t, columns: [t.x, t._row_id], distribution: UpstreamHashShard(t._row_id) }
   stream_plan: |
-    StreamMaterialize { columns: [unnest, t._row_id(hidden), projected_row_id(hidden), t._row_id#1(hidden), projected_row_id#1(hidden)], pk_columns: [t._row_id, projected_row_id, t._row_id#1, projected_row_id#1, unnest], pk_conflict: "no check" }
+    StreamMaterialize { columns: [unnest, t._row_id(hidden), projected_row_id(hidden), t._row_id#1(hidden), projected_row_id#1(hidden)], stream_key: [t._row_id, projected_row_id, t._row_id#1, projected_row_id#1, unnest], pk_columns: [t._row_id, projected_row_id, t._row_id#1, projected_row_id#1, unnest], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: Unnest($0) = Unnest($0), output: [Unnest($0), t._row_id, projected_row_id, t._row_id, projected_row_id] }
       ├─StreamExchange { dist: HashShard(Unnest($0)) }
       | └─StreamProject { exprs: [Unnest($0), t._row_id, projected_row_id] }
diff --git a/src/frontend/planner_test/tests/testdata/share.yaml b/src/frontend/planner_test/tests/testdata/share.yaml
index 4d06322b550b7..ea3c8af16dcbe 100644
--- a/src/frontend/planner_test/tests/testdata/share.yaml
+++ b/src/frontend/planner_test/tests/testdata/share.yaml
@@ -34,7 +34,7 @@
               └─BatchFilter { predicate: (initial_bid = 2:Int32) }
                 └─BatchSource { source: "auction", columns: ["id", "item_name", "description", "initial_bid", "reserve", "date_time", "expires", "seller", "category", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [cnt], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [cnt], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum0(count)] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [sum0(count), count] }
         └─StreamExchange { dist: Single }
@@ -109,7 +109,7 @@
                     └─BatchFilter { predicate: IsNotNull(date_time) }
                       └─BatchSource { source: "bid", columns: ["auction", "bidder", "price", "channel", "url", "date_time", "extra", "_row_id"], filter: (None, None) }
   stream_plan: |
-    StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], pk_columns: [auction, window_start, window_start#1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [auction, num, window_start(hidden), window_start#1(hidden)], stream_key: [auction, window_start, window_start#1], pk_columns: [auction, window_start, window_start#1], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [auction, count, window_start, window_start] }
       └─StreamFilter { predicate: (count >= max(count)) }
         └─StreamHashJoin { type: Inner, predicate: window_start = window_start, output: all }
@@ -140,7 +140,7 @@
     create table t(a int, b int);
     with cte as (select count(*) from t) select * from cte union all select * from cte;
   stream_plan: |
-    StreamMaterialize { columns: [count, 0:Int32(hidden)], pk_columns: [0:Int32], pk_conflict: "no check" }
+    StreamMaterialize { columns: [count, 0:Int32(hidden)], stream_key: [0:Int32], pk_columns: [0:Int32], pk_conflict: "NoCheck" }
     └─StreamUnion { all: true }
       ├─StreamExchange { dist: HashShard(0:Int32) }
       | └─StreamProject { exprs: [sum0(count), 0:Int32] }
@@ -163,7 +163,7 @@
     create table t(a int, b int);
     with cte as (select count(*) from t) select * from cte union all select * from cte;
   stream_plan: |
-    StreamMaterialize { columns: [count, 0:Int32(hidden)], pk_columns: [0:Int32], pk_conflict: "no check" }
+    StreamMaterialize { columns: [count, 0:Int32(hidden)], stream_key: [0:Int32], pk_columns: [0:Int32], pk_conflict: "NoCheck" }
     └─StreamUnion { all: true }
       ├─StreamExchange { dist: HashShard(0:Int32) }
       | └─StreamProject { exprs: [sum0(count), 0:Int32] }
@@ -184,7 +184,7 @@
     set rw_enable_share_plan=false;
     select count(*) cnt from auction A join auction B on A.id = B.id;
   stream_plan: |
-    StreamMaterialize { columns: [cnt], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [cnt], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum0(count)] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [sum0(count), count] }
         └─StreamExchange { dist: Single }
diff --git a/src/frontend/planner_test/tests/testdata/shared_views.yaml b/src/frontend/planner_test/tests/testdata/shared_views.yaml
index 0b4b44dbb81fc..8e4fbe45024eb 100644
--- a/src/frontend/planner_test/tests/testdata/shared_views.yaml
+++ b/src/frontend/planner_test/tests/testdata/shared_views.yaml
@@ -22,7 +22,7 @@
                     └─LogicalFilter { predicate: (t1.y > 0:Int32) }
                       └─LogicalScan { table: t1, columns: [t1.x, t1.y, t1._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [z, a, b, t1._row_id(hidden), t1._row_id#1(hidden), t1._row_id#2(hidden), t1.x(hidden)], pk_columns: [t1._row_id, t1._row_id#1, t1._row_id#2, t1.x, z], pk_conflict: "no check" }
+    StreamMaterialize { columns: [z, a, b, t1._row_id(hidden), t1._row_id#1(hidden), t1._row_id#2(hidden), t1.x(hidden)], stream_key: [t1._row_id, t1._row_id#1, t1._row_id#2, t1.x, z], pk_columns: [t1._row_id, t1._row_id#1, t1._row_id#2, t1.x, z], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: $expr1 = $expr2, output: [$expr1, $expr2, $expr3, t1._row_id, t1._row_id, t1._row_id, t1.x] }
       ├─StreamExchange { dist: HashShard($expr1) }
       | └─StreamProject { exprs: [$expr1, t1._row_id] }
diff --git a/src/frontend/planner_test/tests/testdata/stream_dist_agg.yaml b/src/frontend/planner_test/tests/testdata/stream_dist_agg.yaml
index 9b316279386cb..c76dcbeb1b725 100644
--- a/src/frontend/planner_test/tests/testdata/stream_dist_agg.yaml
+++ b/src/frontend/planner_test/tests/testdata/stream_dist_agg.yaml
@@ -16,24 +16,44 @@
     └─BatchSimpleAgg { aggs: [max(s.v)] }
       └─BatchScan { table: s, columns: [s.v], distribution: Single }
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(s.v)] }
       └─StreamGlobalSimpleAgg { aggs: [max(s.v), count] }
         └─StreamTableScan { table: s, columns: [s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(s.v)] }
-          StreamGlobalSimpleAgg { aggs: [max(s.v), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            Chain { table: s, columns: [s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [s_v, s_t__row_id], primary key: [$0 DESC, $1 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [max(s_v), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(s.v)] }
+        └── StreamGlobalSimpleAgg { aggs: [max(s.v), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └── Chain { table: s, columns: [s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ s_v, s_t__row_id ]
+    ├── primary key: [ $0 DESC, $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ max(s_v), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
 - id: sum_on_single
   before:
   - create_tables
@@ -44,23 +64,37 @@
     └─BatchSimpleAgg { aggs: [sum(s.v)] }
       └─BatchScan { table: s, columns: [s.v], distribution: Single }
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(s.v)] }
       └─StreamGlobalSimpleAgg { aggs: [sum(s.v), count] }
         └─StreamTableScan { table: s, columns: [s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(s.v)] }
-          StreamGlobalSimpleAgg { aggs: [sum(s.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            Chain { table: s, columns: [s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [sum(s_v), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(s.v)] }
+        └── StreamGlobalSimpleAgg { aggs: [sum(s.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └── Chain { table: s, columns: [s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ sum(s_v), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
 - id: cnt_on_single
   before:
   - create_tables
@@ -71,23 +105,37 @@
     └─BatchSimpleAgg { aggs: [count(s.v)] }
       └─BatchScan { table: s, columns: [s.v], distribution: Single }
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [count(s.v)] }
       └─StreamGlobalSimpleAgg { aggs: [count(s.v), count] }
         └─StreamTableScan { table: s, columns: [s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [count(s.v)] }
-          StreamGlobalSimpleAgg { aggs: [count(s.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            Chain { table: s, columns: [s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [count(s_v), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [count(s.v)] }
+        └── StreamGlobalSimpleAgg { aggs: [count(s.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └── Chain { table: s, columns: [s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ count(s_v), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
 - id: string_agg_on_single
   before:
   - create_tables
@@ -99,26 +147,46 @@
       └─BatchProject { exprs: [s.s, ',':Varchar, s.v] }
         └─BatchScan { table: s, columns: [s.v, s.s], distribution: Single }
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [string_agg(s.s, ',':Varchar order_by(s.v ASC))] }
       └─StreamGlobalSimpleAgg { aggs: [string_agg(s.s, ',':Varchar order_by(s.v ASC)), count] }
         └─StreamProject { exprs: [s.s, ',':Varchar, s.v, s.t._row_id] }
           └─StreamTableScan { table: s, columns: [s.v, s.s, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [string_agg(s.s, ',':Varchar order_by(s.v ASC))] }
-          StreamGlobalSimpleAgg { aggs: [string_agg(s.s, ',':Varchar order_by(s.v ASC)), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamProject { exprs: [s.s, ',':Varchar, s.v, s.t._row_id] }
-              Chain { table: s, columns: [s.v, s.s, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-                Upstream
-                BatchPlanNode
-
-     Table 0 { columns: [s_v, s_t__row_id, s_s, ',':Varchar], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [string_agg(s_s, ',':Varchar order_by(s_v ASC)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [string_agg(s.s, ',':Varchar order_by(s.v ASC))] }
+        └── StreamGlobalSimpleAgg { aggs: [string_agg(s.s, ',':Varchar order_by(s.v ASC)), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └── StreamProject { exprs: [s.s, ',':Varchar, s.v, s.t._row_id] }
+                └── Chain { table: s, columns: [s.v, s.s, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
+                    ├──  Upstream
+                    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ s_v, s_t__row_id, s_s, ',':Varchar ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ string_agg(s_s, ',':Varchar order_by(s_v ASC)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
 - id: extreme_on_T
   before:
   - create_tables
@@ -130,64 +198,114 @@
       └─BatchSimpleAgg { aggs: [max(t.v)] }
         └─BatchScan { table: t, columns: [t.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(max(t.v))] }
       └─StreamGlobalSimpleAgg { aggs: [max(max(t.v)), count] }
         └─StreamExchange { dist: Single }
           └─StreamHashAgg { group_key: [$expr1], aggs: [max(t.v), count] }
             └─StreamProject { exprs: [t.v, t._row_id, Vnode(t._row_id) as $expr1] }
               └─StreamTableScan { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(max(t.v))] }
-          StreamGlobalSimpleAgg { aggs: [max(max(t.v)), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(max(t.v))] }
+        └── StreamGlobalSimpleAgg { aggs: [max(max(t.v)), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamHashAgg { group_key: [$expr1], aggs: [max(t.v), count] }
-          result table: 3, state tables: [2], distinct tables: []
-        StreamProject { exprs: [t.v, t._row_id, Vnode(t._row_id) as $expr1] }
-          Chain { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [max(t_v), $expr1], primary key: [$0 DESC, $1 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [max(max(t_v)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 2 { columns: [$expr1, t_v, t__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [2], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 3 { columns: [$expr1, max(t_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamHashAgg { group_key: [$expr1], aggs: [max(t.v), count] }
+    ├── result table: 3
+    ├── state tables: [ 2 ]
+    ├── distinct tables: []
+    └── StreamProject { exprs: [t.v, t._row_id, Vnode(t._row_id) as $expr1] }
+        └── Chain { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ max(t_v), $expr1 ]
+    ├── primary key: [ $0 DESC, $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ max(max(t_v)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 2
+    ├── columns: [ $expr1, t_v, t__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 2 ]
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 0
+
+    Table 3
+    ├── columns: [ $expr1, max(t_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: []
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
 - id: extreme_on_AO
   before:
   - create_tables
   sql: |
     select max(v) as a1 from AO;
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(max(ao.v))] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [max(max(ao.v)), count] }
         └─StreamExchange { dist: Single }
           └─StreamStatelessLocalSimpleAgg { aggs: [max(ao.v)] }
             └─StreamTableScan { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(max(ao.v))] }
-          StreamAppendOnlyGlobalSimpleAgg { aggs: [max(max(ao.v)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(max(ao.v))] }
+        └── StreamAppendOnlyGlobalSimpleAgg { aggs: [max(max(ao.v)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [max(ao.v)] }
-        Chain { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamStatelessLocalSimpleAgg { aggs: [max(ao.v)] }
+    └── Chain { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ max(max(ao_v)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
 
-     Table 0 { columns: [max(max(ao_v)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
 - id: sum_on_T
   before:
   - create_tables
@@ -199,58 +317,86 @@
       └─BatchSimpleAgg { aggs: [sum(t.v)] }
         └─BatchScan { table: t, columns: [t.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum(t.v))] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum(t.v)), count] }
         └─StreamExchange { dist: Single }
           └─StreamStatelessLocalSimpleAgg { aggs: [sum(t.v)] }
             └─StreamTableScan { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(sum(t.v))] }
-          StreamGlobalSimpleAgg { aggs: [sum(sum(t.v)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(sum(t.v))] }
+        └── StreamGlobalSimpleAgg { aggs: [sum(sum(t.v)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [sum(t.v)] }
-        Chain { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamStatelessLocalSimpleAgg { aggs: [sum(t.v)] }
+    └── Chain { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ sum(sum(t_v)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
 
-     Table 0 { columns: [sum(sum(t_v)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
 - id: sum_on_AO
   before:
   - create_tables
   sql: |
     select sum(v) as a1 from AO;
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum(ao.v))] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [sum(sum(ao.v)), count] }
         └─StreamExchange { dist: Single }
           └─StreamStatelessLocalSimpleAgg { aggs: [sum(ao.v)] }
             └─StreamTableScan { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(sum(ao.v))] }
-          StreamAppendOnlyGlobalSimpleAgg { aggs: [sum(sum(ao.v)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(sum(ao.v))] }
+        └── StreamAppendOnlyGlobalSimpleAgg { aggs: [sum(sum(ao.v)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [sum(ao.v)] }
-        Chain { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamStatelessLocalSimpleAgg { aggs: [sum(ao.v)] }
+    └── Chain { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ sum(sum(ao_v)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
 
-     Table 0 { columns: [sum(sum(ao_v)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
 - id: cnt_on_T
   before:
   - create_tables
@@ -262,58 +408,86 @@
       └─BatchSimpleAgg { aggs: [count(t.v)] }
         └─BatchScan { table: t, columns: [t.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum0(count(t.v))] }
       └─StreamGlobalSimpleAgg { aggs: [sum0(count(t.v)), count] }
         └─StreamExchange { dist: Single }
           └─StreamStatelessLocalSimpleAgg { aggs: [count(t.v)] }
             └─StreamTableScan { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum0(count(t.v))] }
-          StreamGlobalSimpleAgg { aggs: [sum0(count(t.v)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum0(count(t.v))] }
+        └── StreamGlobalSimpleAgg { aggs: [sum0(count(t.v)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [count(t.v)] }
-        Chain { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamStatelessLocalSimpleAgg { aggs: [count(t.v)] }
+    └── Chain { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ sum0(count(t_v)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
 
-     Table 0 { columns: [sum0(count(t_v)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
 - id: cnt_on_AO
   before:
   - create_tables
   sql: |
     select count(v) as a1 from AO;
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum0(count(ao.v))] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [sum0(count(ao.v)), count] }
         └─StreamExchange { dist: Single }
           └─StreamStatelessLocalSimpleAgg { aggs: [count(ao.v)] }
             └─StreamTableScan { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum0(count(ao.v))] }
-          StreamAppendOnlyGlobalSimpleAgg { aggs: [sum0(count(ao.v)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum0(count(ao.v))] }
+        └── StreamAppendOnlyGlobalSimpleAgg { aggs: [sum0(count(ao.v)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [count(ao.v)] }
-        Chain { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamStatelessLocalSimpleAgg { aggs: [count(ao.v)] }
+    └── Chain { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ sum0(count(ao_v)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
 
-     Table 0 { columns: [sum0(count(ao_v)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
 - id: string_agg_on_T
   before:
   - create_tables
@@ -325,59 +499,93 @@
       └─BatchProject { exprs: [t.s, ',':Varchar, t.o] }
         └─BatchScan { table: t, columns: [t.o, t.s], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [string_agg(t.s, ',':Varchar order_by(t.o ASC))] }
       └─StreamGlobalSimpleAgg { aggs: [string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
         └─StreamExchange { dist: Single }
           └─StreamProject { exprs: [t.s, ',':Varchar, t.o, t._row_id] }
             └─StreamTableScan { table: t, columns: [t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [string_agg(t.s, ',':Varchar order_by(t.o ASC))] }
-          StreamGlobalSimpleAgg { aggs: [string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [string_agg(t.s, ',':Varchar order_by(t.o ASC))] }
+        └── StreamGlobalSimpleAgg { aggs: [string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamProject { exprs: [t.s, ',':Varchar, t.o, t._row_id] }
-        Chain { table: t, columns: [t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [t_o, t__row_id, t_s, ',':Varchar], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [string_agg(t_s, ',':Varchar order_by(t_o ASC)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamProject { exprs: [t.s, ',':Varchar, t.o, t._row_id] }
+    └── Chain { table: t, columns: [t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ t_o, t__row_id, t_s, ',':Varchar ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ string_agg(t_s, ',':Varchar order_by(t_o ASC)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
 - id: string_agg_on_AO
   before:
   - create_tables
   sql: |
     select string_agg(s, ',' order by o) as a1 from AO;
   stream_plan: |
-    StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC))] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
         └─StreamExchange { dist: Single }
           └─StreamProject { exprs: [ao.s, ',':Varchar, ao.o, ao._row_id] }
             └─StreamTableScan { table: ao, columns: [ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC))] }
-          StreamAppendOnlyGlobalSimpleAgg { aggs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC))] }
+        └── StreamAppendOnlyGlobalSimpleAgg { aggs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamProject { exprs: [ao.s, ',':Varchar, ao.o, ao._row_id] }
-        Chain { table: ao, columns: [ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [ao.s, ',':Varchar, ao.o, ao._row_id] }
+    └── Chain { table: ao, columns: [ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ string_agg(ao_s, ',':Varchar order_by(ao_o ASC)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1 ]
+    ├── primary key: []
+    ├── value indices: [ 0 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
 
-     Table 0 { columns: [string_agg(ao_s, ',':Varchar order_by(ao_o ASC)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
 - id: extreme_count_on_T
   before:
   - create_tables
@@ -389,64 +597,114 @@
       └─BatchSimpleAgg { aggs: [max(t.v), count(t.v)] }
         └─BatchScan { table: t, columns: [t.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(max(t.v)), sum0(count(t.v))] }
       └─StreamGlobalSimpleAgg { aggs: [max(max(t.v)), sum0(count(t.v)), count] }
         └─StreamExchange { dist: Single }
           └─StreamHashAgg { group_key: [$expr1], aggs: [max(t.v), count(t.v), count] }
             └─StreamProject { exprs: [t.v, t._row_id, Vnode(t._row_id) as $expr1] }
               └─StreamTableScan { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(max(t.v)), sum0(count(t.v))] }
-          StreamGlobalSimpleAgg { aggs: [max(max(t.v)), sum0(count(t.v)), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(max(t.v)), sum0(count(t.v))] }
+        └── StreamGlobalSimpleAgg { aggs: [max(max(t.v)), sum0(count(t.v)), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamHashAgg { group_key: [$expr1], aggs: [max(t.v), count(t.v), count] }
-          result table: 3, state tables: [2], distinct tables: []
-        StreamProject { exprs: [t.v, t._row_id, Vnode(t._row_id) as $expr1] }
-          Chain { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [max(t_v), $expr1], primary key: [$0 DESC, $1 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [max(max(t_v)), sum0(count(t_v)), count], primary key: [], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 2 { columns: [$expr1, t_v, t__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [2], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 3 { columns: [$expr1, max(t_v), count(t_v), count], primary key: [$0 ASC], value indices: [1, 2, 3], distribution key: [], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 4294967294 { columns: [a1, a2], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
+    StreamHashAgg { group_key: [$expr1], aggs: [max(t.v), count(t.v), count] }
+    ├── result table: 3
+    ├── state tables: [ 2 ]
+    ├── distinct tables: []
+    └── StreamProject { exprs: [t.v, t._row_id, Vnode(t._row_id) as $expr1] }
+        └── Chain { table: t, columns: [t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ max(t_v), $expr1 ]
+    ├── primary key: [ $0 DESC, $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ max(max(t_v)), sum0(count(t_v)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 2
+    ├── columns: [ $expr1, t_v, t__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 2 ]
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 0
+
+    Table 3
+    ├── columns: [ $expr1, max(t_v), count(t_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2, 3 ]
+    ├── distribution key: []
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 0
+
+    Table 4294967294
+    ├── columns: [ a1, a2 ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
 - id: extreme_count_on_AO
   before:
   - create_tables
   sql: |
     select max(v) as a1, count(v) as a2 from AO;
   stream_plan: |
-    StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(max(ao.v)), sum0(count(ao.v))] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [max(max(ao.v)), sum0(count(ao.v)), count] }
         └─StreamExchange { dist: Single }
           └─StreamStatelessLocalSimpleAgg { aggs: [max(ao.v), count(ao.v)] }
             └─StreamTableScan { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(max(ao.v)), sum0(count(ao.v))] }
-          StreamAppendOnlyGlobalSimpleAgg { aggs: [max(max(ao.v)), sum0(count(ao.v)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(max(ao.v)), sum0(count(ao.v))] }
+        └── StreamAppendOnlyGlobalSimpleAgg { aggs: [max(max(ao.v)), sum0(count(ao.v)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [max(ao.v), count(ao.v)] }
-        Chain { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamStatelessLocalSimpleAgg { aggs: [max(ao.v), count(ao.v)] }
+    └── Chain { table: ao, columns: [ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ max(max(ao_v)), sum0(count(ao_v)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1, a2 ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
 
-     Table 0 { columns: [max(max(ao_v)), sum0(count(ao_v)), count], primary key: [], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1, a2], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
 - id: count_string_agg_on_T
   before:
   - create_tables
@@ -458,59 +716,93 @@
       └─BatchProject { exprs: [t.v, t.s, ',':Varchar, t.o] }
         └─BatchScan { table: t, columns: [t.v, t.o, t.s], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [count(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC))] }
       └─StreamGlobalSimpleAgg { aggs: [count(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
         └─StreamExchange { dist: Single }
           └─StreamProject { exprs: [t.v, t.s, ',':Varchar, t.o, t._row_id] }
             └─StreamTableScan { table: t, columns: [t.v, t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [count(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC))] }
-          StreamGlobalSimpleAgg { aggs: [count(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [count(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC))] }
+        └── StreamGlobalSimpleAgg { aggs: [count(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamProject { exprs: [t.v, t.s, ',':Varchar, t.o, t._row_id] }
-        Chain { table: t, columns: [t.v, t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [t_o, t__row_id, t_s, ',':Varchar], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [count(t_v), string_agg(t_s, ',':Varchar order_by(t_o ASC)), count], primary key: [], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1, a2], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
+    StreamProject { exprs: [t.v, t.s, ',':Varchar, t.o, t._row_id] }
+    └── Chain { table: t, columns: [t.v, t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ t_o, t__row_id, t_s, ',':Varchar ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ count(t_v), string_agg(t_s, ',':Varchar order_by(t_o ASC)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1, a2 ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
 - id: count_string_agg_on_AO
   before:
   - create_tables
   sql: |
     select count(v) as a1, string_agg(s, ',' order by o) as a2 from AO;
   stream_plan: |
-    StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [count(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC))] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [count(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
         └─StreamExchange { dist: Single }
           └─StreamProject { exprs: [ao.v, ao.s, ',':Varchar, ao.o, ao._row_id] }
             └─StreamTableScan { table: ao, columns: [ao.v, ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [count(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC))] }
-          StreamAppendOnlyGlobalSimpleAgg { aggs: [count(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [count(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC))] }
+        └── StreamAppendOnlyGlobalSimpleAgg { aggs: [count(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamProject { exprs: [ao.v, ao.s, ',':Varchar, ao.o, ao._row_id] }
-        Chain { table: ao, columns: [ao.v, ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [ao.v, ao.s, ',':Varchar, ao.o, ao._row_id] }
+    └── Chain { table: ao, columns: [ao.v, ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ count(ao_v), string_agg(ao_s, ',':Varchar order_by(ao_o ASC)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1, a2 ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
 
-     Table 0 { columns: [count(ao_v), string_agg(ao_s, ',':Varchar order_by(ao_o ASC)), count], primary key: [], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1, a2], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
 - id: extreme_string_agg_on_T
   before:
   - create_tables
@@ -522,60 +814,100 @@
       └─BatchProject { exprs: [t.v, t.s, ',':Varchar, t.o] }
         └─BatchScan { table: t, columns: [t.v, t.o, t.s], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC))] }
       └─StreamGlobalSimpleAgg { aggs: [max(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
         └─StreamExchange { dist: Single }
           └─StreamProject { exprs: [t.v, t.s, ',':Varchar, t.o, t._row_id] }
             └─StreamTableScan { table: t, columns: [t.v, t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC))] }
-          StreamGlobalSimpleAgg { aggs: [max(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
-              result table: 2, state tables: [0, 1], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC))] }
+        └── StreamGlobalSimpleAgg { aggs: [max(t.v), string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
+            ├── result table: 2
+            ├── state tables: [ 0, 1 ]
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamProject { exprs: [t.v, t.s, ',':Varchar, t.o, t._row_id] }
-        Chain { table: t, columns: [t.v, t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [t_v, t__row_id], primary key: [$0 DESC, $1 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [t_o, t__row_id, t_s, ',':Varchar], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2, 3], distribution key: [], read pk prefix len hint: 0 }
-     Table 2 { columns: [max(t_v), string_agg(t_s, ',':Varchar order_by(t_o ASC)), count], primary key: [], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1, a2], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
+    StreamProject { exprs: [t.v, t.s, ',':Varchar, t.o, t._row_id] }
+    └── Chain { table: t, columns: [t.v, t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ t_v, t__row_id ]
+    ├── primary key: [ $0 DESC, $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ t_o, t__row_id, t_s, ',':Varchar ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 0, 1, 2, 3 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 2
+    ├── columns: [ max(t_v), string_agg(t_s, ',':Varchar order_by(t_o ASC)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1, a2 ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
 - id: extreme_string_agg_on_AO
   before:
   - create_tables
   sql: |
     select max(v) as a1, string_agg(s, ',' order by o) as a2 from AO;
   stream_plan: |
-    StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC))] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [max(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
         └─StreamExchange { dist: Single }
           └─StreamProject { exprs: [ao.v, ao.s, ',':Varchar, ao.o, ao._row_id] }
             └─StreamTableScan { table: ao, columns: [ao.v, ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, a2], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC))] }
-          StreamAppendOnlyGlobalSimpleAgg { aggs: [max(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [a1, a2], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC))] }
+        └── StreamAppendOnlyGlobalSimpleAgg { aggs: [max(ao.v), string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamProject { exprs: [ao.v, ao.s, ',':Varchar, ao.o, ao._row_id] }
-        Chain { table: ao, columns: [ao.v, ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [ao.v, ao.s, ',':Varchar, ao.o, ao._row_id] }
+    └── Chain { table: ao, columns: [ao.v, ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ max(ao_v), string_agg(ao_s, ',':Varchar order_by(ao_o ASC)), count ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 4294967294
+    ├── columns: [ a1, a2 ]
+    ├── primary key: []
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
 
-     Table 0 { columns: [max(ao_v), string_agg(ao_s, ',':Varchar order_by(ao_o ASC)), count], primary key: [], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [a1, a2], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
 - id: extreme_on_T_by_k
   before:
   - create_tables
@@ -588,28 +920,48 @@
         └─BatchExchange { order: [], dist: HashShard(t.k) }
           └─BatchScan { table: t, columns: [t.k, t.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1, t.k(hidden)], pk_columns: [t.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, t.k(hidden)], stream_key: [t.k], pk_columns: [t.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(t.v), t.k] }
       └─StreamHashAgg { group_key: [t.k], aggs: [max(t.v), count] }
         └─StreamExchange { dist: HashShard(t.k) }
           └─StreamTableScan { table: t, columns: [t.k, t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, t.k(hidden)], pk_columns: [t.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(t.v), t.k] }
-          StreamHashAgg { group_key: [t.k], aggs: [max(t.v), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, t.k(hidden)], stream_key: [t.k], pk_columns: [t.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(t.v), t.k] }
+        └── StreamHashAgg { group_key: [t.k], aggs: [max(t.v), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: t, columns: [t.k, t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: t, columns: [t.k, t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ t_k, t_v, t__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ t_k, max(t_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, t.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [t_k, t_v, t__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [t_k, max(t_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, t.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: extreme_on_Tk_by_k
   before:
   - create_tables
@@ -621,24 +973,44 @@
       └─BatchSortAgg { group_key: [tk.k], aggs: [max(tk.v)] }
         └─BatchScan { table: tk, columns: [tk.k, tk.v], distribution: UpstreamHashShard(tk.k) }
   stream_plan: |
-    StreamMaterialize { columns: [a1, tk.k(hidden)], pk_columns: [tk.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, tk.k(hidden)], stream_key: [tk.k], pk_columns: [tk.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(tk.v), tk.k] }
       └─StreamHashAgg { group_key: [tk.k], aggs: [max(tk.v), count] }
         └─StreamTableScan { table: tk, columns: [tk.k, tk.v, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, tk.k(hidden)], pk_columns: [tk.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(tk.v), tk.k] }
-          StreamHashAgg { group_key: [tk.k], aggs: [max(tk.v), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            Chain { table: tk, columns: [tk.k, tk.v, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [tk_k, tk_v, tk_t__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [tk_k, max(tk_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, tk.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [a1, tk.k(hidden)], stream_key: [tk.k], pk_columns: [tk.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(tk.v), tk.k] }
+        └── StreamHashAgg { group_key: [tk.k], aggs: [max(tk.v), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └── Chain { table: tk, columns: [tk.k, tk.v, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ tk_k, tk_v, tk_t__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ tk_k, max(tk_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, tk.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: extreme_on_S_by_k
   before:
   - create_tables
@@ -651,55 +1023,89 @@
         └─BatchExchange { order: [], dist: HashShard(s.k) }
           └─BatchScan { table: s, columns: [s.k, s.v], distribution: Single }
   stream_plan: |
-    StreamMaterialize { columns: [a1, s.k(hidden)], pk_columns: [s.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, s.k(hidden)], stream_key: [s.k], pk_columns: [s.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(s.v), s.k] }
       └─StreamHashAgg { group_key: [s.k], aggs: [max(s.v), count] }
         └─StreamExchange { dist: HashShard(s.k) }
           └─StreamTableScan { table: s, columns: [s.k, s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, s.k(hidden)], pk_columns: [s.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(s.v), s.k] }
-          StreamHashAgg { group_key: [s.k], aggs: [max(s.v), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, s.k(hidden)], stream_key: [s.k], pk_columns: [s.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(s.v), s.k] }
+        └── StreamHashAgg { group_key: [s.k], aggs: [max(s.v), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: s, columns: [s.k, s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-        Upstream
-        BatchPlanNode
+    Chain { table: s, columns: [s.k, s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ s_k, s_v, s_t__row_id ]
+    ├── primary key: [ $0 ASC, $1 DESC, $2 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ s_k, max(s_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, s.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [s_k, s_v, s_t__row_id], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [s_k, max(s_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, s.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: extreme_on_AO_by_k
   before:
   - create_tables
   sql: |
     select max(v) as a1 from AO group by k;
   stream_plan: |
-    StreamMaterialize { columns: [a1, ao.k(hidden)], pk_columns: [ao.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, ao.k(hidden)], stream_key: [ao.k], pk_columns: [ao.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [max(ao.v), ao.k] }
       └─StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [max(ao.v), count] }
         └─StreamExchange { dist: HashShard(ao.k) }
           └─StreamTableScan { table: ao, columns: [ao.k, ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, ao.k(hidden)], pk_columns: [ao.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [max(ao.v), ao.k] }
-          StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [max(ao.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, ao.k(hidden)], stream_key: [ao.k], pk_columns: [ao.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [max(ao.v), ao.k] }
+        └── StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [max(ao.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: ao, columns: [ao.k, ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ao, columns: [ao.k, ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ ao_k, max(ao_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, ao.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [ao_k, max(ao_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, ao.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: sum_on_T_by_k
   before:
   - create_tables
@@ -712,27 +1118,41 @@
         └─BatchExchange { order: [], dist: HashShard(t.k) }
           └─BatchScan { table: t, columns: [t.k, t.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1, t.k(hidden)], pk_columns: [t.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, t.k(hidden)], stream_key: [t.k], pk_columns: [t.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(t.v), t.k] }
       └─StreamHashAgg { group_key: [t.k], aggs: [sum(t.v), count] }
         └─StreamExchange { dist: HashShard(t.k) }
           └─StreamTableScan { table: t, columns: [t.k, t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, t.k(hidden)], pk_columns: [t.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(t.v), t.k] }
-          StreamHashAgg { group_key: [t.k], aggs: [sum(t.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, t.k(hidden)], stream_key: [t.k], pk_columns: [t.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(t.v), t.k] }
+        └── StreamHashAgg { group_key: [t.k], aggs: [sum(t.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: t, columns: [t.k, t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: t, columns: [t.k, t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ t_k, sum(t_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, t.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [t_k, sum(t_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, t.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: sum_on_Tk_by_k
   before:
   - create_tables
@@ -744,23 +1164,37 @@
       └─BatchSortAgg { group_key: [tk.k], aggs: [sum(tk.v)] }
         └─BatchScan { table: tk, columns: [tk.k, tk.v], distribution: UpstreamHashShard(tk.k) }
   stream_plan: |
-    StreamMaterialize { columns: [a1, tk.k(hidden)], pk_columns: [tk.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, tk.k(hidden)], stream_key: [tk.k], pk_columns: [tk.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(tk.v), tk.k] }
       └─StreamHashAgg { group_key: [tk.k], aggs: [sum(tk.v), count] }
         └─StreamTableScan { table: tk, columns: [tk.k, tk.v, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, tk.k(hidden)], pk_columns: [tk.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(tk.v), tk.k] }
-          StreamHashAgg { group_key: [tk.k], aggs: [sum(tk.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            Chain { table: tk, columns: [tk.k, tk.v, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [tk_k, sum(tk_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, tk.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [a1, tk.k(hidden)], stream_key: [tk.k], pk_columns: [tk.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(tk.v), tk.k] }
+        └── StreamHashAgg { group_key: [tk.k], aggs: [sum(tk.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └── Chain { table: tk, columns: [tk.k, tk.v, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ tk_k, sum(tk_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, tk.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: sum_on_S_by_k
   before:
   - create_tables
@@ -773,54 +1207,82 @@
         └─BatchExchange { order: [], dist: HashShard(s.k) }
           └─BatchScan { table: s, columns: [s.k, s.v], distribution: Single }
   stream_plan: |
-    StreamMaterialize { columns: [a1, s.k(hidden)], pk_columns: [s.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, s.k(hidden)], stream_key: [s.k], pk_columns: [s.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(s.v), s.k] }
       └─StreamHashAgg { group_key: [s.k], aggs: [sum(s.v), count] }
         └─StreamExchange { dist: HashShard(s.k) }
           └─StreamTableScan { table: s, columns: [s.k, s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, s.k(hidden)], pk_columns: [s.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(s.v), s.k] }
-          StreamHashAgg { group_key: [s.k], aggs: [sum(s.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, s.k(hidden)], stream_key: [s.k], pk_columns: [s.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(s.v), s.k] }
+        └── StreamHashAgg { group_key: [s.k], aggs: [sum(s.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: s, columns: [s.k, s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-        Upstream
-        BatchPlanNode
+    Chain { table: s, columns: [s.k, s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ s_k, sum(s_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, s.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [s_k, sum(s_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, s.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: sum_on_AO_by_k
   before:
   - create_tables
   sql: |
     select sum(v) as a1 from AO group by k;
   stream_plan: |
-    StreamMaterialize { columns: [a1, ao.k(hidden)], pk_columns: [ao.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, ao.k(hidden)], stream_key: [ao.k], pk_columns: [ao.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(ao.v), ao.k] }
       └─StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [sum(ao.v), count] }
         └─StreamExchange { dist: HashShard(ao.k) }
           └─StreamTableScan { table: ao, columns: [ao.k, ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, ao.k(hidden)], pk_columns: [ao.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(ao.v), ao.k] }
-          StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [sum(ao.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, ao.k(hidden)], stream_key: [ao.k], pk_columns: [ao.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(ao.v), ao.k] }
+        └── StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [sum(ao.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: ao, columns: [ao.k, ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ao, columns: [ao.k, ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ ao_k, sum(ao_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, ao.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [ao_k, sum(ao_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, ao.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: cnt_on_T_by_k
   before:
   - create_tables
@@ -833,27 +1295,41 @@
         └─BatchExchange { order: [], dist: HashShard(t.k) }
           └─BatchScan { table: t, columns: [t.k, t.v], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1, t.k(hidden)], pk_columns: [t.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, t.k(hidden)], stream_key: [t.k], pk_columns: [t.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [count(t.v), t.k] }
       └─StreamHashAgg { group_key: [t.k], aggs: [count(t.v), count] }
         └─StreamExchange { dist: HashShard(t.k) }
           └─StreamTableScan { table: t, columns: [t.k, t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, t.k(hidden)], pk_columns: [t.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [count(t.v), t.k] }
-          StreamHashAgg { group_key: [t.k], aggs: [count(t.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, t.k(hidden)], stream_key: [t.k], pk_columns: [t.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [count(t.v), t.k] }
+        └── StreamHashAgg { group_key: [t.k], aggs: [count(t.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: t, columns: [t.k, t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: t, columns: [t.k, t.v, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ t_k, count(t_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, t.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [t_k, count(t_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, t.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: cnt_on_Tk_by_k
   before:
   - create_tables
@@ -865,23 +1341,37 @@
       └─BatchSortAgg { group_key: [tk.k], aggs: [count(tk.v)] }
         └─BatchScan { table: tk, columns: [tk.k, tk.v], distribution: UpstreamHashShard(tk.k) }
   stream_plan: |
-    StreamMaterialize { columns: [a1, tk.k(hidden)], pk_columns: [tk.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, tk.k(hidden)], stream_key: [tk.k], pk_columns: [tk.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [count(tk.v), tk.k] }
       └─StreamHashAgg { group_key: [tk.k], aggs: [count(tk.v), count] }
         └─StreamTableScan { table: tk, columns: [tk.k, tk.v, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, tk.k(hidden)], pk_columns: [tk.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [count(tk.v), tk.k] }
-          StreamHashAgg { group_key: [tk.k], aggs: [count(tk.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            Chain { table: tk, columns: [tk.k, tk.v, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [tk_k, count(tk_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, tk.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [a1, tk.k(hidden)], stream_key: [tk.k], pk_columns: [tk.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [count(tk.v), tk.k] }
+        └── StreamHashAgg { group_key: [tk.k], aggs: [count(tk.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └── Chain { table: tk, columns: [tk.k, tk.v, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ tk_k, count(tk_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, tk.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: cnt_on_S_by_k
   before:
   - create_tables
@@ -894,54 +1384,82 @@
         └─BatchExchange { order: [], dist: HashShard(s.k) }
           └─BatchScan { table: s, columns: [s.k, s.v], distribution: Single }
   stream_plan: |
-    StreamMaterialize { columns: [a1, s.k(hidden)], pk_columns: [s.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, s.k(hidden)], stream_key: [s.k], pk_columns: [s.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [count(s.v), s.k] }
       └─StreamHashAgg { group_key: [s.k], aggs: [count(s.v), count] }
         └─StreamExchange { dist: HashShard(s.k) }
           └─StreamTableScan { table: s, columns: [s.k, s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, s.k(hidden)], pk_columns: [s.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [count(s.v), s.k] }
-          StreamHashAgg { group_key: [s.k], aggs: [count(s.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, s.k(hidden)], stream_key: [s.k], pk_columns: [s.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [count(s.v), s.k] }
+        └── StreamHashAgg { group_key: [s.k], aggs: [count(s.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: s, columns: [s.k, s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
-        Upstream
-        BatchPlanNode
+    Chain { table: s, columns: [s.k, s.v, s.o, s.t._row_id], pk: [s.t._row_id], dist: Single }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ s_k, count(s_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, s.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [s_k, count(s_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, s.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: cnt_on_AO_by_k
   before:
   - create_tables
   sql: |
     select count(v) as a1 from AO group by k;
   stream_plan: |
-    StreamMaterialize { columns: [a1, ao.k(hidden)], pk_columns: [ao.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, ao.k(hidden)], stream_key: [ao.k], pk_columns: [ao.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [count(ao.v), ao.k] }
       └─StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [count(ao.v), count] }
         └─StreamExchange { dist: HashShard(ao.k) }
           └─StreamTableScan { table: ao, columns: [ao.k, ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, ao.k(hidden)], pk_columns: [ao.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [count(ao.v), ao.k] }
-          StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [count(ao.v), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, ao.k(hidden)], stream_key: [ao.k], pk_columns: [ao.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [count(ao.v), ao.k] }
+        └── StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [count(ao.v), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      Chain { table: ao, columns: [ao.k, ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-        Upstream
-        BatchPlanNode
+    Chain { table: ao, columns: [ao.k, ao.v, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ ao_k, count(ao_v), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, ao.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [ao_k, count(ao_v), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, ao.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - id: string_agg_on_T_by_k
   before:
   - create_tables
@@ -955,30 +1473,50 @@
           └─BatchProject { exprs: [t.k, t.s, ',':Varchar, t.o] }
             └─BatchScan { table: t, columns: [t.k, t.o, t.s], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a1, t.k(hidden)], pk_columns: [t.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, t.k(hidden)], stream_key: [t.k], pk_columns: [t.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [string_agg(t.s, ',':Varchar order_by(t.o ASC)), t.k] }
       └─StreamHashAgg { group_key: [t.k], aggs: [string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
         └─StreamExchange { dist: HashShard(t.k) }
           └─StreamProject { exprs: [t.k, t.s, ',':Varchar, t.o, t._row_id] }
             └─StreamTableScan { table: t, columns: [t.k, t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, t.k(hidden)], pk_columns: [t.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [string_agg(t.s, ',':Varchar order_by(t.o ASC)), t.k] }
-          StreamHashAgg { group_key: [t.k], aggs: [string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, t.k(hidden)], stream_key: [t.k], pk_columns: [t.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [string_agg(t.s, ',':Varchar order_by(t.o ASC)), t.k] }
+        └── StreamHashAgg { group_key: [t.k], aggs: [string_agg(t.s, ',':Varchar order_by(t.o ASC)), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamProject { exprs: [t.k, t.s, ',':Varchar, t.o, t._row_id] }
-        Chain { table: t, columns: [t.k, t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [t_k, t_o, t__row_id, t_s, ',':Varchar], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [1, 2, 3, 4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [t_k, string_agg(t_s, ',':Varchar order_by(t_o ASC)), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, t.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    StreamProject { exprs: [t.k, t.s, ',':Varchar, t.o, t._row_id] }
+    └── Chain { table: t, columns: [t.k, t.o, t.s, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ t_k, t_o, t__row_id, t_s, ',':Varchar ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 1, 2, 3, 4 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ t_k, string_agg(t_s, ',':Varchar order_by(t_o ASC)), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, t.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: string_agg_on_Tk_by_k
   before:
   - create_tables
@@ -991,26 +1529,46 @@
         └─BatchProject { exprs: [tk.k, tk.s, ',':Varchar, tk.o] }
           └─BatchScan { table: tk, columns: [tk.k, tk.o, tk.s], distribution: UpstreamHashShard(tk.k) }
   stream_plan: |
-    StreamMaterialize { columns: [a1, tk.k(hidden)], pk_columns: [tk.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, tk.k(hidden)], stream_key: [tk.k], pk_columns: [tk.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [string_agg(tk.s, ',':Varchar order_by(tk.o ASC)), tk.k] }
       └─StreamHashAgg { group_key: [tk.k], aggs: [string_agg(tk.s, ',':Varchar order_by(tk.o ASC)), count] }
         └─StreamProject { exprs: [tk.k, tk.s, ',':Varchar, tk.o, tk.t._row_id] }
           └─StreamTableScan { table: tk, columns: [tk.k, tk.o, tk.s, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, tk.k(hidden)], pk_columns: [tk.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [string_agg(tk.s, ',':Varchar order_by(tk.o ASC)), tk.k] }
-          StreamHashAgg { group_key: [tk.k], aggs: [string_agg(tk.s, ',':Varchar order_by(tk.o ASC)), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamProject { exprs: [tk.k, tk.s, ',':Varchar, tk.o, tk.t._row_id] }
-              Chain { table: tk, columns: [tk.k, tk.o, tk.s, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
-                Upstream
-                BatchPlanNode
-
-     Table 0 { columns: [tk_k, tk_o, tk_t__row_id, tk_s, ',':Varchar], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [1, 2, 3, 4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [tk_k, string_agg(tk_s, ',':Varchar order_by(tk_o ASC)), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, tk.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    StreamMaterialize { columns: [a1, tk.k(hidden)], stream_key: [tk.k], pk_columns: [tk.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [string_agg(tk.s, ',':Varchar order_by(tk.o ASC)), tk.k] }
+        └── StreamHashAgg { group_key: [tk.k], aggs: [string_agg(tk.s, ',':Varchar order_by(tk.o ASC)), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └── StreamProject { exprs: [tk.k, tk.s, ',':Varchar, tk.o, tk.t._row_id] }
+                └── Chain { table: tk, columns: [tk.k, tk.o, tk.s, tk.t._row_id], pk: [tk.t._row_id], dist: UpstreamHashShard(tk.k) }
+                    ├──  Upstream
+                    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ tk_k, tk_o, tk_t__row_id, tk_s, ',':Varchar ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 1, 2, 3, 4 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ tk_k, string_agg(tk_s, ',':Varchar order_by(tk_o ASC)), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, tk.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: string_agg_on_S_by_k
   before:
   - create_tables
@@ -1024,56 +1582,90 @@
           └─BatchProject { exprs: [s.k, s.s, ',':Varchar, s.o] }
             └─BatchScan { table: s, columns: [s.k, s.o, s.s], distribution: Single }
   stream_plan: |
-    StreamMaterialize { columns: [a1, s.k(hidden)], pk_columns: [s.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, s.k(hidden)], stream_key: [s.k], pk_columns: [s.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [string_agg(s.s, ',':Varchar order_by(s.o ASC)), s.k] }
       └─StreamHashAgg { group_key: [s.k], aggs: [string_agg(s.s, ',':Varchar order_by(s.o ASC)), count] }
         └─StreamExchange { dist: HashShard(s.k) }
           └─StreamProject { exprs: [s.k, s.s, ',':Varchar, s.o, s.t._row_id] }
             └─StreamTableScan { table: s, columns: [s.k, s.o, s.s, s.t._row_id], pk: [s.t._row_id], dist: Single }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, s.k(hidden)], pk_columns: [s.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [string_agg(s.s, ',':Varchar order_by(s.o ASC)), s.k] }
-          StreamHashAgg { group_key: [s.k], aggs: [string_agg(s.s, ',':Varchar order_by(s.o ASC)), count] }
-              result table: 1, state tables: [0], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, s.k(hidden)], stream_key: [s.k], pk_columns: [s.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [string_agg(s.s, ',':Varchar order_by(s.o ASC)), s.k] }
+        └── StreamHashAgg { group_key: [s.k], aggs: [string_agg(s.s, ',':Varchar order_by(s.o ASC)), count] }
+            ├── result table: 1
+            ├── state tables: [ 0 ]
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamProject { exprs: [s.k, s.s, ',':Varchar, s.o, s.t._row_id] }
-        Chain { table: s, columns: [s.k, s.o, s.s, s.t._row_id], pk: [s.t._row_id], dist: Single }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [s_k, s_o, s_t__row_id, s_s, ',':Varchar], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [1, 2, 3, 4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [s_k, string_agg(s_s, ',':Varchar order_by(s_o ASC)), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, s.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
+    StreamProject { exprs: [s.k, s.s, ',':Varchar, s.o, s.t._row_id] }
+    └── Chain { table: s, columns: [s.k, s.o, s.s, s.t._row_id], pk: [s.t._row_id], dist: Single }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ s_k, s_o, s_t__row_id, s_s, ',':Varchar ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 1, 2, 3, 4 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 1
+    ├── columns: [ s_k, string_agg(s_s, ',':Varchar order_by(s_o ASC)), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, s.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
 - id: string_agg_on_AO_by_k
   before:
   - create_tables
   sql: |
     select string_agg(s, ',' order by o) as a1 from AO group by k;
   stream_plan: |
-    StreamMaterialize { columns: [a1, ao.k(hidden)], pk_columns: [ao.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a1, ao.k(hidden)], stream_key: [ao.k], pk_columns: [ao.k], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), ao.k] }
       └─StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
         └─StreamExchange { dist: HashShard(ao.k) }
           └─StreamProject { exprs: [ao.k, ao.s, ',':Varchar, ao.o, ao._row_id] }
             └─StreamTableScan { table: ao, columns: [ao.k, ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a1, ao.k(hidden)], pk_columns: [ao.k], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), ao.k] }
-          StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [a1, ao.k(hidden)], stream_key: [ao.k], pk_columns: [ao.k], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), ao.k] }
+        └── StreamAppendOnlyHashAgg { group_key: [ao.k], aggs: [string_agg(ao.s, ',':Varchar order_by(ao.o ASC)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamProject { exprs: [ao.k, ao.s, ',':Varchar, ao.o, ao._row_id] }
-        Chain { table: ao, columns: [ao.k, ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [ao.k, ao.s, ',':Varchar, ao.o, ao._row_id] }
+    └── Chain { table: ao, columns: [ao.k, ao.o, ao.s, ao._row_id], pk: [ao._row_id], dist: UpstreamHashShard(ao._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ ao_k, string_agg(ao_s, ',':Varchar order_by(ao_o ASC)), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294
+    ├── columns: [ a1, ao.k ]
+    ├── primary key: [ $1 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
 
-     Table 0 { columns: [ao_k, string_agg(ao_s, ',':Varchar order_by(ao_o ASC)), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [a1, ao.k], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
diff --git a/src/frontend/planner_test/tests/testdata/struct_query.yaml b/src/frontend/planner_test/tests/testdata/struct_query.yaml
index 3ba6dbe2fcb8c..9668fa9a2a586 100644
--- a/src/frontend/planner_test/tests/testdata/struct_query.yaml
+++ b/src/frontend/planner_test/tests/testdata/struct_query.yaml
@@ -6,7 +6,7 @@
     BatchExchange { order: [], dist: Single }
     └─BatchScan { table: t, columns: [t.country], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [country, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [country, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck" }
     └─StreamTableScan { table: t, columns: [t.country, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
   create_source:
     row_format: protobuf
diff --git a/src/frontend/planner_test/tests/testdata/subquery_expr_correlated.yaml b/src/frontend/planner_test/tests/testdata/subquery_expr_correlated.yaml
index d45221df79b6c..22386033deee8 100644
--- a/src/frontend/planner_test/tests/testdata/subquery_expr_correlated.yaml
+++ b/src/frontend/planner_test/tests/testdata/subquery_expr_correlated.yaml
@@ -739,6 +739,39 @@
             ├─LogicalAgg { group_key: [strings.v1], aggs: [] }
             | └─LogicalScan { table: strings, columns: [strings.v1] }
             └─LogicalScan { table: strings, columns: [strings.v1] }
+- name: issue 4762 correlated input in agg filter
+  sql: |
+    CREATE TABLE strings(v1 VARCHAR);
+    SELECT (SELECT STRING_AGG(v1, ',') FILTER (WHERE v1 < t.v1) FROM strings) FROM strings AS t;
+  optimized_logical_plan_for_batch: |
+    LogicalJoin { type: LeftOuter, on: IsNotDistinctFrom(strings.v1, strings.v1), output: [string_agg(strings.v1, ',':Varchar) filter((strings.v1 < strings.v1))] }
+    ├─LogicalScan { table: strings, columns: [strings.v1] }
+    └─LogicalAgg { group_key: [strings.v1], aggs: [string_agg(strings.v1, ',':Varchar) filter((strings.v1 < strings.v1))] }
+      └─LogicalJoin { type: LeftOuter, on: IsNotDistinctFrom(strings.v1, strings.v1), output: [strings.v1, strings.v1, ',':Varchar] }
+        ├─LogicalAgg { group_key: [strings.v1], aggs: [] }
+        | └─LogicalScan { table: strings, columns: [strings.v1] }
+        └─LogicalProject { exprs: [strings.v1, strings.v1, ',':Varchar] }
+          └─LogicalJoin { type: Inner, on: true, output: all }
+            ├─LogicalAgg { group_key: [strings.v1], aggs: [] }
+            | └─LogicalScan { table: strings, columns: [strings.v1] }
+            └─LogicalScan { table: strings, columns: [strings.v1] }
+- name: issue 7574 correlated input in agg filter in having
+  sql: |
+    CREATE TABLE strings(v1 VARCHAR);
+    SELECT (SELECT 1 FROM strings HAVING COUNT(v1) FILTER (WHERE t.v1 < 'b') > 2) FROM strings AS t;
+  optimized_logical_plan_for_batch: |
+    LogicalJoin { type: LeftOuter, on: IsNotDistinctFrom(strings.v1, strings.v1), output: [1:Int32] }
+    ├─LogicalScan { table: strings, columns: [strings.v1] }
+    └─LogicalProject { exprs: [strings.v1, 1:Int32] }
+      └─LogicalFilter { predicate: (count(strings.v1) filter((strings.v1 < 'b':Varchar)) > 2:Int32) }
+        └─LogicalAgg { group_key: [strings.v1], aggs: [count(strings.v1) filter((strings.v1 < 'b':Varchar))] }
+          └─LogicalJoin { type: LeftOuter, on: IsNotDistinctFrom(strings.v1, strings.v1), output: [strings.v1, strings.v1] }
+            ├─LogicalAgg { group_key: [strings.v1], aggs: [] }
+            | └─LogicalScan { table: strings, columns: [strings.v1] }
+            └─LogicalJoin { type: Inner, on: true, output: all }
+              ├─LogicalAgg { group_key: [strings.v1], aggs: [] }
+              | └─LogicalScan { table: strings, columns: [strings.v1] }
+              └─LogicalScan { table: strings, columns: [strings.v1] }
 - name: Existential join on outer join with correlated condition
   sql: |
     create table t1(x int, y int);
diff --git a/src/frontend/planner_test/tests/testdata/temporal_filter.yaml b/src/frontend/planner_test/tests/testdata/temporal_filter.yaml
index b0929c9ddb8ab..c34b01f211fc6 100644
--- a/src/frontend/planner_test/tests/testdata/temporal_filter.yaml
+++ b/src/frontend/planner_test/tests/testdata/temporal_filter.yaml
@@ -4,7 +4,7 @@
     create table t1 (ts timestamp with time zone);
     select * from t1 where ts + interval '1 hour' > now();
   stream_plan: |
-    StreamMaterialize { columns: [ts, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [ts, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.ts, t1._row_id] }
       └─StreamDynamicFilter { predicate: ($expr1 > now), output_watermarks: [$expr1], output: [t1.ts, $expr1, t1._row_id] }
         ├─StreamProject { exprs: [t1.ts, (AtTimeZone((AtTimeZone(t1.ts, 'UTC':Varchar) + '00:00:00':Interval), 'UTC':Varchar) + '01:00:00':Interval) as $expr1, t1._row_id] }
@@ -16,7 +16,7 @@
     create table t1 (ts timestamp with time zone, time_to_live interval);
     select * from t1 where ts + time_to_live * 1.5 > now();
   stream_plan: |
-    StreamMaterialize { columns: [ts, time_to_live, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [ts, time_to_live, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.ts, t1.time_to_live, t1._row_id] }
       └─StreamDynamicFilter { predicate: ($expr1 > now), output_watermarks: [$expr1], output: [t1.ts, t1.time_to_live, $expr1, t1._row_id] }
         ├─StreamProject { exprs: [t1.ts, t1.time_to_live, (AtTimeZone((AtTimeZone(t1.ts, 'UTC':Varchar) + DateTrunc('day':Varchar, (t1.time_to_live * 1.5:Decimal))), 'UTC':Varchar) + ((t1.time_to_live * 1.5:Decimal) - DateTrunc('day':Varchar, (t1.time_to_live * 1.5:Decimal)))) as $expr1, t1._row_id] }
@@ -28,7 +28,7 @@
     create table t1 (ts timestamp with time zone, additional_time_to_live interval);
     select * from t1 where now() - interval '15 minutes' < ts + additional_time_to_live * 1.5;
   stream_plan: |
-    StreamMaterialize { columns: [ts, additional_time_to_live, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [ts, additional_time_to_live, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.ts, t1.additional_time_to_live, t1._row_id] }
       └─StreamDynamicFilter { predicate: ($expr1 > $expr2), output_watermarks: [$expr1], output: [t1.ts, t1.additional_time_to_live, $expr1, t1._row_id] }
         ├─StreamProject { exprs: [t1.ts, t1.additional_time_to_live, (AtTimeZone((AtTimeZone(t1.ts, 'UTC':Varchar) + DateTrunc('day':Varchar, (t1.additional_time_to_live * 1.5:Decimal))), 'UTC':Varchar) + ((t1.additional_time_to_live * 1.5:Decimal) - DateTrunc('day':Varchar, (t1.additional_time_to_live * 1.5:Decimal)))) as $expr1, t1._row_id] }
@@ -46,7 +46,7 @@
     create table t1 (ts timestamp with time zone);
     select * from t1 where ts < now() - interval '1 hour' and ts >= now() - interval '2 hour';
   stream_plan: |
-    StreamMaterialize { columns: [ts, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [ts, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamDynamicFilter { predicate: (t1.ts < $expr2), output: [t1.ts, t1._row_id] }
       ├─StreamDynamicFilter { predicate: (t1.ts >= $expr1), output_watermarks: [t1.ts], output: [t1.ts, t1._row_id] }
       | ├─StreamTableScan { table: t1, columns: [t1.ts, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -56,34 +56,39 @@
       └─StreamExchange { dist: Broadcast }
         └─StreamProject { exprs: [(AtTimeZone((AtTimeZone(now, 'UTC':Varchar) - '00:00:00':Interval), 'UTC':Varchar) - '01:00:00':Interval) as $expr2], output_watermarks: [$expr2] }
           └─StreamNow { output: [now] }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [ts, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamDynamicFilter { predicate: (t1.ts < $expr2), output: [t1.ts, t1._row_id] }
-            left table: 0, right table 1
-          StreamDynamicFilter { predicate: (t1.ts >= $expr1), output_watermarks: [t1.ts], output: [t1.ts, t1._row_id] }
-              left table: 2, right table 3
-            Chain { table: t1, columns: [t1.ts, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
-              Upstream
-              BatchPlanNode
-            StreamExchange Broadcast from 1
-          StreamExchange Broadcast from 2
+    StreamMaterialize { columns: [ts, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamDynamicFilter { predicate: (t1.ts < $expr2), output: [t1.ts, t1._row_id] } { left table: 0, right table: 1 }
+        ├── StreamDynamicFilter { predicate: (t1.ts >= $expr1), output_watermarks: [t1.ts], output: [t1.ts, t1._row_id] }
+        │   ├── left table: 2
+        │   ├── right table: 3
+        │   ├── Chain { table: t1, columns: [t1.ts, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
+        │   │   ├──  Upstream
+        │   │   └──  BatchPlanNode
+        │   └──  StreamExchange Broadcast from 1
+        └──  StreamExchange Broadcast from 2
 
     Fragment 1
-      StreamProject { exprs: [(AtTimeZone((AtTimeZone(now, 'UTC':Varchar) - '00:00:00':Interval), 'UTC':Varchar) - '02:00:00':Interval) as $expr1], output_watermarks: [$expr1] }
-        StreamNow { output: [now] }
-            state table: 4
+    StreamProject { exprs: [(AtTimeZone((AtTimeZone(now, 'UTC':Varchar) - '00:00:00':Interval), 'UTC':Varchar) - '02:00:00':Interval) as $expr1], output_watermarks: [$expr1] }
+    └──  StreamNow { output: [now] } { state table: 4 }
 
     Fragment 2
-      StreamProject { exprs: [(AtTimeZone((AtTimeZone(now, 'UTC':Varchar) - '00:00:00':Interval), 'UTC':Varchar) - '01:00:00':Interval) as $expr2], output_watermarks: [$expr2] }
-        StreamNow { output: [now] }
-            state table: 5
+    StreamProject { exprs: [(AtTimeZone((AtTimeZone(now, 'UTC':Varchar) - '00:00:00':Interval), 'UTC':Varchar) - '01:00:00':Interval) as $expr2], output_watermarks: [$expr2] }
+    └──  StreamNow { output: [now] } { state table: 5 }
+
+    Table 0 { columns: [ t1_ts, t1__row_id ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ $expr2 ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 2 { columns: [ t1_ts, t1__row_id ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ $expr1 ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 4 { columns: [ now ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 5 { columns: [ now ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 4294967294 { columns: [ ts, t1._row_id ], primary key: [ $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
 
-     Table 0 { columns: [t1_ts, t1__row_id], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 1 { columns: [$expr2], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
-     Table 2 { columns: [t1_ts, t1__row_id], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 3 { columns: [$expr1], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
-     Table 4 { columns: [now], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
-     Table 5 { columns: [now], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [ts, t1._row_id], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
diff --git a/src/frontend/planner_test/tests/testdata/temporal_join.yaml b/src/frontend/planner_test/tests/testdata/temporal_join.yaml
index e788cff2789c4..f29fee332990f 100644
--- a/src/frontend/planner_test/tests/testdata/temporal_join.yaml
+++ b/src/frontend/planner_test/tests/testdata/temporal_join.yaml
@@ -5,7 +5,7 @@
     create table version(id2 int, a2 int, b2 int, primary key (id2));
     select id1, a1, id2, a2 from stream left join version FOR SYSTEM_TIME AS OF NOW() on id1= id2
   stream_plan: |
-    StreamMaterialize { columns: [id1, a1, id2, a2, stream._row_id(hidden)], pk_columns: [stream._row_id, id2, id1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id1, a1, id2, a2, stream._row_id(hidden)], stream_key: [stream._row_id, id2, id1], pk_columns: [stream._row_id, id2, id1], pk_conflict: "NoCheck" }
     └─StreamTemporalJoin { type: LeftOuter, predicate: stream.id1 = version.id2, output: [stream.id1, stream.a1, version.id2, version.a2, stream._row_id] }
       ├─StreamExchange { dist: HashShard(stream.id1) }
       | └─StreamTableScan { table: stream, columns: [stream.id1, stream.a1, stream._row_id], pk: [stream._row_id], dist: UpstreamHashShard(stream._row_id) }
@@ -20,7 +20,7 @@
     create table version(id2 int, a2 int, b2 int, primary key (id2));
     select id1, a1, id2, a2 from stream join version FOR SYSTEM_TIME AS OF NOW() on id1 = id2 where a2 < 10;
   stream_plan: |
-    StreamMaterialize { columns: [id1, a1, id2, a2, stream._row_id(hidden)], pk_columns: [stream._row_id, id2, id1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id1, a1, id2, a2, stream._row_id(hidden)], stream_key: [stream._row_id, id2, id1], pk_columns: [stream._row_id, id2, id1], pk_conflict: "NoCheck" }
     └─StreamTemporalJoin { type: Inner, predicate: stream.id1 = version.id2 AND (version.a2 < 10:Int32), output: [stream.id1, stream.a1, version.id2, version.a2, stream._row_id] }
       ├─StreamExchange { dist: HashShard(stream.id1) }
       | └─StreamTableScan { table: stream, columns: [stream.id1, stream.a1, stream._row_id], pk: [stream._row_id], dist: UpstreamHashShard(stream._row_id) }
@@ -32,7 +32,7 @@
     create table version(id2 int, a2 int, b2 int, primary key (id2));
     select id1, a1, id2, a2 from stream, version FOR SYSTEM_TIME AS OF NOW() where id1 = id2 AND a2 < 10;
   stream_plan: |
-    StreamMaterialize { columns: [id1, a1, id2, a2, stream._row_id(hidden)], pk_columns: [stream._row_id, id2, id1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id1, a1, id2, a2, stream._row_id(hidden)], stream_key: [stream._row_id, id2, id1], pk_columns: [stream._row_id, id2, id1], pk_conflict: "NoCheck" }
     └─StreamTemporalJoin { type: Inner, predicate: stream.id1 = version.id2 AND (version.a2 < 10:Int32), output: [stream.id1, stream.a1, version.id2, version.a2, stream._row_id] }
       ├─StreamExchange { dist: HashShard(stream.id1) }
       | └─StreamTableScan { table: stream, columns: [stream.id1, stream.a1, stream._row_id], pk: [stream._row_id], dist: UpstreamHashShard(stream._row_id) }
@@ -44,7 +44,7 @@
     create table version(id2 int, a2 int, b2 int, primary key (id2, a2));
     select id1, a1, id2, a2 from stream left join version FOR SYSTEM_TIME AS OF NOW() on a1 = a2 and id1 = id2 where b2 != a2;
   stream_plan: |
-    StreamMaterialize { columns: [id1, a1, id2, a2, stream._row_id(hidden)], pk_columns: [stream._row_id, id2, a2, id1, a1], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id1, a1, id2, a2, stream._row_id(hidden)], stream_key: [stream._row_id, id2, a2, id1, a1], pk_columns: [stream._row_id, id2, a2, id1, a1], pk_conflict: "NoCheck" }
     └─StreamTemporalJoin { type: Inner, predicate: stream.id1 = version.id2 AND stream.a1 = version.a2 AND (version.b2 <> version.a2), output: [stream.id1, stream.a1, version.id2, version.a2, stream._row_id] }
       ├─StreamExchange { dist: HashShard(stream.id1, stream.a1) }
       | └─StreamTableScan { table: stream, columns: [stream.id1, stream.a1, stream._row_id], pk: [stream._row_id], dist: UpstreamHashShard(stream._row_id) }
@@ -56,7 +56,7 @@
     create table version(id2 int, a2 int, b2 int, primary key (id2));
     select count(*) from stream left join version FOR SYSTEM_TIME AS OF NOW() on id1 = id2 where a2 < 10;
   stream_plan: |
-    StreamMaterialize { columns: [count], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [count], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum0(count)] }
       └─StreamAppendOnlyGlobalSimpleAgg { aggs: [sum0(count), count] }
         └─StreamExchange { dist: Single }
@@ -100,7 +100,7 @@
     join version1 FOR SYSTEM_TIME AS OF NOW() on stream.k = version1.k
     join version2 FOR SYSTEM_TIME AS OF NOW() on stream.k = version2.k where a1 < 10;
   stream_plan: |
-    StreamMaterialize { columns: [k, x1, x2, a1, b1, stream._row_id(hidden), version1.k(hidden), version2.k(hidden)], pk_columns: [stream._row_id, version1.k, k, version2.k], pk_conflict: "no check" }
+    StreamMaterialize { columns: [k, x1, x2, a1, b1, stream._row_id(hidden), version1.k(hidden), version2.k(hidden)], stream_key: [stream._row_id, version1.k, k, version2.k], pk_columns: [stream._row_id, version1.k, k, version2.k], pk_conflict: "NoCheck" }
     └─StreamTemporalJoin { type: Inner, predicate: stream.k = version2.k, output: [stream.k, version1.x1, version2.x2, stream.a1, stream.b1, stream._row_id, version1.k, version2.k] }
       ├─StreamTemporalJoin { type: Inner, predicate: stream.k = version1.k, output: [stream.k, stream.a1, stream.b1, version1.x1, stream._row_id, version1.k] }
       | ├─StreamExchange { dist: HashShard(stream.k) }
@@ -120,7 +120,7 @@
     join version1 FOR SYSTEM_TIME AS OF NOW() on stream.id1 = version1.id1
     join version2 FOR SYSTEM_TIME AS OF NOW() on stream.id2 = version2.id2 where a1 < 10;
   stream_plan: |
-    StreamMaterialize { columns: [id1, x1, id2, x2, a1, b1, stream._row_id(hidden), version1.id1(hidden), version2.id2(hidden)], pk_columns: [stream._row_id, version1.id1, id1, version2.id2, id2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id1, x1, id2, x2, a1, b1, stream._row_id(hidden), version1.id1(hidden), version2.id2(hidden)], stream_key: [stream._row_id, version1.id1, id1, version2.id2, id2], pk_columns: [stream._row_id, version1.id1, id1, version2.id2, id2], pk_conflict: "NoCheck" }
     └─StreamTemporalJoin { type: Inner, predicate: stream.id2 = version2.id2, output: [stream.id1, version1.x1, stream.id2, version2.x2, stream.a1, stream.b1, stream._row_id, version1.id1, version2.id2] }
       ├─StreamExchange { dist: HashShard(stream.id2) }
       | └─StreamTemporalJoin { type: Inner, predicate: stream.id1 = version1.id1, output: [stream.id1, stream.id2, stream.a1, stream.b1, version1.x1, stream._row_id, version1.id1] }
@@ -141,7 +141,7 @@
     join version1 FOR SYSTEM_TIME AS OF NOW() on stream.id1 = version1.id1
     join version2 FOR SYSTEM_TIME AS OF NOW() on stream.id2 = version2.id2 where a1 < 10;
   stream_plan: |
-    StreamMaterialize { columns: [id1, x1, id2, x2, a1, b1, stream._row_id(hidden), version1.id1(hidden), version2.id2(hidden)], pk_columns: [stream._row_id, version1.id1, id1, version2.id2, id2], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id1, x1, id2, x2, a1, b1, stream._row_id(hidden), version1.id1(hidden), version2.id2(hidden)], stream_key: [stream._row_id, version1.id1, id1, version2.id2, id2], pk_columns: [stream._row_id, version1.id1, id1, version2.id2, id2], pk_conflict: "NoCheck" }
     └─StreamTemporalJoin { type: Inner, predicate: stream.id2 = version2.id2, output: [stream.id1, version1.x1, stream.id2, version2.x2, stream.a1, stream.b1, stream._row_id, version1.id1, version2.id2] }
       ├─StreamExchange { dist: HashShard(stream.id2) }
       | └─StreamTemporalJoin { type: Inner, predicate: stream.id1 = version1.id1, output: [stream.id1, stream.id2, stream.a1, stream.b1, version1.x1, stream._row_id, version1.id1] }
diff --git a/src/frontend/planner_test/tests/testdata/time_window.yaml b/src/frontend/planner_test/tests/testdata/time_window.yaml
index db258b5eca7a6..f16bd8310347f 100644
--- a/src/frontend/planner_test/tests/testdata/time_window.yaml
+++ b/src/frontend/planner_test/tests/testdata/time_window.yaml
@@ -65,7 +65,7 @@
       └─LogicalFilter { predicate: IsNotNull(t1.created_at) }
         └─LogicalScan { table: t1, columns: [t1.id, t1.created_at, t1._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [id, created_at, window_start, window_end, t1._row_id(hidden)], pk_columns: [t1._row_id, window_start, window_end], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, created_at, window_start, window_end, t1._row_id(hidden)], stream_key: [t1._row_id, window_start, window_end], pk_columns: [t1._row_id, window_start, window_end], pk_conflict: "NoCheck" }
     └─StreamHopWindow { time_col: t1.created_at, slide: 1 day, size: 3 days, output: [t1.id, t1.created_at, window_start, window_end, t1._row_id] }
       └─StreamFilter { predicate: IsNotNull(t1.created_at) }
         └─StreamTableScan { table: t1, columns: [t1.id, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -78,7 +78,7 @@
       └─LogicalFilter { predicate: IsNotNull(t1.created_at) }
         └─LogicalScan { table: t1, columns: [t1.id, t1.created_at, t1._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [id, created_at, window_start, t1._row_id(hidden)], pk_columns: [t1._row_id, window_start], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, created_at, window_start, t1._row_id(hidden)], stream_key: [t1._row_id, window_start], pk_columns: [t1._row_id, window_start], pk_conflict: "NoCheck" }
     └─StreamHopWindow { time_col: t1.created_at, slide: 1 day, size: 3 days, output: [t1.id, t1.created_at, window_start, t1._row_id] }
       └─StreamFilter { predicate: IsNotNull(t1.created_at) }
         └─StreamTableScan { table: t1, columns: [t1.id, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -91,7 +91,7 @@
       └─LogicalFilter { predicate: IsNotNull(t1.created_at) }
         └─LogicalScan { table: t1, columns: [t1.id, t1.created_at, t1._row_id] }
   stream_plan: |
-    StreamMaterialize { columns: [id, created_at, window_end, t1._row_id(hidden)], pk_columns: [t1._row_id, window_end], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, created_at, window_end, t1._row_id(hidden)], stream_key: [t1._row_id, window_end], pk_columns: [t1._row_id, window_end], pk_conflict: "NoCheck" }
     └─StreamHopWindow { time_col: t1.created_at, slide: 1 day, size: 3 days, output: [t1.id, t1.created_at, window_end, t1._row_id] }
       └─StreamFilter { predicate: IsNotNull(t1.created_at) }
         └─StreamTableScan { table: t1, columns: [t1.id, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -109,7 +109,7 @@
       └─BatchFilter { predicate: IsNotNull(t1.created_at) }
         └─BatchScan { table: t1, columns: [t1.id, t1.created_at], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [id, created_at, window_start(hidden), t1._row_id(hidden)], pk_columns: [t1._row_id, window_start], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, created_at, window_start(hidden), t1._row_id(hidden)], stream_key: [t1._row_id, window_start], pk_columns: [t1._row_id, window_start], pk_conflict: "NoCheck" }
     └─StreamHopWindow { time_col: t1.created_at, slide: 1 day, size: 3 days, output: [t1.id, t1.created_at, window_start, t1._row_id] }
       └─StreamFilter { predicate: IsNotNull(t1.created_at) }
         └─StreamTableScan { table: t1, columns: [t1.id, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -127,7 +127,7 @@
       └─BatchFilter { predicate: IsNotNull(t1.created_at) }
         └─BatchScan { table: t1, columns: [t1.id, t1.created_at], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [id, created_at, window_start(hidden), t1._row_id(hidden)], pk_columns: [t1._row_id, window_start], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, created_at, window_start(hidden), t1._row_id(hidden)], stream_key: [t1._row_id, window_start], pk_columns: [t1._row_id, window_start], pk_conflict: "NoCheck" }
     └─StreamHopWindow { time_col: t1.created_at, slide: 1 day, size: 3 days, output: [t1.id, t1.created_at, window_start, t1._row_id] }
       └─StreamFilter { predicate: IsNotNull(t1.created_at) }
         └─StreamTableScan { table: t1, columns: [t1.id, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -135,7 +135,7 @@
     create table t (v1 varchar, v2 timestamp, v3 float);
     select v1, window_end, avg(v3) as avg from hop( t, v2, interval '1' minute, interval '10' minute) group by v1, window_end;
   logical_plan: |
-    LogicalProject { exprs: [t.v1, window_end, (sum(t.v3) / count(t.v3)::Float64) as $expr1] }
+    LogicalProject { exprs: [t.v1, window_end, (sum(t.v3) / count(t.v3)) as $expr1] }
     └─LogicalAgg { group_key: [t.v1, window_end], aggs: [sum(t.v3), count(t.v3)] }
       └─LogicalProject { exprs: [t.v1, window_end, t.v3] }
         └─LogicalHopWindow { time_col: t.v2, slide: 00:01:00, size: 00:10:00, output: all }
@@ -143,15 +143,15 @@
             └─LogicalScan { table: t, columns: [t.v1, t.v2, t.v3, t._row_id] }
   batch_plan: |
     BatchExchange { order: [], dist: Single }
-    └─BatchProject { exprs: [t.v1, window_end, (sum(t.v3) / count(t.v3)::Float64) as $expr1] }
+    └─BatchProject { exprs: [t.v1, window_end, (sum(t.v3) / count(t.v3)) as $expr1] }
       └─BatchHashAgg { group_key: [t.v1, window_end], aggs: [sum(t.v3), count(t.v3)] }
         └─BatchHopWindow { time_col: t.v2, slide: 00:01:00, size: 00:10:00, output: [t.v1, t.v3, window_end] }
           └─BatchExchange { order: [], dist: HashShard(t.v1) }
             └─BatchFilter { predicate: IsNotNull(t.v2) }
               └─BatchScan { table: t, columns: [t.v1, t.v2, t.v3], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [v1, window_end, avg], pk_columns: [v1, window_end], pk_conflict: "no check" }
-    └─StreamProject { exprs: [t.v1, window_end, (sum(t.v3) / count(t.v3)::Float64) as $expr1] }
+    StreamMaterialize { columns: [v1, window_end, avg], stream_key: [v1, window_end], pk_columns: [v1, window_end], pk_conflict: "NoCheck" }
+    └─StreamProject { exprs: [t.v1, window_end, (sum(t.v3) / count(t.v3)) as $expr1] }
       └─StreamHashAgg { group_key: [t.v1, window_end], aggs: [sum(t.v3), count(t.v3), count] }
         └─StreamExchange { dist: HashShard(t.v1, window_end) }
           └─StreamHopWindow { time_col: t.v2, slide: 00:01:00, size: 00:10:00, output: [t.v1, t.v3, window_end, t._row_id] }
@@ -174,7 +174,7 @@
       └─BatchFilter { predicate: (t1.v1 >= 10:Int32) }
         └─BatchScan { table: t1, columns: [t1.id, t1.v1, t1.created_at], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [id, v1, created_at, window_start, window_end, t1._row_id(hidden)], pk_columns: [t1._row_id], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, v1, created_at, window_start, window_end, t1._row_id(hidden)], stream_key: [t1._row_id], pk_columns: [t1._row_id], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.id, t1.v1, t1.created_at, TumbleStart(t1.created_at, '3 days':Interval) as $expr1, (TumbleStart(t1.created_at, '3 days':Interval) + '3 days':Interval) as $expr2, t1._row_id] }
       └─StreamFilter { predicate: (t1.v1 >= 10:Int32) }
         └─StreamTableScan { table: t1, columns: [t1.id, t1.v1, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
@@ -196,7 +196,7 @@
       └─BatchFilter { predicate: IsNotNull(t1.created_at) AND (t1.v1 >= 10:Int32) }
         └─BatchScan { table: t1, columns: [t1.id, t1.v1, t1.created_at], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [id, v1, created_at, window_start, window_end, t1._row_id(hidden)], pk_columns: [t1._row_id, window_start, window_end], pk_conflict: "no check" }
+    StreamMaterialize { columns: [id, v1, created_at, window_start, window_end, t1._row_id(hidden)], stream_key: [t1._row_id, window_start, window_end], pk_columns: [t1._row_id, window_start, window_end], pk_conflict: "NoCheck" }
     └─StreamHopWindow { time_col: t1.created_at, slide: 1 day, size: 3 days, output: [t1.id, t1.v1, t1.created_at, window_start, window_end, t1._row_id] }
       └─StreamFilter { predicate: IsNotNull(t1.created_at) AND (t1.v1 >= 10:Int32) }
         └─StreamTableScan { table: t1, columns: [t1.id, t1.v1, t1.created_at, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
diff --git a/src/frontend/planner_test/tests/testdata/tpch.yaml b/src/frontend/planner_test/tests/testdata/tpch.yaml
index fca70439fe903..3c79c7f06b516 100644
--- a/src/frontend/planner_test/tests/testdata/tpch.yaml
+++ b/src/frontend/planner_test/tests/testdata/tpch.yaml
@@ -139,31 +139,31 @@
               └─BatchFilter { predicate: (lineitem.l_shipdate <= '1998-09-21 00:00:00':Timestamp) }
                 └─BatchScan { table: lineitem, columns: [lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_tax, lineitem.l_returnflag, lineitem.l_linestatus, lineitem.l_shipdate], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [l_returnflag, l_linestatus, sum_qty, sum_base_price, sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc, count_order], pk_columns: [l_returnflag, l_linestatus], pk_conflict: "no check" }
+    StreamMaterialize { columns: [l_returnflag, l_linestatus, sum_qty, sum_base_price, sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc, count_order], stream_key: [l_returnflag, l_linestatus], pk_columns: [l_returnflag, l_linestatus], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [lineitem.l_returnflag, lineitem.l_linestatus, sum(lineitem.l_quantity), sum(lineitem.l_extendedprice), sum($expr1), sum($expr2), RoundDigit((sum(lineitem.l_quantity) / count(lineitem.l_quantity)), 4:Int32) as $expr3, RoundDigit((sum(lineitem.l_extendedprice) / count(lineitem.l_extendedprice)), 4:Int32) as $expr4, RoundDigit((sum(lineitem.l_discount) / count(lineitem.l_discount)), 4:Int32) as $expr5, count] }
       └─StreamHashAgg { group_key: [lineitem.l_returnflag, lineitem.l_linestatus], aggs: [sum(lineitem.l_quantity), sum(lineitem.l_extendedprice), sum($expr1), sum($expr2), count(lineitem.l_quantity), count(lineitem.l_extendedprice), sum(lineitem.l_discount), count(lineitem.l_discount), count] }
         └─StreamExchange { dist: HashShard(lineitem.l_returnflag, lineitem.l_linestatus) }
           └─StreamProject { exprs: [lineitem.l_returnflag, lineitem.l_linestatus, lineitem.l_quantity, lineitem.l_extendedprice, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, ((lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) * (1:Int32 + lineitem.l_tax)) as $expr2, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
             └─StreamFilter { predicate: (lineitem.l_shipdate <= '1998-09-21 00:00:00':Timestamp) }
               └─StreamTableScan { table: lineitem, columns: [lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_tax, lineitem.l_returnflag, lineitem.l_linestatus, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [l_returnflag, l_linestatus, sum_qty, sum_base_price, sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc, count_order], pk_columns: [l_returnflag, l_linestatus], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [lineitem.l_returnflag, lineitem.l_linestatus, sum(lineitem.l_quantity), sum(lineitem.l_extendedprice), sum($expr1), sum($expr2), RoundDigit((sum(lineitem.l_quantity) / count(lineitem.l_quantity)), 4:Int32) as $expr3, RoundDigit((sum(lineitem.l_extendedprice) / count(lineitem.l_extendedprice)), 4:Int32) as $expr4, RoundDigit((sum(lineitem.l_discount) / count(lineitem.l_discount)), 4:Int32) as $expr5, count] }
-          StreamHashAgg { group_key: [lineitem.l_returnflag, lineitem.l_linestatus], aggs: [sum(lineitem.l_quantity), sum(lineitem.l_extendedprice), sum($expr1), sum($expr2), count(lineitem.l_quantity), count(lineitem.l_extendedprice), sum(lineitem.l_discount), count(lineitem.l_discount), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0, 1]) from 1
+    StreamMaterialize { columns: [l_returnflag, l_linestatus, sum_qty, sum_base_price, sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc, count_order], stream_key: [l_returnflag, l_linestatus], pk_columns: [l_returnflag, l_linestatus], pk_conflict: "NoCheck" } { materialized table: 4294967294 }
+    └── StreamProject { exprs: [lineitem.l_returnflag, lineitem.l_linestatus, sum(lineitem.l_quantity), sum(lineitem.l_extendedprice), sum($expr1), sum($expr2), RoundDigit((sum(lineitem.l_quantity) / count(lineitem.l_quantity)), 4:Int32) as $expr3, RoundDigit((sum(lineitem.l_extendedprice) / count(lineitem.l_extendedprice)), 4:Int32) as $expr4, RoundDigit((sum(lineitem.l_discount) / count(lineitem.l_discount)), 4:Int32) as $expr5, count] }
+        └── StreamHashAgg { group_key: [lineitem.l_returnflag, lineitem.l_linestatus], aggs: [sum(lineitem.l_quantity), sum(lineitem.l_extendedprice), sum($expr1), sum($expr2), count(lineitem.l_quantity), count(lineitem.l_extendedprice), sum(lineitem.l_discount), count(lineitem.l_discount), count] } { result table: 0, state tables: [], distinct tables: [] }
+            └──  StreamExchange Hash([0, 1]) from 1
 
     Fragment 1
-      StreamProject { exprs: [lineitem.l_returnflag, lineitem.l_linestatus, lineitem.l_quantity, lineitem.l_extendedprice, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, ((lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) * (1:Int32 + lineitem.l_tax)) as $expr2, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
-        StreamFilter { predicate: (lineitem.l_shipdate <= '1998-09-21 00:00:00':Timestamp) }
-          Chain { table: lineitem, columns: [lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_tax, lineitem.l_returnflag, lineitem.l_linestatus, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [lineitem_l_returnflag, lineitem_l_linestatus, sum(lineitem_l_quantity), sum(lineitem_l_extendedprice), sum($expr1), sum($expr2), count(lineitem_l_quantity), count(lineitem_l_extendedprice), sum(lineitem_l_discount), count(lineitem_l_discount), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3, 4, 5, 6, 7, 8, 9, 10], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [l_returnflag, l_linestatus, sum_qty, sum_base_price, sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc, count_order], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], distribution key: [0, 1], read pk prefix len hint: 2 }
+    StreamProject { exprs: [lineitem.l_returnflag, lineitem.l_linestatus, lineitem.l_quantity, lineitem.l_extendedprice, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, ((lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) * (1:Int32 + lineitem.l_tax)) as $expr2, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: (lineitem.l_shipdate <= '1998-09-21 00:00:00':Timestamp) }
+        └── Chain { table: lineitem, columns: [lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_tax, lineitem.l_returnflag, lineitem.l_linestatus, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ lineitem_l_returnflag, lineitem_l_linestatus, sum(lineitem_l_quantity), sum(lineitem_l_extendedprice), sum($expr1), sum($expr2), count(lineitem_l_quantity), count(lineitem_l_extendedprice), sum(lineitem_l_discount), count(lineitem_l_discount), count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3, 4, 5, 6, 7, 8, 9, 10 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 4294967294 { columns: [ l_returnflag, l_linestatus, sum_qty, sum_base_price, sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc, count_order ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
 - id: tpch_q2
   before:
   - create_tables
@@ -296,7 +296,7 @@
                                 └─BatchFilter { predicate: IsNotNull(partsupp.ps_partkey) }
                                   └─BatchScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], distribution: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
   stream_plan: |
-    StreamMaterialize { columns: [s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address, s_phone, s_comment, partsupp.ps_partkey(hidden), partsupp.ps_suppkey(hidden), supplier.s_suppkey(hidden), nation.n_nationkey(hidden), supplier.s_nationkey(hidden), part.p_partkey(hidden), partsupp.ps_supplycost(hidden), nation.n_regionkey(hidden), region.r_regionkey(hidden)], pk_columns: [p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, region.r_regionkey, nation.n_regionkey], order_descs: [s_acctbal, n_name, s_name, p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, region.r_regionkey, nation.n_regionkey], pk_conflict: "no check" }
+    StreamMaterialize { columns: [s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address, s_phone, s_comment, partsupp.ps_partkey(hidden), partsupp.ps_suppkey(hidden), supplier.s_suppkey(hidden), nation.n_nationkey(hidden), supplier.s_nationkey(hidden), part.p_partkey(hidden), partsupp.ps_supplycost(hidden), nation.n_regionkey(hidden), region.r_regionkey(hidden)], stream_key: [p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, region.r_regionkey, nation.n_regionkey], pk_columns: [s_acctbal, n_name, s_name, p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, region.r_regionkey, nation.n_regionkey], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, nation.n_regionkey, region.r_regionkey] }
       └─StreamTopN { order: "[supplier.s_acctbal DESC, nation.n_name ASC, supplier.s_name ASC, part.p_partkey ASC]", limit: 100, offset: 0 }
         └─StreamExchange { dist: Single }
@@ -351,176 +351,205 @@
                   └─StreamProject { exprs: [region.r_regionkey] }
                     └─StreamFilter { predicate: (region.r_name = 'AFRICA':Varchar) }
                       └─StreamTableScan { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address, s_phone, s_comment, partsupp.ps_partkey(hidden), partsupp.ps_suppkey(hidden), supplier.s_suppkey(hidden), nation.n_nationkey(hidden), supplier.s_nationkey(hidden), part.p_partkey(hidden), partsupp.ps_supplycost(hidden), nation.n_regionkey(hidden), region.r_regionkey(hidden)], pk_columns: [p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, region.r_regionkey, nation.n_regionkey], order_descs: [s_acctbal, n_name, s_name, p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, region.r_regionkey, nation.n_regionkey], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, nation.n_regionkey, region.r_regionkey] }
-          StreamTopN { order: "[supplier.s_acctbal DESC, nation.n_name ASC, supplier.s_name ASC, part.p_partkey ASC]", limit: 100, offset: 0 }
-              state table: 0
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address, s_phone, s_comment, partsupp.ps_partkey(hidden), partsupp.ps_suppkey(hidden), supplier.s_suppkey(hidden), nation.n_nationkey(hidden), supplier.s_nationkey(hidden), part.p_partkey(hidden), partsupp.ps_supplycost(hidden), nation.n_regionkey(hidden), region.r_regionkey(hidden)], stream_key: [p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, region.r_regionkey, nation.n_regionkey], pk_columns: [s_acctbal, n_name, s_name, p_partkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, region.r_regionkey, nation.n_regionkey], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, nation.n_regionkey, region.r_regionkey] }
+        └── StreamTopN { order: "[supplier.s_acctbal DESC, nation.n_name ASC, supplier.s_name ASC, part.p_partkey ASC]", limit: 100, offset: 0 } { state table: 0 }
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamGroupTopN { order: "[supplier.s_acctbal DESC, nation.n_name ASC, supplier.s_name ASC, part.p_partkey ASC]", limit: 100, offset: 0, group_key: [17] }
-          state table: 1
-        StreamProject { exprs: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, nation.n_regionkey, region.r_regionkey, Vnode(nation.n_regionkey) as $expr1] }
-          StreamHashJoin { type: Inner, predicate: nation.n_regionkey = region.r_regionkey, output: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, nation.n_regionkey, region.r_regionkey] }
-              left table: 2, right table 4, left degree table: 3, right degree table: 5,
-            StreamExchange Hash([8]) from 2
-            StreamExchange Hash([0]) from 18
+    StreamGroupTopN { order: "[supplier.s_acctbal DESC, nation.n_name ASC, supplier.s_name ASC, part.p_partkey ASC]", limit: 100, offset: 0, group_key: [17] } { state table: 1 }
+    └── StreamProject { exprs: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, nation.n_regionkey, region.r_regionkey, Vnode(nation.n_regionkey) as $expr1] }
+        └── StreamHashJoin { type: Inner, predicate: nation.n_regionkey = region.r_regionkey, output: [supplier.s_acctbal, supplier.s_name, nation.n_name, part.p_partkey, part.p_mfgr, supplier.s_address, supplier.s_phone, supplier.s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, nation.n_regionkey, region.r_regionkey] } { left table: 2, right table: 4, left degree table: 3, right degree table: 5 }
+            ├──  StreamExchange Hash([8]) from 2
+            └──  StreamExchange Hash([0]) from 18
 
     Fragment 2
-      StreamHashJoin { type: Inner, predicate: part.p_partkey IS NOT DISTINCT FROM part.p_partkey AND partsupp.ps_supplycost = min(partsupp.ps_supplycost), output: [part.p_partkey, part.p_mfgr, supplier.s_name, supplier.s_address, supplier.s_phone, supplier.s_acctbal, supplier.s_comment, nation.n_name, nation.n_regionkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, partsupp.ps_supplycost, part.p_partkey] }
-          left table: 6, right table 8, left degree table: 7, right degree table: 9,
-        StreamExchange Hash([0]) from 3
-        StreamProject { exprs: [part.p_partkey, min(partsupp.ps_supplycost)] }
-          StreamHashAgg { group_key: [part.p_partkey], aggs: [min(partsupp.ps_supplycost), count] }
-              result table: 23, state tables: [22], distinct tables: []
-            StreamHashJoin { type: LeftOuter, predicate: part.p_partkey IS NOT DISTINCT FROM partsupp.ps_partkey, output: [part.p_partkey, partsupp.ps_supplycost, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, region.r_regionkey, nation.n_regionkey] }
-                left table: 24, right table 26, left degree table: 25, right degree table: 27,
-              StreamExchange Hash([0]) from 10
-              StreamExchange Hash([0]) from 11
+    StreamHashJoin { type: Inner, predicate: part.p_partkey IS NOT DISTINCT FROM part.p_partkey AND partsupp.ps_supplycost = min(partsupp.ps_supplycost), output: [part.p_partkey, part.p_mfgr, supplier.s_name, supplier.s_address, supplier.s_phone, supplier.s_acctbal, supplier.s_comment, nation.n_name, nation.n_regionkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, partsupp.ps_supplycost, part.p_partkey] } { left table: 6, right table: 8, left degree table: 7, right degree table: 9 }
+    ├──  StreamExchange Hash([0]) from 3
+    └── StreamProject { exprs: [part.p_partkey, min(partsupp.ps_supplycost)] }
+        └── StreamHashAgg { group_key: [part.p_partkey], aggs: [min(partsupp.ps_supplycost), count] } { result table: 23, state tables: [ 22 ], distinct tables: [] }
+            └── StreamHashJoin { type: LeftOuter, predicate: part.p_partkey IS NOT DISTINCT FROM partsupp.ps_partkey, output: [part.p_partkey, partsupp.ps_supplycost, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, region.r_regionkey, nation.n_regionkey] } { left table: 24, right table: 26, left degree table: 25, right degree table: 27 }
+                ├──  StreamExchange Hash([0]) from 10
+                └──  StreamExchange Hash([0]) from 11
 
     Fragment 3
-      StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [part.p_partkey, part.p_mfgr, partsupp.ps_supplycost, supplier.s_name, supplier.s_address, supplier.s_phone, supplier.s_acctbal, supplier.s_comment, nation.n_name, nation.n_regionkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, supplier.s_nationkey, nation.n_nationkey] }
-          left table: 10, right table 12, left degree table: 11, right degree table: 13,
-        StreamExchange Hash([5]) from 4
-        StreamExchange Hash([0]) from 9
+    StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [part.p_partkey, part.p_mfgr, partsupp.ps_supplycost, supplier.s_name, supplier.s_address, supplier.s_phone, supplier.s_acctbal, supplier.s_comment, nation.n_name, nation.n_regionkey, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, supplier.s_nationkey, nation.n_nationkey] } { left table: 10, right table: 12, left degree table: 11, right degree table: 13 }
+    ├──  StreamExchange Hash([5]) from 4
+    └──  StreamExchange Hash([0]) from 9
 
     Fragment 4
-      StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [part.p_partkey, part.p_mfgr, partsupp.ps_supplycost, supplier.s_name, supplier.s_address, supplier.s_nationkey, supplier.s_phone, supplier.s_acctbal, supplier.s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey] }
-          left table: 14, right table 16, left degree table: 15, right degree table: 17,
-        StreamExchange Hash([2]) from 5
-        StreamExchange Hash([0]) from 8
+    StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [part.p_partkey, part.p_mfgr, partsupp.ps_supplycost, supplier.s_name, supplier.s_address, supplier.s_nationkey, supplier.s_phone, supplier.s_acctbal, supplier.s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey] } { left table: 14, right table: 16, left degree table: 15, right degree table: 17 }
+    ├──  StreamExchange Hash([2]) from 5
+    └──  StreamExchange Hash([0]) from 8
 
     Fragment 5
-      StreamHashJoin { type: Inner, predicate: part.p_partkey = partsupp.ps_partkey, output: [part.p_partkey, part.p_mfgr, partsupp.ps_suppkey, partsupp.ps_supplycost, partsupp.ps_partkey] }
-          left table: 18, right table 20, left degree table: 19, right degree table: 21,
-        StreamExchange Hash([0]) from 6
-        StreamExchange Hash([0]) from 7
+    StreamHashJoin { type: Inner, predicate: part.p_partkey = partsupp.ps_partkey, output: [part.p_partkey, part.p_mfgr, partsupp.ps_suppkey, partsupp.ps_supplycost, partsupp.ps_partkey] } { left table: 18, right table: 20, left degree table: 19, right degree table: 21 }
+    ├──  StreamExchange Hash([0]) from 6
+    └──  StreamExchange Hash([0]) from 7
 
     Fragment 6
-      StreamProject { exprs: [part.p_partkey, part.p_mfgr] }
-        StreamFilter { predicate: (part.p_size = 4:Int32) AND Like(part.p_type, '%TIN':Varchar) }
-          Chain { table: part, columns: [part.p_partkey, part.p_mfgr, part.p_type, part.p_size], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [part.p_partkey, part.p_mfgr] }
+    └── StreamFilter { predicate: (part.p_size = 4:Int32) AND Like(part.p_type, '%TIN':Varchar) }
+        └── Chain { table: part, columns: [part.p_partkey, part.p_mfgr, part.p_type, part.p_size], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 7
-      Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 8
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_nationkey, supplier.s_phone, supplier.s_acctbal, supplier.s_comment], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_nationkey, supplier.s_phone, supplier.s_acctbal, supplier.s_comment], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 9
-      Chain { table: nation, columns: [nation.n_nationkey, nation.n_name, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: nation, columns: [nation.n_nationkey, nation.n_name, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 10
-      StreamProject { exprs: [part.p_partkey] }
-        StreamHashAgg { group_key: [part.p_partkey], aggs: [count] }
-            result table: 28, state tables: [], distinct tables: []
-          StreamProject { exprs: [part.p_partkey] }
-            StreamFilter { predicate: (part.p_size = 4:Int32) AND Like(part.p_type, '%TIN':Varchar) }
-              Chain { table: part, columns: [part.p_partkey, part.p_type, part.p_size], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-                Upstream
-                BatchPlanNode
+    StreamProject { exprs: [part.p_partkey] }
+    └── StreamHashAgg { group_key: [part.p_partkey], aggs: [count] } { result table: 28, state tables: [], distinct tables: [] }
+        └── StreamProject { exprs: [part.p_partkey] }
+            └── StreamFilter { predicate: (part.p_size = 4:Int32) AND Like(part.p_type, '%TIN':Varchar) }
+                └── Chain { table: part, columns: [part.p_partkey, part.p_type, part.p_size], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+                    ├──  Upstream
+                    └──  BatchPlanNode
 
     Fragment 11
-      StreamHashJoin { type: Inner, predicate: nation.n_regionkey = region.r_regionkey, output: [partsupp.ps_partkey, partsupp.ps_supplycost, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, nation.n_regionkey, region.r_regionkey] }
-          left table: 29, right table 31, left degree table: 30, right degree table: 32,
-        StreamExchange Hash([2]) from 12
-        StreamExchange Hash([0]) from 17
+    StreamHashJoin { type: Inner, predicate: nation.n_regionkey = region.r_regionkey, output: [partsupp.ps_partkey, partsupp.ps_supplycost, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, nation.n_regionkey, region.r_regionkey] } { left table: 29, right table: 31, left degree table: 30, right degree table: 32 }
+    ├──  StreamExchange Hash([2]) from 12
+    └──  StreamExchange Hash([0]) from 17
 
     Fragment 12
-      StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [partsupp.ps_partkey, partsupp.ps_supplycost, nation.n_regionkey, partsupp.ps_suppkey, supplier.s_suppkey, supplier.s_nationkey, nation.n_nationkey] }
-          left table: 33, right table 35, left degree table: 34, right degree table: 36,
-        StreamExchange Hash([2]) from 13
-        StreamExchange Hash([0]) from 16
+    StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [partsupp.ps_partkey, partsupp.ps_supplycost, nation.n_regionkey, partsupp.ps_suppkey, supplier.s_suppkey, supplier.s_nationkey, nation.n_nationkey] } { left table: 33, right table: 35, left degree table: 34, right degree table: 36 }
+    ├──  StreamExchange Hash([2]) from 13
+    └──  StreamExchange Hash([0]) from 16
 
     Fragment 13
-      StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [partsupp.ps_partkey, partsupp.ps_supplycost, supplier.s_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] }
-          left table: 37, right table 39, left degree table: 38, right degree table: 40,
-        StreamExchange Hash([1]) from 14
-        StreamExchange Hash([0]) from 15
+    StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [partsupp.ps_partkey, partsupp.ps_supplycost, supplier.s_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] } { left table: 37, right table: 39, left degree table: 38, right degree table: 40 }
+    ├──  StreamExchange Hash([1]) from 14
+    └──  StreamExchange Hash([0]) from 15
 
     Fragment 14
-      StreamFilter { predicate: IsNotNull(partsupp.ps_partkey) }
-        Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
-          Upstream
-          BatchPlanNode
+    StreamFilter { predicate: IsNotNull(partsupp.ps_partkey) }
+    └── Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+        ├──  Upstream
+        └──  BatchPlanNode
 
     Fragment 15
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 16
-      Chain { table: nation, columns: [nation.n_nationkey, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: nation, columns: [nation.n_nationkey, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 17
-      StreamProject { exprs: [region.r_regionkey] }
-        StreamFilter { predicate: (region.r_name = 'AFRICA':Varchar) }
-          Chain { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [region.r_regionkey] }
+    └── StreamFilter { predicate: (region.r_name = 'AFRICA':Varchar) }
+        └── Chain { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 18
-      StreamProject { exprs: [region.r_regionkey] }
-        StreamFilter { predicate: (region.r_name = 'AFRICA':Varchar) }
-          Chain { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [supplier_s_acctbal, supplier_s_name, nation_n_name, part_p_partkey, part_p_mfgr, supplier_s_address, supplier_s_phone, supplier_s_comment, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, part_p_partkey_0, partsupp_ps_supplycost, nation_n_regionkey, region_r_regionkey, $expr1], primary key: [$0 DESC, $2 ASC, $1 ASC, $3 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $14 ASC, $16 ASC, $15 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [supplier_s_acctbal, supplier_s_name, nation_n_name, part_p_partkey, part_p_mfgr, supplier_s_address, supplier_s_phone, supplier_s_comment, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, part_p_partkey_0, partsupp_ps_supplycost, nation_n_regionkey, region_r_regionkey, $expr1], primary key: [$17 ASC, $0 DESC, $2 ASC, $1 ASC, $3 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $14 ASC, $16 ASC, $15 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], distribution key: [15], read pk prefix len hint: 1, vnode column idx: 17 }
-     Table 2 { columns: [part_p_partkey, part_p_mfgr, supplier_s_name, supplier_s_address, supplier_s_phone, supplier_s_acctbal, supplier_s_comment, nation_n_name, nation_n_regionkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, partsupp_ps_supplycost, part_p_partkey_0], primary key: [$8 ASC, $0 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $15 ASC, $14 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], distribution key: [8], read pk prefix len hint: 1 }
-     Table 3 { columns: [nation_n_regionkey, part_p_partkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, part_p_partkey_0, partsupp_ps_supplycost, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC], value indices: [9], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [region_r_regionkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [region_r_regionkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [part_p_partkey, part_p_mfgr, partsupp_ps_supplycost, supplier_s_name, supplier_s_address, supplier_s_phone, supplier_s_acctbal, supplier_s_comment, nation_n_name, nation_n_regionkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, supplier_s_nationkey, nation_n_nationkey], primary key: [$0 ASC, $2 ASC, $10 ASC, $11 ASC, $12 ASC, $14 ASC, $13 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], distribution key: [0], read pk prefix len hint: 2 }
-     Table 7 { columns: [part_p_partkey, partsupp_ps_supplycost, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC], value indices: [7], distribution key: [0], read pk prefix len hint: 2 }
-     Table 8 { columns: [part_p_partkey, min(partsupp_ps_supplycost)], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 2 }
-     Table 9 { columns: [part_p_partkey, min(partsupp_ps_supplycost), _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 2 }
-     Table 10 { columns: [part_p_partkey, part_p_mfgr, partsupp_ps_supplycost, supplier_s_name, supplier_s_address, supplier_s_nationkey, supplier_s_phone, supplier_s_acctbal, supplier_s_comment, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey], primary key: [$5 ASC, $0 ASC, $9 ASC, $10 ASC, $11 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], distribution key: [5], read pk prefix len hint: 1 }
-     Table 11 { columns: [supplier_s_nationkey, part_p_partkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC], value indices: [5], distribution key: [0], read pk prefix len hint: 1 }
-     Table 12 { columns: [nation_n_nationkey, nation_n_name, nation_n_regionkey], primary key: [$0 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 13 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 14 { columns: [part_p_partkey, part_p_mfgr, partsupp_ps_suppkey, partsupp_ps_supplycost, partsupp_ps_partkey], primary key: [$2 ASC, $0 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2], read pk prefix len hint: 1 }
-     Table 15 { columns: [partsupp_ps_suppkey, part_p_partkey, partsupp_ps_partkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 16 { columns: [supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_nationkey, supplier_s_phone, supplier_s_acctbal, supplier_s_comment], primary key: [$0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 17 { columns: [supplier_s_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 18 { columns: [part_p_partkey, part_p_mfgr], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 19 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 20 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_supplycost], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 21 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 22 { columns: [part_p_partkey, partsupp_ps_supplycost, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, region_r_regionkey, nation_n_regionkey], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8], distribution key: [0], read pk prefix len hint: 1 }
-     Table 23 { columns: [part_p_partkey, min(partsupp_ps_supplycost), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 24 { columns: [part_p_partkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 25 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 26 { columns: [partsupp_ps_partkey, partsupp_ps_supplycost, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, nation_n_regionkey, region_r_regionkey], primary key: [$0 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $7 ASC, $6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [0], read pk prefix len hint: 1 }
-     Table 27 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, region_r_regionkey, nation_n_regionkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC], value indices: [7], distribution key: [0], read pk prefix len hint: 1 }
-     Table 28 { columns: [part_p_partkey, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 29 { columns: [partsupp_ps_partkey, partsupp_ps_supplycost, nation_n_regionkey, partsupp_ps_suppkey, supplier_s_suppkey, supplier_s_nationkey, nation_n_nationkey], primary key: [$2 ASC, $0 ASC, $3 ASC, $4 ASC, $6 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [2], read pk prefix len hint: 1 }
-     Table 30 { columns: [nation_n_regionkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC], value indices: [6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 31 { columns: [region_r_regionkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 32 { columns: [region_r_regionkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 33 { columns: [partsupp_ps_partkey, partsupp_ps_supplycost, supplier_s_nationkey, partsupp_ps_suppkey, supplier_s_suppkey], primary key: [$2 ASC, $0 ASC, $3 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2], read pk prefix len hint: 1 }
-     Table 34 { columns: [supplier_s_nationkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 35 { columns: [nation_n_nationkey, nation_n_regionkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 36 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 37 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_supplycost], primary key: [$1 ASC, $0 ASC], value indices: [0, 1, 2], distribution key: [1], read pk prefix len hint: 1 }
-     Table 38 { columns: [partsupp_ps_suppkey, partsupp_ps_partkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 39 { columns: [supplier_s_suppkey, supplier_s_nationkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 40 { columns: [supplier_s_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address, s_phone, s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, nation.n_regionkey, region.r_regionkey], primary key: [$0 DESC, $2 ASC, $1 ASC, $3 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $14 ASC, $16 ASC, $15 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], distribution key: [], read pk prefix len hint: 10 }
+    StreamProject { exprs: [region.r_regionkey] }
+    └── StreamFilter { predicate: (region.r_name = 'AFRICA':Varchar) }
+        └── Chain { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ supplier_s_acctbal, supplier_s_name, nation_n_name, part_p_partkey, part_p_mfgr, supplier_s_address, supplier_s_phone, supplier_s_comment, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, part_p_partkey_0, partsupp_ps_supplycost, nation_n_regionkey, region_r_regionkey, $expr1 ], primary key: [ $0 DESC, $2 ASC, $1 ASC, $3 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $14 ASC, $16 ASC, $15 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 1 { columns: [ supplier_s_acctbal, supplier_s_name, nation_n_name, part_p_partkey, part_p_mfgr, supplier_s_address, supplier_s_phone, supplier_s_comment, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, part_p_partkey_0, partsupp_ps_supplycost, nation_n_regionkey, region_r_regionkey, $expr1 ], primary key: [ $17 ASC, $0 DESC, $2 ASC, $1 ASC, $3 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $14 ASC, $16 ASC, $15 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 ], distribution key: [ 15 ], read pk prefix len hint: 1, vnode column idx: 17 }
+
+    Table 2 { columns: [ part_p_partkey, part_p_mfgr, supplier_s_name, supplier_s_address, supplier_s_phone, supplier_s_acctbal, supplier_s_comment, nation_n_name, nation_n_regionkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, partsupp_ps_supplycost, part_p_partkey_0 ], primary key: [ $8 ASC, $0 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $15 ASC, $14 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ], distribution key: [ 8 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ nation_n_regionkey, part_p_partkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, part_p_partkey_0, partsupp_ps_supplycost, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC ], value indices: [ 9 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ region_r_regionkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ region_r_regionkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ part_p_partkey, part_p_mfgr, partsupp_ps_supplycost, supplier_s_name, supplier_s_address, supplier_s_phone, supplier_s_acctbal, supplier_s_comment, nation_n_name, nation_n_regionkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, supplier_s_nationkey, nation_n_nationkey ], primary key: [ $0 ASC, $2 ASC, $10 ASC, $11 ASC, $12 ASC, $14 ASC, $13 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 7 { columns: [ part_p_partkey, partsupp_ps_supplycost, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC ], value indices: [ 7 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 8 { columns: [ part_p_partkey, min(partsupp_ps_supplycost) ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 9 { columns: [ part_p_partkey, min(partsupp_ps_supplycost), _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 2 }
+
+    Table 10 { columns: [ part_p_partkey, part_p_mfgr, partsupp_ps_supplycost, supplier_s_name, supplier_s_address, supplier_s_nationkey, supplier_s_phone, supplier_s_acctbal, supplier_s_comment, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey ], primary key: [ $5 ASC, $0 ASC, $9 ASC, $10 ASC, $11 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ], distribution key: [ 5 ], read pk prefix len hint: 1 }
+
+    Table 11 { columns: [ supplier_s_nationkey, part_p_partkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC ], value indices: [ 5 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 12 { columns: [ nation_n_nationkey, nation_n_name, nation_n_regionkey ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 13 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ part_p_partkey, part_p_mfgr, partsupp_ps_suppkey, partsupp_ps_supplycost, partsupp_ps_partkey ], primary key: [ $2 ASC, $0 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
+    Table 15 { columns: [ partsupp_ps_suppkey, part_p_partkey, partsupp_ps_partkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 16 { columns: [ supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_nationkey, supplier_s_phone, supplier_s_acctbal, supplier_s_comment ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 17 { columns: [ supplier_s_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 18 { columns: [ part_p_partkey, part_p_mfgr ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 19 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 20 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_supplycost ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 21 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 22 { columns: [ part_p_partkey, partsupp_ps_supplycost, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, region_r_regionkey, nation_n_regionkey ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 23 { columns: [ part_p_partkey, min(partsupp_ps_supplycost), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 24 { columns: [ part_p_partkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 25 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 26 { columns: [ partsupp_ps_partkey, partsupp_ps_supplycost, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, nation_n_regionkey, region_r_regionkey ], primary key: [ $0 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $7 ASC, $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 27 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, region_r_regionkey, nation_n_regionkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC ], value indices: [ 7 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 28 { columns: [ part_p_partkey, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 29 { columns: [ partsupp_ps_partkey, partsupp_ps_supplycost, nation_n_regionkey, partsupp_ps_suppkey, supplier_s_suppkey, supplier_s_nationkey, nation_n_nationkey ], primary key: [ $2 ASC, $0 ASC, $3 ASC, $4 ASC, $6 ASC, $5 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
+    Table 30 { columns: [ nation_n_regionkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC ], value indices: [ 6 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 31 { columns: [ region_r_regionkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 32 { columns: [ region_r_regionkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 33 { columns: [ partsupp_ps_partkey, partsupp_ps_supplycost, supplier_s_nationkey, partsupp_ps_suppkey, supplier_s_suppkey ], primary key: [ $2 ASC, $0 ASC, $3 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
+    Table 34 { columns: [ supplier_s_nationkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 35 { columns: [ nation_n_nationkey, nation_n_regionkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 36 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 37 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_supplycost ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 38 { columns: [ partsupp_ps_suppkey, partsupp_ps_partkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 39 { columns: [ supplier_s_suppkey, supplier_s_nationkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 40 { columns: [ supplier_s_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ s_acctbal, s_name, n_name, p_partkey, p_mfgr, s_address, s_phone, s_comment, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey, part.p_partkey, partsupp.ps_supplycost, nation.n_regionkey, region.r_regionkey ], primary key: [ $0 DESC, $2 ASC, $1 ASC, $3 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $14 ASC, $16 ASC, $15 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 ], distribution key: [], read pk prefix len hint: 10 }
+
 - id: tpch_q3
   before:
   - create_tables
@@ -592,93 +621,108 @@
                       └─BatchFilter { predicate: (lineitem.l_shipdate > '1995-03-29':Date) }
                         └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [l_orderkey, revenue, o_orderdate, o_shippriority], pk_columns: [l_orderkey, o_orderdate, o_shippriority], order_descs: [revenue, o_orderdate, l_orderkey, o_shippriority], pk_conflict: "no check" }
+    StreamMaterialize { columns: [l_orderkey, revenue, o_orderdate, o_shippriority], stream_key: [l_orderkey, o_orderdate, o_shippriority], pk_columns: [revenue, o_orderdate, l_orderkey, o_shippriority], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority] }
       └─StreamTopN { order: "[sum($expr1) DESC, orders.o_orderdate ASC]", limit: 10, offset: 0 }
         └─StreamExchange { dist: Single }
           └─StreamGroupTopN { order: "[sum($expr1) DESC, orders.o_orderdate ASC]", limit: 10, offset: 0, group_key: [4] }
             └─StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority, Vnode(lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority) as $expr2] }
-              └─StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority] }
-                └─StreamHashAgg { group_key: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority], aggs: [sum($expr1), count] }
-                  └─StreamExchange { dist: HashShard(lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority) }
-                    └─StreamProject { exprs: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, customer.c_custkey, orders.o_orderkey, lineitem.l_linenumber] }
-                      └─StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderdate, orders.o_shippriority, lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, customer.c_custkey, orders.o_orderkey, lineitem.l_linenumber] }
-                        ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
-                        | └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [orders.o_orderkey, orders.o_orderdate, orders.o_shippriority, customer.c_custkey] }
-                        |   ├─StreamExchange { dist: HashShard(customer.c_custkey) }
-                        |   | └─StreamProject { exprs: [customer.c_custkey] }
-                        |   |   └─StreamFilter { predicate: (customer.c_mktsegment = 'FURNITURE':Varchar) }
-                        |   |     └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_mktsegment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-                        |   └─StreamExchange { dist: HashShard(orders.o_custkey) }
-                        |     └─StreamFilter { predicate: (orders.o_orderdate < '1995-03-29':Date) }
-                        |       └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate, orders.o_shippriority], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-                        └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
-                          └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
-                            └─StreamFilter { predicate: (lineitem.l_shipdate > '1995-03-29':Date) }
-                              └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+              └─StreamHashAgg { group_key: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority], aggs: [sum($expr1), count] }
+                └─StreamExchange { dist: HashShard(lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority) }
+                  └─StreamProject { exprs: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, customer.c_custkey, orders.o_orderkey, lineitem.l_linenumber] }
+                    └─StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderdate, orders.o_shippriority, lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, customer.c_custkey, orders.o_orderkey, lineitem.l_linenumber] }
+                      ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                      | └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [orders.o_orderkey, orders.o_orderdate, orders.o_shippriority, customer.c_custkey] }
+                      |   ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+                      |   | └─StreamProject { exprs: [customer.c_custkey] }
+                      |   |   └─StreamFilter { predicate: (customer.c_mktsegment = 'FURNITURE':Varchar) }
+                      |   |     └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_mktsegment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+                      |   └─StreamExchange { dist: HashShard(orders.o_custkey) }
+                      |     └─StreamFilter { predicate: (orders.o_orderdate < '1995-03-29':Date) }
+                      |       └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate, orders.o_shippriority], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+                      └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                        └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
+                          └─StreamFilter { predicate: (lineitem.l_shipdate > '1995-03-29':Date) }
+                            └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [l_orderkey, revenue, o_orderdate, o_shippriority], pk_columns: [l_orderkey, o_orderdate, o_shippriority], order_descs: [revenue, o_orderdate, l_orderkey, o_shippriority], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority] }
-          StreamTopN { order: "[sum($expr1) DESC, orders.o_orderdate ASC]", limit: 10, offset: 0 }
-              state table: 0
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [l_orderkey, revenue, o_orderdate, o_shippriority], stream_key: [l_orderkey, o_orderdate, o_shippriority], pk_columns: [revenue, o_orderdate, l_orderkey, o_shippriority], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority] }
+        └── StreamTopN { order: "[sum($expr1) DESC, orders.o_orderdate ASC]", limit: 10, offset: 0 } { state table: 0 }
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamGroupTopN { order: "[sum($expr1) DESC, orders.o_orderdate ASC]", limit: 10, offset: 0, group_key: [4] }
-          state table: 1
-        StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority, Vnode(lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority) as $expr2] }
-          StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority] }
-            StreamHashAgg { group_key: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority], aggs: [sum($expr1), count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamExchange Hash([0, 1, 2]) from 2
+    StreamGroupTopN { order: "[sum($expr1) DESC, orders.o_orderdate ASC]", limit: 10, offset: 0, group_key: [4] } { state table: 1 }
+    └── StreamProject { exprs: [lineitem.l_orderkey, sum($expr1), orders.o_orderdate, orders.o_shippriority, Vnode(lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority) as $expr2] }
+        └── StreamHashAgg { group_key: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority], aggs: [sum($expr1), count] } { result table: 2, state tables: [], distinct tables: [] }
+            └──  StreamExchange Hash([0, 1, 2]) from 2
 
     Fragment 2
-      StreamProject { exprs: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, customer.c_custkey, orders.o_orderkey, lineitem.l_linenumber] }
-        StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderdate, orders.o_shippriority, lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, customer.c_custkey, orders.o_orderkey, lineitem.l_linenumber] }
-            left table: 3, right table 5, left degree table: 4, right degree table: 6,
-          StreamExchange Hash([0]) from 3
-          StreamExchange Hash([0]) from 6
+    StreamProject { exprs: [lineitem.l_orderkey, orders.o_orderdate, orders.o_shippriority, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, customer.c_custkey, orders.o_orderkey, lineitem.l_linenumber] }
+    └── StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderdate, orders.o_shippriority, lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, customer.c_custkey, orders.o_orderkey, lineitem.l_linenumber] }
+        ├── left table: 3
+        ├── right table: 5
+        ├── left degree table: 4
+        ├── right degree table: 6
+        ├──  StreamExchange Hash([0]) from 3
+        └──  StreamExchange Hash([0]) from 6
 
     Fragment 3
-      StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [orders.o_orderkey, orders.o_orderdate, orders.o_shippriority, customer.c_custkey] }
-          left table: 7, right table 9, left degree table: 8, right degree table: 10,
-        StreamExchange Hash([0]) from 4
-        StreamExchange Hash([1]) from 5
+    StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [orders.o_orderkey, orders.o_orderdate, orders.o_shippriority, customer.c_custkey] } { left table: 7, right table: 9, left degree table: 8, right degree table: 10 }
+    ├──  StreamExchange Hash([0]) from 4
+    └──  StreamExchange Hash([1]) from 5
 
     Fragment 4
-      StreamProject { exprs: [customer.c_custkey] }
-        StreamFilter { predicate: (customer.c_mktsegment = 'FURNITURE':Varchar) }
-          Chain { table: customer, columns: [customer.c_custkey, customer.c_mktsegment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [customer.c_custkey] }
+    └── StreamFilter { predicate: (customer.c_mktsegment = 'FURNITURE':Varchar) }
+        └── Chain { table: customer, columns: [customer.c_custkey, customer.c_mktsegment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 5
-      StreamFilter { predicate: (orders.o_orderdate < '1995-03-29':Date) }
-        Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate, orders.o_shippriority], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-          Upstream
-          BatchPlanNode
+    StreamFilter { predicate: (orders.o_orderdate < '1995-03-29':Date) }
+    └── Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate, orders.o_shippriority], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+        ├──  Upstream
+        └──  BatchPlanNode
 
     Fragment 6
-      StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
-        StreamFilter { predicate: (lineitem.l_shipdate > '1995-03-29':Date) }
-          Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [lineitem_l_orderkey, sum($expr1), orders_o_orderdate, orders_o_shippriority, $expr2], primary key: [$1 DESC, $2 ASC, $0 ASC, $3 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [lineitem_l_orderkey, sum($expr1), orders_o_orderdate, orders_o_shippriority, $expr2], primary key: [$4 ASC, $1 DESC, $2 ASC, $0 ASC, $3 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0, 2, 3], read pk prefix len hint: 1, vnode column idx: 4 }
-     Table 2 { columns: [lineitem_l_orderkey, orders_o_orderdate, orders_o_shippriority, sum($expr1), count], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3, 4], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 3 { columns: [orders_o_orderkey, orders_o_orderdate, orders_o_shippriority, customer_c_custkey], primary key: [$0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [orders_o_orderkey, customer_c_custkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber], primary key: [$0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [customer_c_custkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [customer_c_custkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [orders_o_orderkey, orders_o_custkey, orders_o_orderdate, orders_o_shippriority], primary key: [$1 ASC, $0 ASC], value indices: [0, 1, 2, 3], distribution key: [1], read pk prefix len hint: 1 }
-     Table 10 { columns: [orders_o_custkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [l_orderkey, revenue, o_orderdate, o_shippriority], primary key: [$1 DESC, $2 ASC, $0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [], read pk prefix len hint: 3 }
+    StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: (lineitem.l_shipdate > '1995-03-29':Date) }
+        └── Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ lineitem_l_orderkey, sum($expr1), orders_o_orderdate, orders_o_shippriority, $expr2 ], primary key: [ $1 DESC, $2 ASC, $0 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 1
+    ├── columns: [ lineitem_l_orderkey, sum($expr1), orders_o_orderdate, orders_o_shippriority, $expr2 ]
+    ├── primary key: [ $4 ASC, $1 DESC, $2 ASC, $0 ASC, $3 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4 ]
+    ├── distribution key: [ 0, 2, 3 ]
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 4
+
+    Table 2 { columns: [ lineitem_l_orderkey, orders_o_orderdate, orders_o_shippriority, sum($expr1), count ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3, 4 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 3 { columns: [ orders_o_orderkey, orders_o_orderdate, orders_o_shippriority, customer_c_custkey ], primary key: [ $0 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ orders_o_orderkey, customer_c_custkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber ], primary key: [ $0 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ customer_c_custkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ customer_c_custkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ orders_o_orderkey, orders_o_custkey, orders_o_orderdate, orders_o_shippriority ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ orders_o_custkey, orders_o_orderkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ l_orderkey, revenue, o_orderdate, o_shippriority ], primary key: [ $1 DESC, $2 ASC, $0 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [], read pk prefix len hint: 3 }
+
 - id: tpch_q4
   before:
   - create_tables
@@ -734,7 +778,7 @@
                 └─BatchFilter { predicate: (lineitem.l_commitdate < lineitem.l_receiptdate) }
                   └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_commitdate, lineitem.l_receiptdate], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [o_orderpriority, order_count], pk_columns: [o_orderpriority], pk_conflict: "no check" }
+    StreamMaterialize { columns: [o_orderpriority, order_count], stream_key: [o_orderpriority], pk_columns: [o_orderpriority], pk_conflict: "NoCheck" }
     └─StreamHashAgg { group_key: [orders.o_orderpriority], aggs: [count] }
       └─StreamExchange { dist: HashShard(orders.o_orderpriority) }
         └─StreamHashJoin { type: LeftSemi, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderpriority, orders.o_orderkey] }
@@ -746,40 +790,48 @@
             └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_linenumber] }
               └─StreamFilter { predicate: (lineitem.l_commitdate < lineitem.l_receiptdate) }
                 └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [o_orderpriority, order_count], pk_columns: [o_orderpriority], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashAgg { group_key: [orders.o_orderpriority], aggs: [count] }
-            result table: 0, state tables: [], distinct tables: []
-          StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [o_orderpriority, order_count], stream_key: [o_orderpriority], pk_columns: [o_orderpriority], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashAgg { group_key: [orders.o_orderpriority], aggs: [count] } { result table: 0, state tables: [], distinct tables: [] }
+        └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamHashJoin { type: LeftSemi, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderpriority, orders.o_orderkey] }
-          left table: 1, right table 3, left degree table: 2, right degree table: 4,
-        StreamExchange Hash([0]) from 2
-        StreamExchange Hash([0]) from 3
+    StreamHashJoin { type: LeftSemi, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderpriority, orders.o_orderkey] }
+    ├── left table: 1
+    ├── right table: 3
+    ├── left degree table: 2
+    ├── right degree table: 4
+    ├──  StreamExchange Hash([0]) from 2
+    └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      StreamProject { exprs: [orders.o_orderkey, orders.o_orderpriority] }
-        StreamFilter { predicate: (orders.o_orderdate >= '1997-07-01':Date) AND (orders.o_orderdate < '1997-10-01 00:00:00':Timestamp) }
-          Chain { table: orders, columns: [orders.o_orderkey, orders.o_orderpriority, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [orders.o_orderkey, orders.o_orderpriority] }
+    └── StreamFilter { predicate: (orders.o_orderdate >= '1997-07-01':Date) AND (orders.o_orderdate < '1997-10-01 00:00:00':Timestamp) }
+        └── Chain { table: orders, columns: [orders.o_orderkey, orders.o_orderpriority, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 3
-      StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_linenumber] }
-        StreamFilter { predicate: (lineitem.l_commitdate < lineitem.l_receiptdate) }
-          Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [orders_o_orderpriority, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [orders_o_orderkey, orders_o_orderpriority], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [orders_o_orderkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [lineitem_l_orderkey, lineitem_l_linenumber], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [o_orderpriority, order_count], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
+    StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: (lineitem.l_commitdate < lineitem.l_receiptdate) }
+        └── Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ orders_o_orderpriority, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ orders_o_orderkey, orders_o_orderpriority ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ orders_o_orderkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ lineitem_l_orderkey, lineitem_l_linenumber ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ o_orderpriority, order_count ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: tpch_q5
   before:
   - create_tables
@@ -864,7 +916,7 @@
                       └─BatchExchange { order: [], dist: HashShard(lineitem.l_orderkey, lineitem.l_suppkey) }
                         └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [n_name, revenue], pk_columns: [n_name], order_descs: [revenue, n_name], pk_conflict: "no check" }
+    StreamMaterialize { columns: [n_name, revenue], stream_key: [n_name], pk_columns: [revenue, n_name], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [nation.n_name, sum($expr1)] }
       └─StreamHashAgg { group_key: [nation.n_name], aggs: [sum($expr1), count] }
         └─StreamExchange { dist: HashShard(nation.n_name) }
@@ -894,102 +946,148 @@
                 └─StreamProject { exprs: [region.r_regionkey] }
                   └─StreamFilter { predicate: (region.r_name = 'MIDDLE EAST':Varchar) }
                     └─StreamTableScan { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [n_name, revenue], pk_columns: [n_name], order_descs: [revenue, n_name], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [nation.n_name, sum($expr1)] }
-          StreamHashAgg { group_key: [nation.n_name], aggs: [sum($expr1), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [n_name, revenue], stream_key: [n_name], pk_columns: [revenue, n_name], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [nation.n_name, sum($expr1)] }
+        └── StreamHashAgg { group_key: [nation.n_name], aggs: [sum($expr1), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamProject { exprs: [nation.n_name, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, customer.c_custkey, orders.o_orderkey, supplier.s_suppkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, region.r_regionkey, nation.n_regionkey] }
-        StreamHashJoin { type: Inner, predicate: nation.n_regionkey = region.r_regionkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, customer.c_custkey, orders.o_orderkey, supplier.s_suppkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, nation.n_regionkey, region.r_regionkey] }
-            left table: 1, right table 3, left degree table: 2, right degree table: 4,
-          StreamExchange Hash([3]) from 2
-          StreamExchange Hash([0]) from 11
+    StreamProject { exprs: [nation.n_name, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, customer.c_custkey, orders.o_orderkey, supplier.s_suppkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, region.r_regionkey, nation.n_regionkey] }
+    └── StreamHashJoin { type: Inner, predicate: nation.n_regionkey = region.r_regionkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, customer.c_custkey, orders.o_orderkey, supplier.s_suppkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, nation.n_regionkey, region.r_regionkey] }
+        ├── left table: 1
+        ├── right table: 3
+        ├── left degree table: 2
+        ├── right degree table: 4
+        ├──  StreamExchange Hash([3]) from 2
+        └──  StreamExchange Hash([0]) from 11
 
     Fragment 2
-      StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, nation.n_regionkey, customer.c_custkey, orders.o_orderkey, supplier.s_suppkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_nationkey, nation.n_nationkey] }
-          left table: 5, right table 7, left degree table: 6, right degree table: 8,
-        StreamExchange Hash([0]) from 3
-        StreamExchange Hash([0]) from 10
+    StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, nation.n_regionkey, customer.c_custkey, orders.o_orderkey, supplier.s_suppkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_nationkey, nation.n_nationkey] }
+    ├── left table: 5
+    ├── right table: 7
+    ├── left degree table: 6
+    ├── right degree table: 8
+    ├──  StreamExchange Hash([0]) from 3
+    └──  StreamExchange Hash([0]) from 10
 
     Fragment 3
-      StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey AND supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_nationkey, lineitem.l_extendedprice, lineitem.l_discount, customer.c_custkey, orders.o_orderkey, supplier.s_suppkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
-          left table: 9, right table 11, left degree table: 10, right degree table: 12,
-        StreamExchange Hash([0, 1]) from 4
-        StreamExchange Hash([0, 1]) from 9
+    StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey AND supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_nationkey, lineitem.l_extendedprice, lineitem.l_discount, customer.c_custkey, orders.o_orderkey, supplier.s_suppkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+    ├── left table: 9
+    ├── right table: 11
+    ├── left degree table: 10
+    ├── right degree table: 12
+    ├──  StreamExchange Hash([0, 1]) from 4
+    └──  StreamExchange Hash([0, 1]) from 9
 
     Fragment 4
-      StreamHashJoin { type: Inner, predicate: customer.c_nationkey = supplier.s_nationkey, output: [orders.o_orderkey, supplier.s_suppkey, supplier.s_nationkey, customer.c_custkey, customer.c_nationkey] }
-          left table: 13, right table 15, left degree table: 14, right degree table: 16,
-        StreamExchange Hash([0]) from 5
-        StreamExchange Hash([1]) from 8
+    StreamHashJoin { type: Inner, predicate: customer.c_nationkey = supplier.s_nationkey, output: [orders.o_orderkey, supplier.s_suppkey, supplier.s_nationkey, customer.c_custkey, customer.c_nationkey] } { left table: 13, right table: 15, left degree table: 14, right degree table: 16 }
+    ├──  StreamExchange Hash([0]) from 5
+    └──  StreamExchange Hash([1]) from 8
 
     Fragment 5
-      StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_nationkey, orders.o_orderkey, customer.c_custkey] }
-          left table: 17, right table 19, left degree table: 18, right degree table: 20,
-        StreamExchange Hash([0]) from 6
-        StreamExchange Hash([1]) from 7
+    StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_nationkey, orders.o_orderkey, customer.c_custkey] } { left table: 17, right table: 19, left degree table: 18, right degree table: 20 }
+    ├──  StreamExchange Hash([0]) from 6
+    └──  StreamExchange Hash([1]) from 7
 
     Fragment 6
-      Chain { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 7
-      StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
-        StreamFilter { predicate: (orders.o_orderdate >= '1994-01-01':Date) AND (orders.o_orderdate < '1995-01-01 00:00:00':Timestamp) }
-          Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
+    └── StreamFilter { predicate: (orders.o_orderdate >= '1994-01-01':Date) AND (orders.o_orderdate < '1995-01-01 00:00:00':Timestamp) }
+        └── Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 8
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 9
-      Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-        Upstream
-        BatchPlanNode
+    Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 10
-      Chain { table: nation, columns: [nation.n_nationkey, nation.n_name, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: nation, columns: [nation.n_nationkey, nation.n_name, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 11
-      StreamProject { exprs: [region.r_regionkey] }
-        StreamFilter { predicate: (region.r_name = 'MIDDLE EAST':Varchar) }
-          Chain { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [nation_n_name, sum($expr1), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, nation_n_regionkey, customer_c_custkey, orders_o_orderkey, supplier_s_suppkey, customer_c_nationkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_nationkey, nation_n_nationkey], primary key: [$3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $11 ASC, $10 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], distribution key: [3], read pk prefix len hint: 1 }
-     Table 2 { columns: [nation_n_regionkey, customer_c_custkey, orders_o_orderkey, supplier_s_suppkey, customer_c_nationkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC], value indices: [9], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [region_r_regionkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [region_r_regionkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [supplier_s_nationkey, lineitem_l_extendedprice, lineitem_l_discount, customer_c_custkey, orders_o_orderkey, supplier_s_suppkey, customer_c_nationkey, lineitem_l_orderkey, lineitem_l_linenumber], primary key: [$0 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [supplier_s_nationkey, customer_c_custkey, orders_o_orderkey, supplier_s_suppkey, customer_c_nationkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC], value indices: [7], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [nation_n_nationkey, nation_n_name, nation_n_regionkey], primary key: [$0 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [orders_o_orderkey, supplier_s_suppkey, supplier_s_nationkey, customer_c_custkey, customer_c_nationkey], primary key: [$0 ASC, $1 ASC, $3 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 10 { columns: [orders_o_orderkey, supplier_s_suppkey, customer_c_custkey, customer_c_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 11 { columns: [lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber], primary key: [$0 ASC, $1 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 12 { columns: [lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 13 { columns: [customer_c_nationkey, orders_o_orderkey, customer_c_custkey], primary key: [$0 ASC, $2 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 14 { columns: [customer_c_nationkey, customer_c_custkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 15 { columns: [supplier_s_suppkey, supplier_s_nationkey], primary key: [$1 ASC, $0 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 16 { columns: [supplier_s_nationkey, supplier_s_suppkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 17 { columns: [customer_c_custkey, customer_c_nationkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 18 { columns: [customer_c_custkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 19 { columns: [orders_o_orderkey, orders_o_custkey], primary key: [$1 ASC, $0 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 20 { columns: [orders_o_custkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [n_name, revenue], primary key: [$1 DESC, $0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
+    StreamProject { exprs: [region.r_regionkey] }
+    └── StreamFilter { predicate: (region.r_name = 'MIDDLE EAST':Varchar) }
+        └── Chain { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ nation_n_name, sum($expr1), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1
+    ├── columns: [ lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, nation_n_regionkey, customer_c_custkey, orders_o_orderkey, supplier_s_suppkey, customer_c_nationkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_nationkey, nation_n_nationkey ]
+    ├── primary key: [ $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $11 ASC, $10 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ]
+    ├── distribution key: [ 3 ]
+    └── read pk prefix len hint: 1
+
+    Table 2
+    ├── columns: [ nation_n_regionkey, customer_c_custkey, orders_o_orderkey, supplier_s_suppkey, customer_c_nationkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, _degree ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC ]
+    ├── value indices: [ 9 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 3 { columns: [ region_r_regionkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ region_r_regionkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5
+    ├── columns: [ supplier_s_nationkey, lineitem_l_extendedprice, lineitem_l_discount, customer_c_custkey, orders_o_orderkey, supplier_s_suppkey, customer_c_nationkey, lineitem_l_orderkey, lineitem_l_linenumber ]
+    ├── primary key: [ $0 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 6 { columns: [ supplier_s_nationkey, customer_c_custkey, orders_o_orderkey, supplier_s_suppkey, customer_c_nationkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC ], value indices: [ 7 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ nation_n_nationkey, nation_n_name, nation_n_regionkey ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ orders_o_orderkey, supplier_s_suppkey, supplier_s_nationkey, customer_c_custkey, customer_c_nationkey ], primary key: [ $0 ASC, $1 ASC, $3 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 10 { columns: [ orders_o_orderkey, supplier_s_suppkey, customer_c_custkey, customer_c_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 11 { columns: [ lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber ], primary key: [ $0 ASC, $1 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 12 { columns: [ lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 13 { columns: [ customer_c_nationkey, orders_o_orderkey, customer_c_custkey ], primary key: [ $0 ASC, $2 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ customer_c_nationkey, customer_c_custkey, orders_o_orderkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 15 { columns: [ supplier_s_suppkey, supplier_s_nationkey ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 16 { columns: [ supplier_s_nationkey, supplier_s_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 17 { columns: [ customer_c_custkey, customer_c_nationkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 18 { columns: [ customer_c_custkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 19 { columns: [ orders_o_orderkey, orders_o_custkey ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 20 { columns: [ orders_o_custkey, orders_o_orderkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ n_name, revenue ], primary key: [ $1 DESC, $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: tpch_q6
   before:
   - create_tables
@@ -1021,7 +1119,7 @@
           └─BatchFilter { predicate: (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) AND (lineitem.l_discount >= 0.07:Decimal) AND (lineitem.l_discount <= 0.09:Decimal) AND (lineitem.l_quantity < 24:Int32) }
             └─BatchScan { table: lineitem, columns: [lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_quantity, lineitem.l_shipdate], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [revenue], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [revenue], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum($expr1))] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), count] }
         └─StreamExchange { dist: Single }
@@ -1029,25 +1127,29 @@
             └─StreamProject { exprs: [(lineitem.l_extendedprice * lineitem.l_discount) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber] }
               └─StreamFilter { predicate: (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) AND (lineitem.l_discount >= 0.07:Decimal) AND (lineitem.l_discount <= 0.09:Decimal) AND (lineitem.l_quantity < 24:Int32) }
                 └─StreamTableScan { table: lineitem, columns: [lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_quantity, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [revenue], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(sum($expr1))] }
-          StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [revenue], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(sum($expr1))] }
+        └── StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [sum($expr1)] }
-        StreamProject { exprs: [(lineitem.l_extendedprice * lineitem.l_discount) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber] }
-          StreamFilter { predicate: (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) AND (lineitem.l_discount >= 0.07:Decimal) AND (lineitem.l_discount <= 0.09:Decimal) AND (lineitem.l_quantity < 24:Int32) }
-            Chain { table: lineitem, columns: [lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_quantity, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-              Upstream
-              BatchPlanNode
-
-     Table 0 { columns: [sum(sum($expr1)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [revenue], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamStatelessLocalSimpleAgg { aggs: [sum($expr1)] }
+    └── StreamProject { exprs: [(lineitem.l_extendedprice * lineitem.l_discount) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber] }
+        └── StreamFilter { predicate: (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) AND (lineitem.l_discount >= 0.07:Decimal) AND (lineitem.l_discount <= 0.09:Decimal) AND (lineitem.l_quantity < 24:Int32) }
+            └── Chain { table: lineitem, columns: [lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_quantity, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                ├──  Upstream
+                └──  BatchPlanNode
+
+    Table 0 { columns: [ sum(sum($expr1)), count ], primary key: [], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 4294967294 { columns: [ revenue ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
 - id: tpch_q7
   before:
   - create_tables
@@ -1143,7 +1245,7 @@
                                 └─BatchFilter { predicate: (lineitem.l_shipdate >= '1983-01-01':Date) AND (lineitem.l_shipdate <= '2000-12-31':Date) }
                                   └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [supp_nation, cust_nation, l_year, revenue], pk_columns: [supp_nation, cust_nation, l_year], pk_conflict: "no check" }
+    StreamMaterialize { columns: [supp_nation, cust_nation, l_year, revenue], stream_key: [supp_nation, cust_nation, l_year], pk_columns: [supp_nation, cust_nation, l_year], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [nation.n_name, nation.n_name, $expr1, sum($expr2)] }
       └─StreamHashAgg { group_key: [nation.n_name, nation.n_name, $expr1], aggs: [sum($expr2), count] }
         └─StreamExchange { dist: HashShard(nation.n_name, nation.n_name, $expr1) }
@@ -1171,100 +1273,134 @@
                 |     └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
                 └─StreamExchange { dist: HashShard(nation.n_nationkey) }
                   └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [supp_nation, cust_nation, l_year, revenue], pk_columns: [supp_nation, cust_nation, l_year], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [nation.n_name, nation.n_name, $expr1, sum($expr2)] }
-          StreamHashAgg { group_key: [nation.n_name, nation.n_name, $expr1], aggs: [sum($expr2), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0, 1, 2]) from 1
+    StreamMaterialize { columns: [supp_nation, cust_nation, l_year, revenue], stream_key: [supp_nation, cust_nation, l_year], pk_columns: [supp_nation, cust_nation, l_year], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [nation.n_name, nation.n_name, $expr1, sum($expr2)] }
+        └── StreamHashAgg { group_key: [nation.n_name, nation.n_name, $expr1], aggs: [sum($expr2), count] } { result table: 0, state tables: [], distinct tables: [] }
+            └──  StreamExchange Hash([0, 1, 2]) from 1
 
     Fragment 1
-      StreamProject { exprs: [nation.n_name, nation.n_name, Extract('YEAR':Varchar, lineitem.l_shipdate) as $expr1, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr2, supplier.s_suppkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, customer.c_custkey, orders.o_custkey, nation.n_nationkey, customer.c_nationkey] }
-        StreamFilter { predicate: (((nation.n_name = 'ROMANIA':Varchar) AND (nation.n_name = 'IRAN':Varchar)) OR ((nation.n_name = 'IRAN':Varchar) AND (nation.n_name = 'ROMANIA':Varchar))) }
-          StreamHashJoin { type: Inner, predicate: customer.c_nationkey = nation.n_nationkey, output: all }
-              left table: 1, right table 3, left degree table: 2, right degree table: 4,
-            StreamExchange Hash([4]) from 2
-            StreamExchange Hash([0]) from 11
+    StreamProject { exprs: [nation.n_name, nation.n_name, Extract('YEAR':Varchar, lineitem.l_shipdate) as $expr1, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr2, supplier.s_suppkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, customer.c_custkey, orders.o_custkey, nation.n_nationkey, customer.c_nationkey] }
+    └── StreamFilter { predicate: (((nation.n_name = 'ROMANIA':Varchar) AND (nation.n_name = 'IRAN':Varchar)) OR ((nation.n_name = 'IRAN':Varchar) AND (nation.n_name = 'ROMANIA':Varchar))) }
+        └── StreamHashJoin { type: Inner, predicate: customer.c_nationkey = nation.n_nationkey, output: all } { left table: 1, right table: 3, left degree table: 2, right degree table: 4 }
+            ├──  StreamExchange Hash([4]) from 2
+            └──  StreamExchange Hash([0]) from 11
 
     Fragment 2
-      StreamHashJoin { type: Inner, predicate: orders.o_custkey = customer.c_custkey, output: [lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, nation.n_name, customer.c_nationkey, supplier.s_suppkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, orders.o_custkey, customer.c_custkey] }
-          left table: 5, right table 7, left degree table: 6, right degree table: 8,
-        StreamExchange Hash([4]) from 3
-        StreamExchange Hash([0]) from 10
+    StreamHashJoin { type: Inner, predicate: orders.o_custkey = customer.c_custkey, output: [lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, nation.n_name, customer.c_nationkey, supplier.s_suppkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, orders.o_custkey, customer.c_custkey] }
+    ├── left table: 5
+    ├── right table: 7
+    ├── left degree table: 6
+    ├── right degree table: 8
+    ├──  StreamExchange Hash([4]) from 3
+    └──  StreamExchange Hash([0]) from 10
 
     Fragment 3
-      StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, nation.n_name, orders.o_custkey, supplier.s_suppkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey] }
-          left table: 9, right table 11, left degree table: 10, right degree table: 12,
-        StreamExchange Hash([0]) from 4
-        StreamExchange Hash([0]) from 9
+    StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, nation.n_name, orders.o_custkey, supplier.s_suppkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey] }
+    ├── left table: 9
+    ├── right table: 11
+    ├── left degree table: 10
+    ├── right degree table: 12
+    ├──  StreamExchange Hash([0]) from 4
+    └──  StreamExchange Hash([0]) from 9
 
     Fragment 4
-      StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, nation.n_name, supplier.s_suppkey, lineitem.l_linenumber, supplier.s_nationkey, nation.n_nationkey] }
-          left table: 13, right table 15, left degree table: 14, right degree table: 16,
-        StreamExchange Hash([0]) from 5
-        StreamExchange Hash([0]) from 8
+    StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, nation.n_name, supplier.s_suppkey, lineitem.l_linenumber, supplier.s_nationkey, nation.n_nationkey] } { left table: 13, right table: 15, left degree table: 14, right degree table: 16 }
+    ├──  StreamExchange Hash([0]) from 5
+    └──  StreamExchange Hash([0]) from 8
 
     Fragment 5
-      StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_nationkey, lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, supplier.s_suppkey, lineitem.l_linenumber] }
-          left table: 17, right table 19, left degree table: 18, right degree table: 20,
-        StreamExchange Hash([0]) from 6
-        StreamExchange Hash([1]) from 7
+    StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_nationkey, lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, supplier.s_suppkey, lineitem.l_linenumber] } { left table: 17, right table: 19, left degree table: 18, right degree table: 20 }
+    ├──  StreamExchange Hash([0]) from 6
+    └──  StreamExchange Hash([1]) from 7
 
     Fragment 6
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 7
-      StreamFilter { predicate: (lineitem.l_shipdate >= '1983-01-01':Date) AND (lineitem.l_shipdate <= '2000-12-31':Date) }
-        Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-          Upstream
-          BatchPlanNode
+    StreamFilter { predicate: (lineitem.l_shipdate >= '1983-01-01':Date) AND (lineitem.l_shipdate <= '2000-12-31':Date) }
+    └── Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+        ├──  Upstream
+        └──  BatchPlanNode
 
     Fragment 8
-      Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 9
-      Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 10
-      Chain { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 11
-      Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [nation_n_name, nation_n_name_0, $expr1, sum($expr2), count], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3, 4], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 1 { columns: [lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, nation_n_name, customer_c_nationkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, orders_o_custkey, customer_c_custkey], primary key: [$4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $12 ASC, $11 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], distribution key: [4], read pk prefix len hint: 1 }
-     Table 2 { columns: [customer_c_nationkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, customer_c_custkey, orders_o_custkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC], value indices: [9], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [nation_n_nationkey, nation_n_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, nation_n_name, orders_o_custkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey], primary key: [$4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], distribution key: [4], read pk prefix len hint: 1 }
-     Table 6 { columns: [orders_o_custkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC], value indices: [7], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [customer_c_custkey, customer_c_nationkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [customer_c_custkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, nation_n_name, supplier_s_suppkey, lineitem_l_linenumber, supplier_s_nationkey, nation_n_nationkey], primary key: [$0 ASC, $5 ASC, $6 ASC, $8 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8], distribution key: [0], read pk prefix len hint: 1 }
-     Table 10 { columns: [lineitem_l_orderkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC], value indices: [5], distribution key: [0], read pk prefix len hint: 1 }
-     Table 11 { columns: [orders_o_orderkey, orders_o_custkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 12 { columns: [orders_o_orderkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 13 { columns: [supplier_s_nationkey, lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, supplier_s_suppkey, lineitem_l_linenumber], primary key: [$0 ASC, $5 ASC, $1 ASC, $6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 14 { columns: [supplier_s_nationkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 15 { columns: [nation_n_nationkey, nation_n_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 16 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 17 { columns: [supplier_s_suppkey, supplier_s_nationkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 18 { columns: [supplier_s_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 19 { columns: [lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, lineitem_l_linenumber], primary key: [$1 ASC, $0 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [1], read pk prefix len hint: 1 }
-     Table 20 { columns: [lineitem_l_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [supp_nation, cust_nation, l_year, revenue], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [0, 1, 2, 3], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
+    Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0 { columns: [ nation_n_name, nation_n_name_0, $expr1, sum($expr2), count ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3, 4 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
+    Table 1
+    ├── columns: [ lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, nation_n_name, customer_c_nationkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, orders_o_custkey, customer_c_custkey ]
+    ├── primary key: [ $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $12 ASC, $11 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 ]
+    ├── distribution key: [ 4 ]
+    └── read pk prefix len hint: 1
+
+    Table 2 { columns: [ customer_c_nationkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, customer_c_custkey, orders_o_custkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC ], value indices: [ 9 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ nation_n_nationkey, nation_n_name ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5
+    ├── columns: [ lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, nation_n_name, orders_o_custkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey ]
+    ├── primary key: [ $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+    ├── distribution key: [ 4 ]
+    └── read pk prefix len hint: 1
+
+    Table 6 { columns: [ orders_o_custkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC ], value indices: [ 7 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ customer_c_custkey, customer_c_nationkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ customer_c_custkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, nation_n_name, supplier_s_suppkey, lineitem_l_linenumber, supplier_s_nationkey, nation_n_nationkey ], primary key: [ $0 ASC, $5 ASC, $6 ASC, $8 ASC, $7 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ lineitem_l_orderkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC ], value indices: [ 5 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 11 { columns: [ orders_o_orderkey, orders_o_custkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 12 { columns: [ orders_o_orderkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 13 { columns: [ supplier_s_nationkey, lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, supplier_s_suppkey, lineitem_l_linenumber ], primary key: [ $0 ASC, $5 ASC, $1 ASC, $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ supplier_s_nationkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 15 { columns: [ nation_n_nationkey, nation_n_name ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 16 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 17 { columns: [ supplier_s_suppkey, supplier_s_nationkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 18 { columns: [ supplier_s_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 19 { columns: [ lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_shipdate, lineitem_l_linenumber ], primary key: [ $1 ASC, $0 ASC, $5 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 20 { columns: [ lineitem_l_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ supp_nation, cust_nation, l_year, revenue ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
 - id: tpch_q8
   before:
   - create_tables
@@ -1373,7 +1509,7 @@
                                         └─BatchExchange { order: [], dist: HashShard(lineitem.l_partkey) }
                                           └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [o_year, mkt_share], pk_columns: [o_year], pk_conflict: "no check" }
+    StreamMaterialize { columns: [o_year, mkt_share], stream_key: [o_year], pk_columns: [o_year], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [$expr1, RoundDigit((sum($expr2) / sum($expr3)), 6:Int32) as $expr4] }
       └─StreamHashAgg { group_key: [$expr1], aggs: [sum($expr2), sum($expr3), count] }
         └─StreamExchange { dist: HashShard($expr1) }
@@ -1412,133 +1548,168 @@
                 └─StreamProject { exprs: [region.r_regionkey] }
                   └─StreamFilter { predicate: (region.r_name = 'ASIA':Varchar) }
                     └─StreamTableScan { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [o_year, mkt_share], pk_columns: [o_year], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [$expr1, RoundDigit((sum($expr2) / sum($expr3)), 6:Int32) as $expr4] }
-          StreamHashAgg { group_key: [$expr1], aggs: [sum($expr2), sum($expr3), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [o_year, mkt_share], stream_key: [o_year], pk_columns: [o_year], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [$expr1, RoundDigit((sum($expr2) / sum($expr3)), 6:Int32) as $expr4] }
+        └── StreamHashAgg { group_key: [$expr1], aggs: [sum($expr2), sum($expr3), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamProject { exprs: [Extract('YEAR':Varchar, orders.o_orderdate) as $expr1, Case((nation.n_name = 'IRAN':Varchar), (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)), 0:Decimal) as $expr2, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr3, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, customer.c_custkey, orders.o_custkey, nation.n_nationkey, customer.c_nationkey, region.r_regionkey, nation.n_regionkey] }
-        StreamHashJoin { type: Inner, predicate: nation.n_regionkey = region.r_regionkey, output: [lineitem.l_extendedprice, lineitem.l_discount, orders.o_orderdate, nation.n_name, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, customer.c_custkey, orders.o_custkey, nation.n_nationkey, customer.c_nationkey, nation.n_regionkey, region.r_regionkey] }
-            left table: 1, right table 3, left degree table: 2, right degree table: 4,
-          StreamExchange Hash([4]) from 2
-          StreamExchange Hash([0]) from 15
+    StreamProject { exprs: [Extract('YEAR':Varchar, orders.o_orderdate) as $expr1, Case((nation.n_name = 'IRAN':Varchar), (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)), 0:Decimal) as $expr2, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr3, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, customer.c_custkey, orders.o_custkey, nation.n_nationkey, customer.c_nationkey, region.r_regionkey, nation.n_regionkey] }
+    └── StreamHashJoin { type: Inner, predicate: nation.n_regionkey = region.r_regionkey, output: [lineitem.l_extendedprice, lineitem.l_discount, orders.o_orderdate, nation.n_name, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, customer.c_custkey, orders.o_custkey, nation.n_nationkey, customer.c_nationkey, nation.n_regionkey, region.r_regionkey] } { left table: 1, right table: 3, left degree table: 2, right degree table: 4 }
+        ├──  StreamExchange Hash([4]) from 2
+        └──  StreamExchange Hash([0]) from 15
 
     Fragment 2
-      StreamHashJoin { type: Inner, predicate: customer.c_nationkey = nation.n_nationkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_orderdate, nation.n_regionkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, customer.c_custkey, orders.o_custkey, customer.c_nationkey, nation.n_nationkey] }
-          left table: 5, right table 7, left degree table: 6, right degree table: 8,
-        StreamExchange Hash([4]) from 3
-        StreamExchange Hash([0]) from 14
+    StreamHashJoin { type: Inner, predicate: customer.c_nationkey = nation.n_nationkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_orderdate, nation.n_regionkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, customer.c_custkey, orders.o_custkey, customer.c_nationkey, nation.n_nationkey] } { left table: 5, right table: 7, left degree table: 6, right degree table: 8 }
+    ├──  StreamExchange Hash([4]) from 3
+    └──  StreamExchange Hash([0]) from 14
 
     Fragment 3
-      StreamHashJoin { type: Inner, predicate: orders.o_custkey = customer.c_custkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_orderdate, customer.c_nationkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, orders.o_custkey, customer.c_custkey] }
-          left table: 9, right table 11, left degree table: 10, right degree table: 12,
-        StreamExchange Hash([3]) from 4
-        StreamExchange Hash([0]) from 13
+    StreamHashJoin { type: Inner, predicate: orders.o_custkey = customer.c_custkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_orderdate, customer.c_nationkey, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey, orders.o_custkey, customer.c_custkey] } { left table: 9, right table: 11, left degree table: 10, right degree table: 12 }
+    ├──  StreamExchange Hash([3]) from 4
+    └──  StreamExchange Hash([0]) from 13
 
     Fragment 4
-      StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_custkey, orders.o_orderdate, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey] }
-          left table: 13, right table 15, left degree table: 14, right degree table: 16,
-        StreamExchange Hash([0]) from 5
-        StreamExchange Hash([0]) from 12
+    StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_custkey, orders.o_orderdate, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey] } { left table: 13, right table: 15, left degree table: 14, right degree table: 16 }
+    ├──  StreamExchange Hash([0]) from 5
+    └──  StreamExchange Hash([0]) from 12
 
     Fragment 5
-      StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, part.p_partkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, supplier.s_nationkey, nation.n_nationkey] }
-          left table: 17, right table 19, left degree table: 18, right degree table: 20,
-        StreamExchange Hash([3]) from 6
-        StreamExchange Hash([0]) from 11
+    StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, part.p_partkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, supplier.s_nationkey, nation.n_nationkey] } { left table: 17, right table: 19, left degree table: 18, right degree table: 20 }
+    ├──  StreamExchange Hash([3]) from 6
+    └──  StreamExchange Hash([0]) from 11
 
     Fragment 6
-      StreamHashJoin { type: Inner, predicate: lineitem.l_suppkey = supplier.s_suppkey, output: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, supplier.s_nationkey, part.p_partkey, lineitem.l_linenumber, lineitem.l_suppkey, supplier.s_suppkey] }
-          left table: 21, right table 23, left degree table: 22, right degree table: 24,
-        StreamExchange Hash([1]) from 7
-        StreamExchange Hash([0]) from 10
+    StreamHashJoin { type: Inner, predicate: lineitem.l_suppkey = supplier.s_suppkey, output: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, supplier.s_nationkey, part.p_partkey, lineitem.l_linenumber, lineitem.l_suppkey, supplier.s_suppkey] } { left table: 21, right table: 23, left degree table: 22, right degree table: 24 }
+    ├──  StreamExchange Hash([1]) from 7
+    └──  StreamExchange Hash([0]) from 10
 
     Fragment 7
-      StreamHashJoin { type: Inner, predicate: part.p_partkey = lineitem.l_partkey, output: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, part.p_partkey, lineitem.l_linenumber] }
-          left table: 25, right table 27, left degree table: 26, right degree table: 28,
-        StreamExchange Hash([0]) from 8
-        StreamExchange Hash([1]) from 9
+    StreamHashJoin { type: Inner, predicate: part.p_partkey = lineitem.l_partkey, output: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, part.p_partkey, lineitem.l_linenumber] } { left table: 25, right table: 27, left degree table: 26, right degree table: 28 }
+    ├──  StreamExchange Hash([0]) from 8
+    └──  StreamExchange Hash([1]) from 9
 
     Fragment 8
-      StreamProject { exprs: [part.p_partkey] }
-        StreamFilter { predicate: (part.p_type = 'PROMO ANODIZED STEEL':Varchar) }
-          Chain { table: part, columns: [part.p_partkey, part.p_type], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [part.p_partkey] }
+    └── StreamFilter { predicate: (part.p_type = 'PROMO ANODIZED STEEL':Varchar) }
+        └── Chain { table: part, columns: [part.p_partkey, part.p_type], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 9
-      Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-        Upstream
-        BatchPlanNode
+    Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 10
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 11
-      Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 12
-      StreamFilter { predicate: (orders.o_orderdate >= '1995-01-01':Date) AND (orders.o_orderdate <= '1996-12-31':Date) }
-        Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-          Upstream
-          BatchPlanNode
+    StreamFilter { predicate: (orders.o_orderdate >= '1995-01-01':Date) AND (orders.o_orderdate <= '1996-12-31':Date) }
+    └── Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+        ├──  Upstream
+        └──  BatchPlanNode
 
     Fragment 13
-      Chain { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: customer, columns: [customer.c_custkey, customer.c_nationkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 14
-      Chain { table: nation, columns: [nation.n_nationkey, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: nation, columns: [nation.n_nationkey, nation.n_regionkey], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 15
-      StreamProject { exprs: [region.r_regionkey] }
-        StreamFilter { predicate: (region.r_name = 'ASIA':Varchar) }
-          Chain { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [$expr1, sum($expr2), sum($expr3), count], primary key: [$0 ASC], value indices: [1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, orders_o_orderdate, nation_n_regionkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, customer_c_custkey, orders_o_custkey, customer_c_nationkey, nation_n_nationkey_0], primary key: [$4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $14 ASC, $16 ASC, $15 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], distribution key: [4], read pk prefix len hint: 1 }
-     Table 2 { columns: [nation_n_regionkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, customer_c_custkey, orders_o_custkey, nation_n_nationkey_0, customer_c_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC], value indices: [13], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [region_r_regionkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [region_r_regionkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, orders_o_orderdate, customer_c_nationkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, orders_o_custkey, customer_c_custkey], primary key: [$4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $14 ASC, $13 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], distribution key: [4], read pk prefix len hint: 1 }
-     Table 6 { columns: [customer_c_nationkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, customer_c_custkey, orders_o_custkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC], value indices: [11], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [nation_n_nationkey, nation_n_regionkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, orders_o_custkey, orders_o_orderdate, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey], primary key: [$3 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], distribution key: [3], read pk prefix len hint: 1 }
-     Table 10 { columns: [orders_o_custkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC], value indices: [9], distribution key: [0], read pk prefix len hint: 1 }
-     Table 11 { columns: [customer_c_custkey, customer_c_nationkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 12 { columns: [customer_c_custkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 13 { columns: [lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, supplier_s_nationkey, nation_n_nationkey], primary key: [$0 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $9 ASC, $8 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], distribution key: [0], read pk prefix len hint: 1 }
-     Table 14 { columns: [lineitem_l_orderkey, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC], value indices: [7], distribution key: [0], read pk prefix len hint: 1 }
-     Table 15 { columns: [orders_o_orderkey, orders_o_custkey, orders_o_orderdate], primary key: [$0 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 16 { columns: [orders_o_orderkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 17 { columns: [lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, supplier_s_nationkey, part_p_partkey, lineitem_l_linenumber, lineitem_l_suppkey, supplier_s_suppkey], primary key: [$3 ASC, $4 ASC, $0 ASC, $5 ASC, $7 ASC, $6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [3], read pk prefix len hint: 1 }
-     Table 18 { columns: [supplier_s_nationkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC], value indices: [6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 19 { columns: [nation_n_nationkey, nation_n_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 20 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 21 { columns: [lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_extendedprice, lineitem_l_discount, part_p_partkey, lineitem_l_linenumber], primary key: [$1 ASC, $4 ASC, $0 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [1], read pk prefix len hint: 1 }
-     Table 22 { columns: [lineitem_l_suppkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 23 { columns: [supplier_s_suppkey, supplier_s_nationkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 24 { columns: [supplier_s_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 25 { columns: [part_p_partkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 26 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 27 { columns: [lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber], primary key: [$1 ASC, $0 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [1], read pk prefix len hint: 1 }
-     Table 28 { columns: [lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [o_year, mkt_share], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
+    StreamProject { exprs: [region.r_regionkey] }
+    └── StreamFilter { predicate: (region.r_name = 'ASIA':Varchar) }
+        └── Chain { table: region, columns: [region.r_regionkey, region.r_name], pk: [region.r_regionkey], dist: UpstreamHashShard(region.r_regionkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ $expr1, sum($expr2), sum($expr3), count ], primary key: [ $0 ASC ], value indices: [ 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1
+    ├── columns: [ lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, orders_o_orderdate, nation_n_regionkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, customer_c_custkey, orders_o_custkey, customer_c_nationkey, nation_n_nationkey_0 ]
+    ├── primary key: [ $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $13 ASC, $14 ASC, $16 ASC, $15 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 ]
+    ├── distribution key: [ 4 ]
+    └── read pk prefix len hint: 1
+
+    Table 2 { columns: [ nation_n_regionkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, customer_c_custkey, orders_o_custkey, nation_n_nationkey_0, customer_c_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC ], value indices: [ 13 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ region_r_regionkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ region_r_regionkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5
+    ├── columns: [ lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, orders_o_orderdate, customer_c_nationkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, orders_o_custkey, customer_c_custkey ]
+    ├── primary key: [ $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC, $14 ASC, $13 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ]
+    ├── distribution key: [ 4 ]
+    └── read pk prefix len hint: 1
+
+    Table 6 { columns: [ customer_c_nationkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, customer_c_custkey, orders_o_custkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC ], value indices: [ 11 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ nation_n_nationkey, nation_n_regionkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, orders_o_custkey, orders_o_orderdate, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey ], primary key: [ $3 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $12 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 ], distribution key: [ 3 ], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ orders_o_custkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC ], value indices: [ 9 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 11 { columns: [ customer_c_custkey, customer_c_nationkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 12 { columns: [ customer_c_custkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 13 { columns: [ lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, supplier_s_nationkey, nation_n_nationkey ], primary key: [ $0 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $9 ASC, $8 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ lineitem_l_orderkey, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC ], value indices: [ 7 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 15 { columns: [ orders_o_orderkey, orders_o_custkey, orders_o_orderdate ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 16 { columns: [ orders_o_orderkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 17 { columns: [ lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, supplier_s_nationkey, part_p_partkey, lineitem_l_linenumber, lineitem_l_suppkey, supplier_s_suppkey ], primary key: [ $3 ASC, $4 ASC, $0 ASC, $5 ASC, $7 ASC, $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ], distribution key: [ 3 ], read pk prefix len hint: 1 }
+
+    Table 18 { columns: [ supplier_s_nationkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC ], value indices: [ 6 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 19 { columns: [ nation_n_nationkey, nation_n_name ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 20 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 21 { columns: [ lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_extendedprice, lineitem_l_discount, part_p_partkey, lineitem_l_linenumber ], primary key: [ $1 ASC, $4 ASC, $0 ASC, $5 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 22 { columns: [ lineitem_l_suppkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 23 { columns: [ supplier_s_suppkey, supplier_s_nationkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 24 { columns: [ supplier_s_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 25 { columns: [ part_p_partkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 26 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 27 { columns: [ lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber ], primary key: [ $1 ASC, $0 ASC, $5 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 28 { columns: [ lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ o_year, mkt_share ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: tpch_q9
   before:
   - create_tables
@@ -1630,7 +1801,7 @@
                                 └─BatchExchange { order: [], dist: HashShard(lineitem.l_partkey) }
                                   └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [nation, o_year, sum_profit], pk_columns: [nation, o_year], pk_conflict: "no check" }
+    StreamMaterialize { columns: [nation, o_year, sum_profit], stream_key: [nation, o_year], pk_columns: [nation, o_year], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [nation.n_name, $expr1, RoundDigit(sum($expr2), 2:Int32) as $expr3] }
       └─StreamHashAgg { group_key: [nation.n_name, $expr1], aggs: [sum($expr2), count] }
         └─StreamExchange { dist: HashShard(nation.n_name, $expr1) }
@@ -1658,100 +1829,137 @@
               |     └─StreamTableScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
               └─StreamExchange { dist: HashShard(orders.o_orderkey) }
                 └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [nation, o_year, sum_profit], pk_columns: [nation, o_year], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [nation.n_name, $expr1, RoundDigit(sum($expr2), 2:Int32) as $expr3] }
-          StreamHashAgg { group_key: [nation.n_name, $expr1], aggs: [sum($expr2), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0, 1]) from 1
+    StreamMaterialize { columns: [nation, o_year, sum_profit], stream_key: [nation, o_year], pk_columns: [nation, o_year], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [nation.n_name, $expr1, RoundDigit(sum($expr2), 2:Int32) as $expr3] }
+        └── StreamHashAgg { group_key: [nation.n_name, $expr1], aggs: [sum($expr2), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0, 1]) from 1
 
     Fragment 1
-      StreamProject { exprs: [nation.n_name, Extract('YEAR':Varchar, orders.o_orderdate) as $expr1, ((lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) - (partsupp.ps_supplycost * lineitem.l_quantity)) as $expr2, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, partsupp.ps_partkey, partsupp.ps_suppkey, lineitem.l_partkey, orders.o_orderkey] }
-        StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, partsupp.ps_supplycost, orders.o_orderdate, nation.n_name, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, partsupp.ps_partkey, partsupp.ps_suppkey, lineitem.l_partkey, orders.o_orderkey] }
-            left table: 1, right table 3, left degree table: 2, right degree table: 4,
-          StreamExchange Hash([0]) from 2
-          StreamExchange Hash([0]) from 11
+    StreamProject { exprs: [nation.n_name, Extract('YEAR':Varchar, orders.o_orderdate) as $expr1, ((lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) - (partsupp.ps_supplycost * lineitem.l_quantity)) as $expr2, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, partsupp.ps_partkey, partsupp.ps_suppkey, lineitem.l_partkey, orders.o_orderkey] }
+    └── StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, partsupp.ps_supplycost, orders.o_orderdate, nation.n_name, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, partsupp.ps_partkey, partsupp.ps_suppkey, lineitem.l_partkey, orders.o_orderkey] }
+        ├── left table: 1
+        ├── right table: 3
+        ├── left degree table: 2
+        ├── right degree table: 4
+        ├──  StreamExchange Hash([0]) from 2
+        └──  StreamExchange Hash([0]) from 11
 
     Fragment 2
-      StreamHashJoin { type: Inner, predicate: lineitem.l_suppkey = partsupp.ps_suppkey AND lineitem.l_partkey = partsupp.ps_partkey, output: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, partsupp.ps_supplycost, part.p_partkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, lineitem.l_partkey, partsupp.ps_partkey, partsupp.ps_suppkey] }
-          left table: 5, right table 7, left degree table: 6, right degree table: 8,
-        StreamExchange Hash([1, 2]) from 3
-        StreamExchange Hash([0, 1]) from 10
+    StreamHashJoin { type: Inner, predicate: lineitem.l_suppkey = partsupp.ps_suppkey AND lineitem.l_partkey = partsupp.ps_partkey, output: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, partsupp.ps_supplycost, part.p_partkey, lineitem.l_linenumber, supplier.s_suppkey, lineitem.l_suppkey, nation.n_nationkey, supplier.s_nationkey, lineitem.l_partkey, partsupp.ps_partkey, partsupp.ps_suppkey] }
+    ├── left table: 5
+    ├── right table: 7
+    ├── left degree table: 6
+    ├── right degree table: 8
+    ├──  StreamExchange Hash([1, 2]) from 3
+    └──  StreamExchange Hash([0, 1]) from 10
 
     Fragment 3
-      StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, part.p_partkey, lineitem.l_linenumber, supplier.s_suppkey, supplier.s_nationkey, nation.n_nationkey] }
-          left table: 9, right table 11, left degree table: 10, right degree table: 12,
-        StreamExchange Hash([6]) from 4
-        StreamExchange Hash([0]) from 9
+    StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, part.p_partkey, lineitem.l_linenumber, supplier.s_suppkey, supplier.s_nationkey, nation.n_nationkey] } { left table: 9, right table: 11, left degree table: 10, right degree table: 12 }
+    ├──  StreamExchange Hash([6]) from 4
+    └──  StreamExchange Hash([0]) from 9
 
     Fragment 4
-      StreamHashJoin { type: Inner, predicate: lineitem.l_suppkey = supplier.s_suppkey, output: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, supplier.s_nationkey, part.p_partkey, lineitem.l_linenumber, supplier.s_suppkey] }
-          left table: 13, right table 15, left degree table: 14, right degree table: 16,
-        StreamExchange Hash([2]) from 5
-        StreamExchange Hash([0]) from 8
+    StreamHashJoin { type: Inner, predicate: lineitem.l_suppkey = supplier.s_suppkey, output: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, supplier.s_nationkey, part.p_partkey, lineitem.l_linenumber, supplier.s_suppkey] } { left table: 13, right table: 15, left degree table: 14, right degree table: 16 }
+    ├──  StreamExchange Hash([2]) from 5
+    └──  StreamExchange Hash([0]) from 8
 
     Fragment 5
-      StreamHashJoin { type: Inner, predicate: part.p_partkey = lineitem.l_partkey, output: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, part.p_partkey, lineitem.l_linenumber] }
-          left table: 17, right table 19, left degree table: 18, right degree table: 20,
-        StreamExchange Hash([0]) from 6
-        StreamExchange Hash([1]) from 7
+    StreamHashJoin { type: Inner, predicate: part.p_partkey = lineitem.l_partkey, output: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, part.p_partkey, lineitem.l_linenumber] } { left table: 17, right table: 19, left degree table: 18, right degree table: 20 }
+    ├──  StreamExchange Hash([0]) from 6
+    └──  StreamExchange Hash([1]) from 7
 
     Fragment 6
-      StreamProject { exprs: [part.p_partkey] }
-        StreamFilter { predicate: Like(part.p_name, '%yellow%':Varchar) }
-          Chain { table: part, columns: [part.p_partkey, part.p_name], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [part.p_partkey] }
+    └── StreamFilter { predicate: Like(part.p_name, '%yellow%':Varchar) }
+        └── Chain { table: part, columns: [part.p_partkey, part.p_name], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 7
-      Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-        Upstream
-        BatchPlanNode
+    Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 8
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 9
-      Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 10
-      Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 11
-      Chain { table: orders, columns: [orders.o_orderkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [nation_n_name, $expr1, sum($expr2), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 1 { columns: [lineitem_l_orderkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, partsupp_ps_supplycost, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, lineitem_l_partkey, partsupp_ps_partkey, partsupp_ps_suppkey], primary key: [$0 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $13 ASC, $14 ASC, $12 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [lineitem_l_orderkey, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, partsupp_ps_partkey, partsupp_ps_suppkey, lineitem_l_partkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC], value indices: [10], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [orders_o_orderkey, orders_o_orderdate], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [orders_o_orderkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, supplier_s_nationkey, nation_n_nationkey], primary key: [$2 ASC, $1 ASC, $7 ASC, $0 ASC, $8 ASC, $9 ASC, $11 ASC, $10 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], distribution key: [1, 2], read pk prefix len hint: 2 }
-     Table 6 { columns: [lineitem_l_suppkey, lineitem_l_partkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC], value indices: [8], distribution key: [1, 0], read pk prefix len hint: 2 }
-     Table 7 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_supplycost], primary key: [$1 ASC, $0 ASC], value indices: [0, 1, 2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 8 { columns: [partsupp_ps_suppkey, partsupp_ps_partkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [1, 0], read pk prefix len hint: 2 }
-     Table 9 { columns: [lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, supplier_s_nationkey, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey], primary key: [$6 ASC, $7 ASC, $0 ASC, $8 ASC, $9 ASC, $2 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], distribution key: [6], read pk prefix len hint: 1 }
-     Table 10 { columns: [supplier_s_nationkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC], value indices: [6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 11 { columns: [nation_n_nationkey, nation_n_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 12 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 13 { columns: [lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, part_p_partkey, lineitem_l_linenumber], primary key: [$2 ASC, $6 ASC, $0 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [2], read pk prefix len hint: 1 }
-     Table 14 { columns: [lineitem_l_suppkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 15 { columns: [supplier_s_suppkey, supplier_s_nationkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 16 { columns: [supplier_s_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 17 { columns: [part_p_partkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 18 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 19 { columns: [lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber], primary key: [$1 ASC, $0 ASC, $6 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [1], read pk prefix len hint: 1 }
-     Table 20 { columns: [lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [nation, o_year, sum_profit], primary key: [$0 ASC, $1 DESC], value indices: [0, 1, 2], distribution key: [0, 1], read pk prefix len hint: 2 }
+    Chain { table: orders, columns: [orders.o_orderkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0 { columns: [ nation_n_name, $expr1, sum($expr2), count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 1
+    ├── columns: [ lineitem_l_orderkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, partsupp_ps_supplycost, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, lineitem_l_partkey, partsupp_ps_partkey, partsupp_ps_suppkey ]
+    ├── primary key: [ $0 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC, $10 ASC, $11 ASC, $13 ASC, $14 ASC, $12 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 2 { columns: [ lineitem_l_orderkey, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, nation_n_nationkey, supplier_s_nationkey, partsupp_ps_partkey, partsupp_ps_suppkey, lineitem_l_partkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC, $8 ASC, $9 ASC ], value indices: [ 10 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ orders_o_orderkey, orders_o_orderdate ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ orders_o_orderkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5
+    ├── columns: [ lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, nation_n_name, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey, supplier_s_nationkey, nation_n_nationkey ]
+    ├── primary key: [ $2 ASC, $1 ASC, $7 ASC, $0 ASC, $8 ASC, $9 ASC, $11 ASC, $10 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ]
+    ├── distribution key: [ 1, 2 ]
+    └── read pk prefix len hint: 2
+
+    Table 6 { columns: [ lineitem_l_suppkey, lineitem_l_partkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC ], value indices: [ 8 ], distribution key: [ 1, 0 ], read pk prefix len hint: 2 }
+
+    Table 7 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_supplycost ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 8 { columns: [ partsupp_ps_suppkey, partsupp_ps_partkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 1, 0 ], read pk prefix len hint: 2 }
+
+    Table 9 { columns: [ lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, supplier_s_nationkey, part_p_partkey, lineitem_l_linenumber, supplier_s_suppkey ], primary key: [ $6 ASC, $7 ASC, $0 ASC, $8 ASC, $9 ASC, $2 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ], distribution key: [ 6 ], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ supplier_s_nationkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, supplier_s_suppkey, lineitem_l_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC ], value indices: [ 6 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 11 { columns: [ nation_n_nationkey, nation_n_name ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 12 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 13 { columns: [ lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, part_p_partkey, lineitem_l_linenumber ], primary key: [ $2 ASC, $6 ASC, $0 ASC, $7 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ lineitem_l_suppkey, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 15 { columns: [ supplier_s_suppkey, supplier_s_nationkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 16 { columns: [ supplier_s_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 17 { columns: [ part_p_partkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 18 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 19 { columns: [ lineitem_l_orderkey, lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber ], primary key: [ $1 ASC, $0 ASC, $6 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 20 { columns: [ lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ nation, o_year, sum_profit ], primary key: [ $0 ASC, $1 DESC ], value indices: [ 0, 1, 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
 - id: tpch_q10
   before:
   - create_tables
@@ -1837,110 +2045,128 @@
                       └─BatchFilter { predicate: (lineitem.l_returnflag = 'R':Varchar) }
                         └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_returnflag], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [c_custkey, c_name, revenue, c_acctbal, n_name, c_address, c_phone, c_comment], pk_columns: [c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], order_descs: [revenue, c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], pk_conflict: "no check" }
+    StreamMaterialize { columns: [c_custkey, c_name, revenue, c_acctbal, n_name, c_address, c_phone, c_comment], stream_key: [c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], pk_columns: [revenue, c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment] }
       └─StreamTopN { order: "[sum($expr1) DESC]", limit: 20, offset: 0 }
         └─StreamExchange { dist: Single }
           └─StreamGroupTopN { order: "[sum($expr1) DESC]", limit: 20, offset: 0, group_key: [8] }
             └─StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment, Vnode(customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment) as $expr2] }
-              └─StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment] }
-                └─StreamHashAgg { group_key: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment], aggs: [sum($expr1), count] }
-                  └─StreamExchange { dist: HashShard(customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment) }
-                    └─StreamProject { exprs: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment, (lineitem.l_extendedprice * (1.00:Decimal - lineitem.l_discount)) as $expr1, orders.o_orderkey, nation.n_nationkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
-                      └─StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_orderkey, nation.n_nationkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
-                        ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
-                        | └─StreamHashJoin { type: Inner, predicate: customer.c_nationkey = nation.n_nationkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, orders.o_orderkey, nation.n_name, customer.c_nationkey, nation.n_nationkey] }
-                        |   ├─StreamExchange { dist: HashShard(customer.c_nationkey) }
-                        |   | └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_nationkey, customer.c_phone, customer.c_acctbal, customer.c_comment, orders.o_orderkey] }
-                        |   |   ├─StreamExchange { dist: HashShard(customer.c_custkey) }
-                        |   |   | └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_nationkey, customer.c_phone, customer.c_acctbal, customer.c_comment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-                        |   |   └─StreamExchange { dist: HashShard(orders.o_custkey) }
-                        |   |     └─StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
-                        |   |       └─StreamFilter { predicate: (orders.o_orderdate >= '1994-01-01':Date) AND (orders.o_orderdate < '1994-04-01 00:00:00':Timestamp) }
-                        |   |         └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-                        |   └─StreamExchange { dist: HashShard(nation.n_nationkey) }
-                        |     └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-                        └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
-                          └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
-                            └─StreamFilter { predicate: (lineitem.l_returnflag = 'R':Varchar) }
-                              └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_returnflag], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+              └─StreamHashAgg { group_key: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment], aggs: [sum($expr1), count] }
+                └─StreamExchange { dist: HashShard(customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment) }
+                  └─StreamProject { exprs: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment, (lineitem.l_extendedprice * (1.00:Decimal - lineitem.l_discount)) as $expr1, orders.o_orderkey, nation.n_nationkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+                    └─StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_orderkey, nation.n_nationkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+                      ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                      | └─StreamHashJoin { type: Inner, predicate: customer.c_nationkey = nation.n_nationkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, orders.o_orderkey, nation.n_name, customer.c_nationkey, nation.n_nationkey] }
+                      |   ├─StreamExchange { dist: HashShard(customer.c_nationkey) }
+                      |   | └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_nationkey, customer.c_phone, customer.c_acctbal, customer.c_comment, orders.o_orderkey] }
+                      |   |   ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+                      |   |   | └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_nationkey, customer.c_phone, customer.c_acctbal, customer.c_comment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+                      |   |   └─StreamExchange { dist: HashShard(orders.o_custkey) }
+                      |   |     └─StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
+                      |   |       └─StreamFilter { predicate: (orders.o_orderdate >= '1994-01-01':Date) AND (orders.o_orderdate < '1994-04-01 00:00:00':Timestamp) }
+                      |   |         └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+                      |   └─StreamExchange { dist: HashShard(nation.n_nationkey) }
+                      |     └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+                      └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                        └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
+                          └─StreamFilter { predicate: (lineitem.l_returnflag = 'R':Varchar) }
+                            └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_returnflag], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [c_custkey, c_name, revenue, c_acctbal, n_name, c_address, c_phone, c_comment], pk_columns: [c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], order_descs: [revenue, c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment] }
-          StreamTopN { order: "[sum($expr1) DESC]", limit: 20, offset: 0 }
-              state table: 0
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [c_custkey, c_name, revenue, c_acctbal, n_name, c_address, c_phone, c_comment], stream_key: [c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], pk_columns: [revenue, c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment] }
+        └── StreamTopN { order: "[sum($expr1) DESC]", limit: 20, offset: 0 } { state table: 0 }
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamGroupTopN { order: "[sum($expr1) DESC]", limit: 20, offset: 0, group_key: [8] }
-          state table: 1
-        StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment, Vnode(customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment) as $expr2] }
-          StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment] }
-            StreamHashAgg { group_key: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment], aggs: [sum($expr1), count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamExchange Hash([0, 1, 2, 3, 4, 5, 6]) from 2
+    StreamGroupTopN { order: "[sum($expr1) DESC]", limit: 20, offset: 0, group_key: [8] } { state table: 1 }
+    └── StreamProject { exprs: [customer.c_custkey, customer.c_name, sum($expr1), customer.c_acctbal, nation.n_name, customer.c_address, customer.c_phone, customer.c_comment, Vnode(customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment) as $expr2] }
+        └── StreamHashAgg { group_key: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment], aggs: [sum($expr1), count] } { result table: 2, state tables: [], distinct tables: [] }
+            └──  StreamExchange Hash([0, 1, 2, 3, 4, 5, 6]) from 2
 
     Fragment 2
-      StreamProject { exprs: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment, (lineitem.l_extendedprice * (1.00:Decimal - lineitem.l_discount)) as $expr1, orders.o_orderkey, nation.n_nationkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
-        StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_orderkey, nation.n_nationkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
-            left table: 3, right table 5, left degree table: 4, right degree table: 6,
-          StreamExchange Hash([6]) from 3
-          StreamExchange Hash([0]) from 8
+    StreamProject { exprs: [customer.c_custkey, customer.c_name, customer.c_acctbal, customer.c_phone, nation.n_name, customer.c_address, customer.c_comment, (lineitem.l_extendedprice * (1.00:Decimal - lineitem.l_discount)) as $expr1, orders.o_orderkey, nation.n_nationkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+    └── StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, lineitem.l_extendedprice, lineitem.l_discount, nation.n_name, orders.o_orderkey, nation.n_nationkey, customer.c_nationkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+        ├── left table: 3
+        ├── right table: 5
+        ├── left degree table: 4
+        ├── right degree table: 6
+        ├──  StreamExchange Hash([6]) from 3
+        └──  StreamExchange Hash([0]) from 8
 
     Fragment 3
-      StreamHashJoin { type: Inner, predicate: customer.c_nationkey = nation.n_nationkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, orders.o_orderkey, nation.n_name, customer.c_nationkey, nation.n_nationkey] }
-          left table: 7, right table 9, left degree table: 8, right degree table: 10,
-        StreamExchange Hash([3]) from 4
-        StreamExchange Hash([0]) from 7
+    StreamHashJoin { type: Inner, predicate: customer.c_nationkey = nation.n_nationkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_phone, customer.c_acctbal, customer.c_comment, orders.o_orderkey, nation.n_name, customer.c_nationkey, nation.n_nationkey] } { left table: 7, right table: 9, left degree table: 8, right degree table: 10 }
+    ├──  StreamExchange Hash([3]) from 4
+    └──  StreamExchange Hash([0]) from 7
 
     Fragment 4
-      StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_nationkey, customer.c_phone, customer.c_acctbal, customer.c_comment, orders.o_orderkey] }
-          left table: 11, right table 13, left degree table: 12, right degree table: 14,
-        StreamExchange Hash([0]) from 5
-        StreamExchange Hash([1]) from 6
+    StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_nationkey, customer.c_phone, customer.c_acctbal, customer.c_comment, orders.o_orderkey] } { left table: 11, right table: 13, left degree table: 12, right degree table: 14 }
+    ├──  StreamExchange Hash([0]) from 5
+    └──  StreamExchange Hash([1]) from 6
 
     Fragment 5
-      Chain { table: customer, columns: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_nationkey, customer.c_phone, customer.c_acctbal, customer.c_comment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: customer, columns: [customer.c_custkey, customer.c_name, customer.c_address, customer.c_nationkey, customer.c_phone, customer.c_acctbal, customer.c_comment], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 6
-      StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
-        StreamFilter { predicate: (orders.o_orderdate >= '1994-01-01':Date) AND (orders.o_orderdate < '1994-04-01 00:00:00':Timestamp) }
-          Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
+    └── StreamFilter { predicate: (orders.o_orderdate >= '1994-01-01':Date) AND (orders.o_orderdate < '1994-04-01 00:00:00':Timestamp) }
+        └── Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 7
-      Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 8
-      StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
-        StreamFilter { predicate: (lineitem.l_returnflag = 'R':Varchar) }
-          Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_returnflag], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [customer_c_custkey, customer_c_name, sum($expr1), customer_c_acctbal, nation_n_name, customer_c_address, customer_c_phone, customer_c_comment, $expr2], primary key: [$2 DESC, $0 ASC, $1 ASC, $3 ASC, $6 ASC, $4 ASC, $5 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [customer_c_custkey, customer_c_name, sum($expr1), customer_c_acctbal, nation_n_name, customer_c_address, customer_c_phone, customer_c_comment, $expr2], primary key: [$8 ASC, $2 DESC, $0 ASC, $1 ASC, $3 ASC, $6 ASC, $4 ASC, $5 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8], distribution key: [0, 1, 3, 6, 4, 5, 7], read pk prefix len hint: 1, vnode column idx: 8 }
-     Table 2 { columns: [customer_c_custkey, customer_c_name, customer_c_acctbal, customer_c_phone, nation_n_name, customer_c_address, customer_c_comment, sum($expr1), count], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC], value indices: [7, 8], distribution key: [0, 1, 2, 3, 4, 5, 6], read pk prefix len hint: 7 }
-     Table 3 { columns: [customer_c_custkey, customer_c_name, customer_c_address, customer_c_phone, customer_c_acctbal, customer_c_comment, orders_o_orderkey, nation_n_name, customer_c_nationkey, nation_n_nationkey], primary key: [$6 ASC, $0 ASC, $9 ASC, $8 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], distribution key: [6], read pk prefix len hint: 1 }
-     Table 4 { columns: [orders_o_orderkey, customer_c_custkey, nation_n_nationkey, customer_c_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber], primary key: [$0 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [customer_c_custkey, customer_c_name, customer_c_address, customer_c_nationkey, customer_c_phone, customer_c_acctbal, customer_c_comment, orders_o_orderkey], primary key: [$3 ASC, $0 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [3], read pk prefix len hint: 1 }
-     Table 8 { columns: [customer_c_nationkey, customer_c_custkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [nation_n_nationkey, nation_n_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 10 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 11 { columns: [customer_c_custkey, customer_c_name, customer_c_address, customer_c_nationkey, customer_c_phone, customer_c_acctbal, customer_c_comment], primary key: [$0 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 12 { columns: [customer_c_custkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 13 { columns: [orders_o_orderkey, orders_o_custkey], primary key: [$1 ASC, $0 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 14 { columns: [orders_o_custkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [c_custkey, c_name, revenue, c_acctbal, n_name, c_address, c_phone, c_comment], primary key: [$2 DESC, $0 ASC, $1 ASC, $3 ASC, $6 ASC, $4 ASC, $5 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [], read pk prefix len hint: 7 }
+    StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: (lineitem.l_returnflag = 'R':Varchar) }
+        └── Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_linenumber, lineitem.l_returnflag], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ customer_c_custkey, customer_c_name, sum($expr1), customer_c_acctbal, nation_n_name, customer_c_address, customer_c_phone, customer_c_comment, $expr2 ], primary key: [ $2 DESC, $0 ASC, $1 ASC, $3 ASC, $6 ASC, $4 ASC, $5 ASC, $7 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 1
+    ├── columns: [ customer_c_custkey, customer_c_name, sum($expr1), customer_c_acctbal, nation_n_name, customer_c_address, customer_c_phone, customer_c_comment, $expr2 ]
+    ├── primary key: [ $8 ASC, $2 DESC, $0 ASC, $1 ASC, $3 ASC, $6 ASC, $4 ASC, $5 ASC, $7 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8 ]
+    ├── distribution key: [ 0, 1, 3, 6, 4, 5, 7 ]
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 8
+
+    Table 2 { columns: [ customer_c_custkey, customer_c_name, customer_c_acctbal, customer_c_phone, nation_n_name, customer_c_address, customer_c_comment, sum($expr1), count ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC ], value indices: [ 7, 8 ], distribution key: [ 0, 1, 2, 3, 4, 5, 6 ], read pk prefix len hint: 7 }
+
+    Table 3 { columns: [ customer_c_custkey, customer_c_name, customer_c_address, customer_c_phone, customer_c_acctbal, customer_c_comment, orders_o_orderkey, nation_n_name, customer_c_nationkey, nation_n_nationkey ], primary key: [ $6 ASC, $0 ASC, $9 ASC, $8 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ], distribution key: [ 6 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ orders_o_orderkey, customer_c_custkey, nation_n_nationkey, customer_c_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ lineitem_l_orderkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_linenumber ], primary key: [ $0 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ customer_c_custkey, customer_c_name, customer_c_address, customer_c_nationkey, customer_c_phone, customer_c_acctbal, customer_c_comment, orders_o_orderkey ], primary key: [ $3 ASC, $0 ASC, $7 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ], distribution key: [ 3 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ customer_c_nationkey, customer_c_custkey, orders_o_orderkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ nation_n_nationkey, nation_n_name ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 11 { columns: [ customer_c_custkey, customer_c_name, customer_c_address, customer_c_nationkey, customer_c_phone, customer_c_acctbal, customer_c_comment ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 12 { columns: [ customer_c_custkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 13 { columns: [ orders_o_orderkey, orders_o_custkey ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ orders_o_custkey, orders_o_orderkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ c_custkey, c_name, revenue, c_acctbal, n_name, c_address, c_phone, c_comment ], primary key: [ $2 DESC, $0 ASC, $1 ASC, $3 ASC, $6 ASC, $4 ASC, $5 ASC, $7 ASC ], value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ], distribution key: [], read pk prefix len hint: 7 }
+
 - id: tpch_q11
   before:
   - create_tables
@@ -2034,7 +2260,7 @@
                       └─BatchExchange { order: [], dist: UpstreamHashShard(partsupp.ps_suppkey) }
                         └─BatchScan { table: partsupp, columns: [partsupp.ps_suppkey, partsupp.ps_availqty, partsupp.ps_supplycost], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [ps_partkey, value], pk_columns: [ps_partkey], order_descs: [value, ps_partkey], pk_conflict: "no check" }
+    StreamMaterialize { columns: [ps_partkey, value], stream_key: [ps_partkey], pk_columns: [value, ps_partkey], pk_conflict: "NoCheck" }
     └─StreamDynamicFilter { predicate: (sum($expr1) > $expr3), output: [partsupp.ps_partkey, sum($expr1)] }
       ├─StreamProject { exprs: [partsupp.ps_partkey, sum($expr1)] }
       | └─StreamHashAgg { group_key: [partsupp.ps_partkey], aggs: [sum($expr1), count] }
@@ -2070,75 +2296,101 @@
                         └─StreamProject { exprs: [nation.n_nationkey] }
                           └─StreamFilter { predicate: (nation.n_name = 'ARGENTINA':Varchar) }
                             └─StreamTableScan { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [ps_partkey, value], pk_columns: [ps_partkey], order_descs: [value, ps_partkey], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamDynamicFilter { predicate: (sum($expr1) > $expr3), output: [partsupp.ps_partkey, sum($expr1)] }
-            left table: 0, right table 1
-          StreamProject { exprs: [partsupp.ps_partkey, sum($expr1)] }
-            StreamHashAgg { group_key: [partsupp.ps_partkey], aggs: [sum($expr1), count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamExchange Hash([0]) from 1
-          StreamExchange Broadcast from 7
+    StreamMaterialize { columns: [ps_partkey, value], stream_key: [ps_partkey], pk_columns: [value, ps_partkey], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamDynamicFilter { predicate: (sum($expr1) > $expr3), output: [partsupp.ps_partkey, sum($expr1)] }
+        ├── left table: 0
+        ├── right table: 1
+        ├── StreamProject { exprs: [partsupp.ps_partkey, sum($expr1)] }
+        │   └── StreamHashAgg { group_key: [partsupp.ps_partkey], aggs: [sum($expr1), count] }
+        │       ├── result table: 2
+        │       ├── state tables: []
+        │       ├── distinct tables: []
+        │       └──  StreamExchange Hash([0]) from 1
+        └──  StreamExchange Broadcast from 7
 
     Fragment 1
-      StreamProject { exprs: [partsupp.ps_partkey, (partsupp.ps_supplycost * partsupp.ps_availqty) as $expr1, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey] }
-        StreamExchange Hash([5]) from 2
+    StreamProject { exprs: [partsupp.ps_partkey, (partsupp.ps_supplycost * partsupp.ps_availqty) as $expr1, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey] }
+    └──  StreamExchange Hash([5]) from 2
 
     Fragment 2
-      StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [partsupp.ps_partkey, partsupp.ps_availqty, partsupp.ps_supplycost, partsupp.ps_suppkey, supplier.s_suppkey, supplier.s_nationkey, nation.n_nationkey] }
-          left table: 3, right table 5, left degree table: 4, right degree table: 6,
-        StreamExchange Hash([3]) from 3
-        StreamExchange Hash([0]) from 6
+    StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [partsupp.ps_partkey, partsupp.ps_availqty, partsupp.ps_supplycost, partsupp.ps_suppkey, supplier.s_suppkey, supplier.s_nationkey, nation.n_nationkey] }
+    ├── left table: 3
+    ├── right table: 5
+    ├── left degree table: 4
+    ├── right degree table: 6
+    ├──  StreamExchange Hash([3]) from 3
+    └──  StreamExchange Hash([0]) from 6
 
     Fragment 3
-      StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [partsupp.ps_partkey, partsupp.ps_availqty, partsupp.ps_supplycost, supplier.s_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] }
-          left table: 7, right table 9, left degree table: 8, right degree table: 10,
-        StreamExchange Hash([1]) from 4
-        StreamExchange Hash([0]) from 5
+    StreamHashJoin { type: Inner, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [partsupp.ps_partkey, partsupp.ps_availqty, partsupp.ps_supplycost, supplier.s_nationkey, partsupp.ps_suppkey, supplier.s_suppkey] }
+    ├── left table: 7
+    ├── right table: 9
+    ├── left degree table: 8
+    ├── right degree table: 10
+    ├──  StreamExchange Hash([1]) from 4
+    └──  StreamExchange Hash([0]) from 5
 
     Fragment 4
-      Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty, partsupp.ps_supplycost], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 5
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 6
-      StreamProject { exprs: [nation.n_nationkey] }
-        StreamFilter { predicate: (nation.n_name = 'ARGENTINA':Varchar) }
-          Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [nation.n_nationkey] }
+    └── StreamFilter { predicate: (nation.n_name = 'ARGENTINA':Varchar) }
+        └── Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 7
-      StreamProject { exprs: [(sum(sum($expr2)) * 0.0001000000:Decimal) as $expr3] }
-        StreamGlobalSimpleAgg { aggs: [sum(sum($expr2)), count] }
-            result table: 11, state tables: [], distinct tables: []
-          StreamExchange Single from 8
+    StreamProject { exprs: [(sum(sum($expr2)) * 0.0001000000:Decimal) as $expr3] }
+    └── StreamGlobalSimpleAgg { aggs: [sum(sum($expr2)), count] } { result table: 11, state tables: [], distinct tables: [] }
+        └──  StreamExchange Single from 8
 
     Fragment 8
-      StreamStatelessLocalSimpleAgg { aggs: [sum($expr2)] }
-        StreamProject { exprs: [(partsupp.ps_supplycost * partsupp.ps_availqty) as $expr2, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey] }
-          StreamExchange Hash([5]) from 2
-
-     Table 0 { columns: [partsupp_ps_partkey, sum($expr1)], primary key: [$1 ASC, $0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [$expr3], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
-     Table 2 { columns: [partsupp_ps_partkey, sum($expr1), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [partsupp_ps_partkey, partsupp_ps_availqty, partsupp_ps_supplycost, supplier_s_nationkey, partsupp_ps_suppkey, supplier_s_suppkey], primary key: [$3 ASC, $0 ASC, $4 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [3], read pk prefix len hint: 1 }
-     Table 4 { columns: [supplier_s_nationkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [nation_n_nationkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_availqty, partsupp_ps_supplycost], primary key: [$1 ASC, $0 ASC], value indices: [0, 1, 2, 3], distribution key: [1], read pk prefix len hint: 1 }
-     Table 8 { columns: [partsupp_ps_suppkey, partsupp_ps_partkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [supplier_s_suppkey, supplier_s_nationkey], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 10 { columns: [supplier_s_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 11 { columns: [sum(sum($expr2)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 4294967294 { columns: [ps_partkey, value], primary key: [$1 DESC, $0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
+    StreamStatelessLocalSimpleAgg { aggs: [sum($expr2)] }
+    └── StreamProject { exprs: [(partsupp.ps_supplycost * partsupp.ps_availqty) as $expr2, partsupp.ps_partkey, partsupp.ps_suppkey, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey] }
+        └──  StreamExchange Hash([5]) from 2
+
+    Table 0 { columns: [ partsupp_ps_partkey, sum($expr1) ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ $expr3 ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 2 { columns: [ partsupp_ps_partkey, sum($expr1), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3
+    ├── columns: [ partsupp_ps_partkey, partsupp_ps_availqty, partsupp_ps_supplycost, supplier_s_nationkey, partsupp_ps_suppkey, supplier_s_suppkey ]
+    ├── primary key: [ $3 ASC, $0 ASC, $4 ASC, $5 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5 ]
+    ├── distribution key: [ 3 ]
+    └── read pk prefix len hint: 1
+
+    Table 4 { columns: [ supplier_s_nationkey, partsupp_ps_partkey, partsupp_ps_suppkey, supplier_s_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ nation_n_nationkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_availqty, partsupp_ps_supplycost ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ partsupp_ps_suppkey, partsupp_ps_partkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ supplier_s_suppkey, supplier_s_nationkey ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ supplier_s_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 11 { columns: [ sum(sum($expr2)), count ], primary key: [], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 4294967294 { columns: [ ps_partkey, value ], primary key: [ $1 DESC, $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: tpch_q12
   before:
   - create_tables
@@ -2199,7 +2451,7 @@
                   └─BatchFilter { predicate: In(lineitem.l_shipmode, 'FOB':Varchar, 'SHIP':Varchar) AND (lineitem.l_commitdate < lineitem.l_receiptdate) AND (lineitem.l_shipdate < lineitem.l_commitdate) AND (lineitem.l_receiptdate >= '1994-01-01':Date) AND (lineitem.l_receiptdate < '1995-01-01 00:00:00':Timestamp) }
                     └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_shipmode, lineitem.l_shipdate, lineitem.l_commitdate, lineitem.l_receiptdate], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [l_shipmode, high_line_count, low_line_count], pk_columns: [l_shipmode], pk_conflict: "no check" }
+    StreamMaterialize { columns: [l_shipmode, high_line_count, low_line_count], stream_key: [l_shipmode], pk_columns: [l_shipmode], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [lineitem.l_shipmode, sum($expr1), sum($expr2)] }
       └─StreamHashAgg { group_key: [lineitem.l_shipmode], aggs: [sum($expr1), sum($expr2), count] }
         └─StreamExchange { dist: HashShard(lineitem.l_shipmode) }
@@ -2211,40 +2463,47 @@
                 └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_shipmode, lineitem.l_linenumber] }
                   └─StreamFilter { predicate: In(lineitem.l_shipmode, 'FOB':Varchar, 'SHIP':Varchar) AND (lineitem.l_commitdate < lineitem.l_receiptdate) AND (lineitem.l_shipdate < lineitem.l_commitdate) AND (lineitem.l_receiptdate >= '1994-01-01':Date) AND (lineitem.l_receiptdate < '1995-01-01 00:00:00':Timestamp) }
                     └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_shipmode, lineitem.l_linenumber, lineitem.l_shipdate, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [l_shipmode, high_line_count, low_line_count], pk_columns: [l_shipmode], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [lineitem.l_shipmode, sum($expr1), sum($expr2)] }
-          StreamHashAgg { group_key: [lineitem.l_shipmode], aggs: [sum($expr1), sum($expr2), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 1
+    StreamMaterialize { columns: [l_shipmode, high_line_count, low_line_count], stream_key: [l_shipmode], pk_columns: [l_shipmode], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [lineitem.l_shipmode, sum($expr1), sum($expr2)] }
+        └── StreamHashAgg { group_key: [lineitem.l_shipmode], aggs: [sum($expr1), sum($expr2), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 1
 
     Fragment 1
-      StreamProject { exprs: [lineitem.l_shipmode, Case(((orders.o_orderpriority = '1-URGENT':Varchar) OR (orders.o_orderpriority = '2-HIGH':Varchar)), 1:Int32, 0:Int32) as $expr1, Case(((orders.o_orderpriority <> '1-URGENT':Varchar) AND (orders.o_orderpriority <> '2-HIGH':Varchar)), 1:Int32, 0:Int32) as $expr2, orders.o_orderkey, lineitem.l_orderkey, lineitem.l_linenumber] }
-        StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderpriority, lineitem.l_shipmode, orders.o_orderkey, lineitem.l_orderkey, lineitem.l_linenumber] }
-            left table: 1, right table 3, left degree table: 2, right degree table: 4,
-          StreamExchange Hash([0]) from 2
-          StreamExchange Hash([0]) from 3
+    StreamProject { exprs: [lineitem.l_shipmode, Case(((orders.o_orderpriority = '1-URGENT':Varchar) OR (orders.o_orderpriority = '2-HIGH':Varchar)), 1:Int32, 0:Int32) as $expr1, Case(((orders.o_orderpriority <> '1-URGENT':Varchar) AND (orders.o_orderpriority <> '2-HIGH':Varchar)), 1:Int32, 0:Int32) as $expr2, orders.o_orderkey, lineitem.l_orderkey, lineitem.l_linenumber] }
+    └── StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [orders.o_orderpriority, lineitem.l_shipmode, orders.o_orderkey, lineitem.l_orderkey, lineitem.l_linenumber] } { left table: 1, right table: 3, left degree table: 2, right degree table: 4 }
+        ├──  StreamExchange Hash([0]) from 2
+        └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      Chain { table: orders, columns: [orders.o_orderkey, orders.o_orderpriority], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: orders, columns: [orders.o_orderkey, orders.o_orderpriority], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_shipmode, lineitem.l_linenumber] }
-        StreamFilter { predicate: In(lineitem.l_shipmode, 'FOB':Varchar, 'SHIP':Varchar) AND (lineitem.l_commitdate < lineitem.l_receiptdate) AND (lineitem.l_shipdate < lineitem.l_commitdate) AND (lineitem.l_receiptdate >= '1994-01-01':Date) AND (lineitem.l_receiptdate < '1995-01-01 00:00:00':Timestamp) }
-          Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_shipmode, lineitem.l_linenumber, lineitem.l_shipdate, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [lineitem_l_shipmode, sum($expr1), sum($expr2), count], primary key: [$0 ASC], value indices: [1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [orders_o_orderkey, orders_o_orderpriority], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [orders_o_orderkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [lineitem_l_orderkey, lineitem_l_shipmode, lineitem_l_linenumber], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [l_shipmode, high_line_count, low_line_count], primary key: [$0 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
+    StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_shipmode, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: In(lineitem.l_shipmode, 'FOB':Varchar, 'SHIP':Varchar) AND (lineitem.l_commitdate < lineitem.l_receiptdate) AND (lineitem.l_shipdate < lineitem.l_commitdate) AND (lineitem.l_receiptdate >= '1994-01-01':Date) AND (lineitem.l_receiptdate < '1995-01-01 00:00:00':Timestamp) }
+        └── Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_shipmode, lineitem.l_linenumber, lineitem.l_shipdate, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ lineitem_l_shipmode, sum($expr1), sum($expr2), count ], primary key: [ $0 ASC ], value indices: [ 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ orders_o_orderkey, orders_o_orderpriority ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ orders_o_orderkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ lineitem_l_orderkey, lineitem_l_shipmode, lineitem_l_linenumber ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ l_shipmode, high_line_count, low_line_count ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: tpch_q13
   before:
   - create_tables
@@ -2299,7 +2558,7 @@
                   └─BatchFilter { predicate: Not(Like(orders.o_comment, '%:1%:2%':Varchar)) }
                     └─BatchScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_comment], distribution: UpstreamHashShard(orders.o_orderkey) }
   stream_plan: |
-    StreamMaterialize { columns: [c_count, custdist], pk_columns: [c_count], order_descs: [custdist, c_count], pk_conflict: "no check" }
+    StreamMaterialize { columns: [c_count, custdist], stream_key: [c_count], pk_columns: [custdist, c_count], pk_conflict: "NoCheck" }
     └─StreamHashAgg { group_key: [count(orders.o_orderkey)], aggs: [count] }
       └─StreamExchange { dist: HashShard(count(orders.o_orderkey)) }
         └─StreamProject { exprs: [customer.c_custkey, count(orders.o_orderkey)] }
@@ -2311,42 +2570,71 @@
                 └─StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
                   └─StreamFilter { predicate: Not(Like(orders.o_comment, '%:1%:2%':Varchar)) }
                     └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_comment], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [c_count, custdist], pk_columns: [c_count], order_descs: [custdist, c_count], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashAgg { group_key: [count(orders.o_orderkey)], aggs: [count] }
-            result table: 0, state tables: [], distinct tables: []
-          StreamExchange Hash([1]) from 1
+    StreamMaterialize { columns: [c_count, custdist], stream_key: [c_count], pk_columns: [custdist, c_count], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashAgg { group_key: [count(orders.o_orderkey)], aggs: [count] }
+        ├── result table: 0
+        ├── state tables: []
+        ├── distinct tables: []
+        └──  StreamExchange Hash([1]) from 1
 
     Fragment 1
-      StreamProject { exprs: [customer.c_custkey, count(orders.o_orderkey)] }
-        StreamHashAgg { group_key: [customer.c_custkey], aggs: [count(orders.o_orderkey), count] }
-            result table: 1, state tables: [], distinct tables: []
-          StreamHashJoin { type: LeftOuter, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, orders.o_orderkey] }
-              left table: 2, right table 4, left degree table: 3, right degree table: 5,
-            StreamExchange Hash([0]) from 2
-            StreamExchange Hash([1]) from 3
+    StreamProject { exprs: [customer.c_custkey, count(orders.o_orderkey)] }
+    └── StreamHashAgg { group_key: [customer.c_custkey], aggs: [count(orders.o_orderkey), count] }
+        ├── result table: 1
+        ├── state tables: []
+        ├── distinct tables: []
+        └── StreamHashJoin { type: LeftOuter, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, orders.o_orderkey] }
+            ├── left table: 2
+            ├── right table: 4
+            ├── left degree table: 3
+            ├── right degree table: 5
+            ├──  StreamExchange Hash([0]) from 2
+            └──  StreamExchange Hash([1]) from 3
 
     Fragment 2
-      Chain { table: customer, columns: [customer.c_custkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: customer, columns: [customer.c_custkey], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
-        StreamFilter { predicate: Not(Like(orders.o_comment, '%:1%:2%':Varchar)) }
-          Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_comment], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [count(orders_o_orderkey), count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [customer_c_custkey, count(orders_o_orderkey), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [customer_c_custkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [customer_c_custkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [orders_o_orderkey, orders_o_custkey], primary key: [$1 ASC, $0 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
-     Table 5 { columns: [orders_o_custkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [c_count, custdist], primary key: [$1 DESC, $0 DESC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
+    StreamProject { exprs: [orders.o_orderkey, orders.o_custkey] }
+    └── StreamFilter { predicate: Not(Like(orders.o_comment, '%:1%:2%':Varchar)) }
+        └── Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_comment], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ count(orders_o_orderkey), count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1
+    ├── columns: [ customer_c_custkey, count(orders_o_orderkey), count ]
+    ├── primary key: [ $0 ASC ]
+    ├── value indices: [ 1, 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 2 { columns: [ customer_c_custkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ customer_c_custkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4
+    ├── columns: [ orders_o_orderkey, orders_o_custkey ]
+    ├── primary key: [ $1 ASC, $0 ASC ]
+    ├── value indices: [ 0, 1 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
+    Table 5
+    ├── columns: [ orders_o_custkey, orders_o_orderkey, _degree ]
+    ├── primary key: [ $0 ASC, $1 ASC ]
+    ├── value indices: [ 2 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 4294967294 { columns: [ c_count, custdist ], primary key: [ $1 DESC, $0 DESC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
 - id: tpch_q14
   before:
   - create_tables
@@ -2391,7 +2679,7 @@
                   └─BatchFilter { predicate: (lineitem.l_shipdate >= '1995-09-01':Date) AND (lineitem.l_shipdate < '1995-10-01 00:00:00':Timestamp) }
                     └─BatchScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [promo_revenue], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [promo_revenue], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [((100.00:Decimal * sum(sum($expr1))) / sum(sum($expr2))) as $expr3] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), sum(sum($expr2)), count] }
         └─StreamExchange { dist: Single }
@@ -2404,41 +2692,52 @@
                 |     └─StreamTableScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
                 └─StreamExchange { dist: HashShard(part.p_partkey) }
                   └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_type], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [promo_revenue], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [((100.00:Decimal * sum(sum($expr1))) / sum(sum($expr2))) as $expr3] }
-          StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), sum(sum($expr2)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [promo_revenue], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [((100.00:Decimal * sum(sum($expr1))) / sum(sum($expr2))) as $expr3] }
+        └── StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), sum(sum($expr2)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [sum($expr1), sum($expr2)] }
-        StreamProject { exprs: [Case(Like(part.p_type, 'PROMO%':Varchar), (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)), 0:Decimal) as $expr1, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr2, lineitem.l_orderkey, lineitem.l_linenumber, part.p_partkey, lineitem.l_partkey] }
-          StreamHashJoin { type: Inner, predicate: lineitem.l_partkey = part.p_partkey, output: [lineitem.l_extendedprice, lineitem.l_discount, part.p_type, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_partkey, part.p_partkey] }
-              left table: 1, right table 3, left degree table: 2, right degree table: 4,
-            StreamExchange Hash([0]) from 2
-            StreamExchange Hash([0]) from 3
+    StreamStatelessLocalSimpleAgg { aggs: [sum($expr1), sum($expr2)] }
+    └── StreamProject { exprs: [Case(Like(part.p_type, 'PROMO%':Varchar), (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)), 0:Decimal) as $expr1, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr2, lineitem.l_orderkey, lineitem.l_linenumber, part.p_partkey, lineitem.l_partkey] }
+        └── StreamHashJoin { type: Inner, predicate: lineitem.l_partkey = part.p_partkey, output: [lineitem.l_extendedprice, lineitem.l_discount, part.p_type, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_partkey, part.p_partkey] }
+            ├── left table: 1
+            ├── right table: 3
+            ├── left degree table: 2
+            ├── right degree table: 4
+            ├──  StreamExchange Hash([0]) from 2
+            └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      StreamProject { exprs: [lineitem.l_partkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
-        StreamFilter { predicate: (lineitem.l_shipdate >= '1995-09-01':Date) AND (lineitem.l_shipdate < '1995-10-01 00:00:00':Timestamp) }
-          Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [lineitem.l_partkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: (lineitem.l_shipdate >= '1995-09-01':Date) AND (lineitem.l_shipdate < '1995-10-01 00:00:00':Timestamp) }
+        └── Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 3
-      Chain { table: part, columns: [part.p_partkey, part.p_type], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [sum(sum($expr1)), sum(sum($expr2)), count], primary key: [], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [lineitem_l_partkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_orderkey, lineitem_l_linenumber], primary key: [$0 ASC, $3 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [part_p_partkey, part_p_type], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [promo_revenue], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    Chain { table: part, columns: [part.p_partkey, part.p_type], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0 { columns: [ sum(sum($expr1)), sum(sum($expr2)), count ], primary key: [], value indices: [ 0, 1, 2 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 1 { columns: [ lineitem_l_partkey, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_orderkey, lineitem_l_linenumber ], primary key: [ $0 ASC, $3 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ part_p_partkey, part_p_type ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ promo_revenue ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
 - id: tpch_q15
   before:
   - create_tables
@@ -2507,7 +2806,7 @@
         └─LogicalProject { exprs: [lineitem.l_suppkey, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr2] }
           └─LogicalScan { table: lineitem, output_columns: [lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount], required_columns: [lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipdate], predicate: (lineitem.l_shipdate >= '1993-01-01':Date) AND (lineitem.l_shipdate < ('1993-01-01':Date + '3 mons':Interval)) }
   stream_plan: |
-    StreamMaterialize { columns: [s_suppkey, s_name, s_address, s_phone, total_revenue, lineitem.l_suppkey(hidden)], pk_columns: [s_suppkey, lineitem.l_suppkey, total_revenue], pk_conflict: "no check" }
+    StreamMaterialize { columns: [s_suppkey, s_name, s_address, s_phone, total_revenue, lineitem.l_suppkey(hidden)], stream_key: [s_suppkey, lineitem.l_suppkey, total_revenue], pk_columns: [s_suppkey, lineitem.l_suppkey, total_revenue], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: Inner, predicate: sum($expr1) = max(max(sum($expr1))), output: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, sum($expr1), lineitem.l_suppkey] }
       ├─StreamExchange { dist: HashShard(sum($expr1)) }
       | └─StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, sum($expr1), lineitem.l_suppkey] }
@@ -2533,65 +2832,82 @@
                           └─StreamProject { exprs: [lineitem.l_suppkey, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber] }
                             └─StreamFilter { predicate: (lineitem.l_shipdate >= '1993-01-01':Date) AND (lineitem.l_shipdate < '1993-04-01 00:00:00':Timestamp) }
                               └─StreamTableScan { table: lineitem, columns: [lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [s_suppkey, s_name, s_address, s_phone, total_revenue, lineitem.l_suppkey(hidden)], pk_columns: [s_suppkey, lineitem.l_suppkey, total_revenue], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: Inner, predicate: sum($expr1) = max(max(sum($expr1))), output: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, sum($expr1), lineitem.l_suppkey] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([4]) from 1
-          StreamExchange Hash([0]) from 5
+    StreamMaterialize { columns: [s_suppkey, s_name, s_address, s_phone, total_revenue, lineitem.l_suppkey(hidden)], stream_key: [s_suppkey, lineitem.l_suppkey, total_revenue], pk_columns: [s_suppkey, lineitem.l_suppkey, total_revenue], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: Inner, predicate: sum($expr1) = max(max(sum($expr1))), output: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, sum($expr1), lineitem.l_suppkey] }
+        ├── left table: 0
+        ├── right table: 2
+        ├── left degree table: 1
+        ├── right degree table: 3
+        ├──  StreamExchange Hash([4]) from 1
+        └──  StreamExchange Hash([0]) from 5
 
     Fragment 1
-      StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, sum($expr1), lineitem.l_suppkey] }
-          left table: 4, right table 6, left degree table: 5, right degree table: 7,
-        StreamExchange Hash([0]) from 2
-        StreamExchange Hash([0]) from 3
+    StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, sum($expr1), lineitem.l_suppkey] }
+    ├── left table: 4
+    ├── right table: 6
+    ├── left degree table: 5
+    ├── right degree table: 7
+    ├──  StreamExchange Hash([0]) from 2
+    └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      StreamProject { exprs: [lineitem.l_suppkey, sum($expr1)] }
-        StreamHashAgg { group_key: [lineitem.l_suppkey], aggs: [sum($expr1), count] }
-            result table: 8, state tables: [], distinct tables: []
-          StreamExchange Hash([0]) from 4
+    StreamProject { exprs: [lineitem.l_suppkey, sum($expr1)] }
+    └── StreamHashAgg { group_key: [lineitem.l_suppkey], aggs: [sum($expr1), count] } { result table: 8, state tables: [], distinct tables: [] }
+        └──  StreamExchange Hash([0]) from 4
 
     Fragment 4
-      StreamProject { exprs: [lineitem.l_suppkey, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber] }
-        StreamFilter { predicate: (lineitem.l_shipdate >= '1993-01-01':Date) AND (lineitem.l_shipdate < '1993-04-01 00:00:00':Timestamp) }
-          Chain { table: lineitem, columns: [lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [lineitem.l_suppkey, (lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: (lineitem.l_shipdate >= '1993-01-01':Date) AND (lineitem.l_shipdate < '1993-04-01 00:00:00':Timestamp) }
+        └── Chain { table: lineitem, columns: [lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 5
-      StreamProject { exprs: [max(max(sum($expr1)))] }
-        StreamGlobalSimpleAgg { aggs: [max(max(sum($expr1))), count] }
-            result table: 10, state tables: [9], distinct tables: []
-          StreamExchange Single from 6
+    StreamProject { exprs: [max(max(sum($expr1)))] }
+    └── StreamGlobalSimpleAgg { aggs: [max(max(sum($expr1))), count] } { result table: 10, state tables: [ 9 ], distinct tables: [] }
+        └──  StreamExchange Single from 6
 
     Fragment 6
-      StreamHashAgg { group_key: [$expr2], aggs: [max(sum($expr1)), count] }
-          result table: 12, state tables: [11], distinct tables: []
-        StreamProject { exprs: [lineitem.l_suppkey, sum($expr1), Vnode(lineitem.l_suppkey) as $expr2] }
-          StreamExchange Hash([0]) from 3
-
-     Table 0 { columns: [supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_phone, sum($expr1), lineitem_l_suppkey], primary key: [$4 ASC, $0 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [4], read pk prefix len hint: 1 }
-     Table 1 { columns: [sum($expr1), supplier_s_suppkey, lineitem_l_suppkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [max(max(sum($expr1)))], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [max(max(sum($expr1))), _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_phone], primary key: [$0 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [supplier_s_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [lineitem_l_suppkey, sum($expr1)], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [lineitem_l_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [lineitem_l_suppkey, sum($expr1), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [max(sum($expr1)), $expr2], primary key: [$0 DESC, $1 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 10 { columns: [max(max(sum($expr1))), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 11 { columns: [$expr2, sum($expr1), lineitem_l_suppkey], primary key: [$0 ASC, $1 DESC, $2 ASC], value indices: [1, 2], distribution key: [2], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 12 { columns: [$expr2, max(sum($expr1)), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [], read pk prefix len hint: 1, vnode column idx: 0 }
-     Table 4294967294 { columns: [s_suppkey, s_name, s_address, s_phone, total_revenue, lineitem.l_suppkey], primary key: [$0 ASC, $5 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [4], read pk prefix len hint: 3 }
+    StreamHashAgg { group_key: [$expr2], aggs: [max(sum($expr1)), count] } { result table: 12, state tables: [ 11 ], distinct tables: [] }
+    └── StreamProject { exprs: [lineitem.l_suppkey, sum($expr1), Vnode(lineitem.l_suppkey) as $expr2] }
+        └──  StreamExchange Hash([0]) from 3
+
+    Table 0 { columns: [ supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_phone, sum($expr1), lineitem_l_suppkey ], primary key: [ $4 ASC, $0 ASC, $5 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [ 4 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ sum($expr1), supplier_s_suppkey, lineitem_l_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ max(max(sum($expr1))) ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ max(max(sum($expr1))), _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_phone ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ supplier_s_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ lineitem_l_suppkey, sum($expr1) ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ lineitem_l_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ lineitem_l_suppkey, sum($expr1), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ max(sum($expr1)), $expr2 ], primary key: [ $0 DESC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 10 { columns: [ max(max(sum($expr1))), count ], primary key: [], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 11 { columns: [ $expr2, sum($expr1), lineitem_l_suppkey ], primary key: [ $0 ASC, $1 DESC, $2 ASC ], value indices: [ 1, 2 ], distribution key: [ 2 ], read pk prefix len hint: 1, vnode column idx: 0 }
+
+    Table 12 { columns: [ $expr2, max(sum($expr1)), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [], read pk prefix len hint: 1, vnode column idx: 0 }
+
+    Table 4294967294 { columns: [ s_suppkey, s_name, s_address, s_phone, total_revenue, lineitem.l_suppkey ], primary key: [ $0 ASC, $5 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [ 4 ], read pk prefix len hint: 3 }
+
 - id: tpch_q16
   before:
   - create_tables
@@ -2658,7 +2974,7 @@
                   └─BatchExchange { order: [], dist: UpstreamHashShard(partsupp.ps_partkey) }
                     └─BatchScan { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey], distribution: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
   stream_plan: |
-    StreamMaterialize { columns: [p_brand, p_type, p_size, supplier_cnt], pk_columns: [p_brand, p_type, p_size], order_descs: [supplier_cnt, p_brand, p_type, p_size], pk_conflict: "no check" }
+    StreamMaterialize { columns: [p_brand, p_type, p_size, supplier_cnt], stream_key: [p_brand, p_type, p_size], pk_columns: [supplier_cnt, p_brand, p_type, p_size], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [part.p_brand, part.p_type, part.p_size, count(distinct partsupp.ps_suppkey)] }
       └─StreamHashAgg { group_key: [part.p_brand, part.p_type, part.p_size], aggs: [count(distinct partsupp.ps_suppkey), count] }
         └─StreamExchange { dist: HashShard(part.p_brand, part.p_type, part.p_size) }
@@ -2674,56 +2990,90 @@
               └─StreamProject { exprs: [supplier.s_suppkey] }
                 └─StreamFilter { predicate: Like(supplier.s_comment, '%Customer%Complaints%':Varchar) }
                   └─StreamTableScan { table: supplier, columns: [supplier.s_suppkey, supplier.s_comment], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [p_brand, p_type, p_size, supplier_cnt], pk_columns: [p_brand, p_type, p_size], order_descs: [supplier_cnt, p_brand, p_type, p_size], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [part.p_brand, part.p_type, part.p_size, count(distinct partsupp.ps_suppkey)] }
-          StreamHashAgg { group_key: [part.p_brand, part.p_type, part.p_size], aggs: [count(distinct partsupp.ps_suppkey), count] }
-              result table: 0, state tables: [], distinct tables: [(distinct key: partsupp.ps_suppkey, table id: 1)]
-            StreamExchange Hash([0, 1, 2]) from 1
+    StreamMaterialize { columns: [p_brand, p_type, p_size, supplier_cnt], stream_key: [p_brand, p_type, p_size], pk_columns: [supplier_cnt, p_brand, p_type, p_size], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [part.p_brand, part.p_type, part.p_size, count(distinct partsupp.ps_suppkey)] }
+        └── StreamHashAgg { group_key: [part.p_brand, part.p_type, part.p_size], aggs: [count(distinct partsupp.ps_suppkey), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: (distinct key: partsupp.ps_suppkey, table id: 1)
+            └──  StreamExchange Hash([0, 1, 2]) from 1
 
     Fragment 1
-      StreamHashJoin { type: LeftAnti, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [part.p_brand, part.p_type, part.p_size, partsupp.ps_suppkey, partsupp.ps_partkey, part.p_partkey] }
-          left table: 2, right table 4, left degree table: 3, right degree table: 5,
-        StreamExchange Hash([0]) from 2
-        StreamExchange Hash([0]) from 5
+    StreamHashJoin { type: LeftAnti, predicate: partsupp.ps_suppkey = supplier.s_suppkey, output: [part.p_brand, part.p_type, part.p_size, partsupp.ps_suppkey, partsupp.ps_partkey, part.p_partkey] }
+    ├── left table: 2
+    ├── right table: 4
+    ├── left degree table: 3
+    ├── right degree table: 5
+    ├──  StreamExchange Hash([0]) from 2
+    └──  StreamExchange Hash([0]) from 5
 
     Fragment 2
-      StreamHashJoin { type: Inner, predicate: partsupp.ps_partkey = part.p_partkey, output: [partsupp.ps_suppkey, part.p_brand, part.p_type, part.p_size, partsupp.ps_partkey, part.p_partkey] }
-          left table: 6, right table 8, left degree table: 7, right degree table: 9,
-        StreamExchange Hash([0]) from 3
-        StreamExchange Hash([0]) from 4
+    StreamHashJoin { type: Inner, predicate: partsupp.ps_partkey = part.p_partkey, output: [partsupp.ps_suppkey, part.p_brand, part.p_type, part.p_size, partsupp.ps_partkey, part.p_partkey] }
+    ├── left table: 6
+    ├── right table: 8
+    ├── left degree table: 7
+    ├── right degree table: 9
+    ├──  StreamExchange Hash([0]) from 3
+    └──  StreamExchange Hash([0]) from 4
 
     Fragment 3
-      Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 4
-      StreamFilter { predicate: (part.p_brand <> 'Brand#45':Varchar) AND Not(Like(part.p_type, 'SMALL PLATED%':Varchar)) AND In(part.p_size, 19:Int32, 17:Int32, 16:Int32, 23:Int32, 10:Int32, 4:Int32, 38:Int32, 11:Int32) }
-        Chain { table: part, columns: [part.p_partkey, part.p_brand, part.p_type, part.p_size], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-          Upstream
-          BatchPlanNode
+    StreamFilter { predicate: (part.p_brand <> 'Brand#45':Varchar) AND Not(Like(part.p_type, 'SMALL PLATED%':Varchar)) AND In(part.p_size, 19:Int32, 17:Int32, 16:Int32, 23:Int32, 10:Int32, 4:Int32, 38:Int32, 11:Int32) }
+    └── Chain { table: part, columns: [part.p_partkey, part.p_brand, part.p_type, part.p_size], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+        ├──  Upstream
+        └──  BatchPlanNode
 
     Fragment 5
-      StreamProject { exprs: [supplier.s_suppkey] }
-        StreamFilter { predicate: Like(supplier.s_comment, '%Customer%Complaints%':Varchar) }
-          Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_comment], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [part_p_brand, part_p_type, part_p_size, count(distinct partsupp_ps_suppkey), count], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3, 4], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 1 { columns: [part_p_brand, part_p_type, part_p_size, partsupp_ps_suppkey, count_for_agg_call_0], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0, 1, 2], read pk prefix len hint: 4 }
-     Table 2 { columns: [partsupp_ps_suppkey, part_p_brand, part_p_type, part_p_size, partsupp_ps_partkey, part_p_partkey], primary key: [$0 ASC, $4 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [partsupp_ps_suppkey, partsupp_ps_partkey, part_p_partkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [supplier_s_suppkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [supplier_s_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [part_p_partkey, part_p_brand, part_p_type, part_p_size], primary key: [$0 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [p_brand, p_type, p_size, supplier_cnt], primary key: [$3 DESC, $0 ASC, $1 ASC, $2 ASC], value indices: [0, 1, 2, 3], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
+    StreamProject { exprs: [supplier.s_suppkey] }
+    └── StreamFilter { predicate: Like(supplier.s_comment, '%Customer%Complaints%':Varchar) }
+        └── Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_comment], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ part_p_brand, part_p_type, part_p_size, count(distinct partsupp_ps_suppkey), count ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 3, 4 ]
+    ├── distribution key: [ 0, 1, 2 ]
+    └── read pk prefix len hint: 3
+
+    Table 1
+    ├── columns: [ part_p_brand, part_p_type, part_p_size, partsupp_ps_suppkey, count_for_agg_call_0 ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ]
+    ├── value indices: [ 4 ]
+    ├── distribution key: [ 0, 1, 2 ]
+    └── read pk prefix len hint: 4
+
+    Table 2
+    ├── columns: [ partsupp_ps_suppkey, part_p_brand, part_p_type, part_p_size, partsupp_ps_partkey, part_p_partkey ]
+    ├── primary key: [ $0 ASC, $4 ASC, $5 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 3 { columns: [ partsupp_ps_suppkey, partsupp_ps_partkey, part_p_partkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ supplier_s_suppkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ supplier_s_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ part_p_partkey, part_p_brand, part_p_type, part_p_size ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ p_brand, p_type, p_size, supplier_cnt ], primary key: [ $3 DESC, $0 ASC, $1 ASC, $2 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0, 1, 2 ], read pk prefix len hint: 3 }
+
 - id: tpch_q17
   before:
   - create_tables
@@ -2794,7 +3144,7 @@
                     └─BatchFilter { predicate: IsNotNull(lineitem.l_partkey) }
                       └─BatchScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [avg_yearly], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [avg_yearly], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [RoundDigit((sum(sum(lineitem.l_extendedprice)) / 7.0:Decimal), 16:Int32) as $expr2] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum(lineitem.l_extendedprice)), count] }
         └─StreamExchange { dist: Single }
@@ -2822,80 +3172,106 @@
                         └─StreamExchange { dist: HashShard(lineitem.l_partkey) }
                           └─StreamFilter { predicate: IsNotNull(lineitem.l_partkey) }
                             └─StreamTableScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [avg_yearly], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [RoundDigit((sum(sum(lineitem.l_extendedprice)) / 7.0:Decimal), 16:Int32) as $expr2] }
-          StreamGlobalSimpleAgg { aggs: [sum(sum(lineitem.l_extendedprice)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [avg_yearly], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [RoundDigit((sum(sum(lineitem.l_extendedprice)) / 7.0:Decimal), 16:Int32) as $expr2] }
+        └── StreamGlobalSimpleAgg { aggs: [sum(sum(lineitem.l_extendedprice)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [sum(lineitem.l_extendedprice)] }
-        StreamProject { exprs: [lineitem.l_extendedprice, lineitem.l_orderkey, lineitem.l_linenumber, part.p_partkey, lineitem.l_partkey, part.p_partkey] }
-          StreamFilter { predicate: (lineitem.l_quantity < $expr1) }
-            StreamHashJoin { type: Inner, predicate: part.p_partkey IS NOT DISTINCT FROM part.p_partkey, output: all }
-                left table: 1, right table 3, left degree table: 2, right degree table: 4,
-              StreamExchange Hash([2]) from 2
-              StreamProject { exprs: [part.p_partkey, (0.2:Decimal * (sum(lineitem.l_quantity) / count(lineitem.l_quantity))) as $expr1] }
-                StreamHashAgg { group_key: [part.p_partkey], aggs: [sum(lineitem.l_quantity), count(lineitem.l_quantity), count] }
-                    result table: 9, state tables: [], distinct tables: []
-                  StreamHashJoin { type: LeftOuter, predicate: part.p_partkey IS NOT DISTINCT FROM lineitem.l_partkey, output: [part.p_partkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
-                      left table: 10, right table 12, left degree table: 11, right degree table: 13,
-                    StreamExchange Hash([0]) from 5
-                    StreamExchange Hash([0]) from 6
+    StreamStatelessLocalSimpleAgg { aggs: [sum(lineitem.l_extendedprice)] }
+    └── StreamProject { exprs: [lineitem.l_extendedprice, lineitem.l_orderkey, lineitem.l_linenumber, part.p_partkey, lineitem.l_partkey, part.p_partkey] }
+        └── StreamFilter { predicate: (lineitem.l_quantity < $expr1) }
+            └── StreamHashJoin { type: Inner, predicate: part.p_partkey IS NOT DISTINCT FROM part.p_partkey, output: all } { left table: 1, right table: 3, left degree table: 2, right degree table: 4 }
+                ├──  StreamExchange Hash([2]) from 2
+                └── StreamProject { exprs: [part.p_partkey, (0.2:Decimal * (sum(lineitem.l_quantity) / count(lineitem.l_quantity))) as $expr1] }
+                    └── StreamHashAgg { group_key: [part.p_partkey], aggs: [sum(lineitem.l_quantity), count(lineitem.l_quantity), count] } { result table: 9, state tables: [], distinct tables: [] }
+                        └── StreamHashJoin { type: LeftOuter, predicate: part.p_partkey IS NOT DISTINCT FROM lineitem.l_partkey, output: [part.p_partkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                            ├── left table: 10
+                            ├── right table: 12
+                            ├── left degree table: 11
+                            ├── right degree table: 13
+                            ├──  StreamExchange Hash([0]) from 5
+                            └──  StreamExchange Hash([0]) from 6
 
     Fragment 2
-      StreamHashJoin { type: Inner, predicate: lineitem.l_partkey = part.p_partkey, output: [lineitem.l_quantity, lineitem.l_extendedprice, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_partkey] }
-          left table: 5, right table 7, left degree table: 6, right degree table: 8,
-        StreamExchange Hash([0]) from 3
-        StreamExchange Hash([0]) from 4
+    StreamHashJoin { type: Inner, predicate: lineitem.l_partkey = part.p_partkey, output: [lineitem.l_quantity, lineitem.l_extendedprice, part.p_partkey, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_partkey] }
+    ├── left table: 5
+    ├── right table: 7
+    ├── left degree table: 6
+    ├── right degree table: 8
+    ├──  StreamExchange Hash([0]) from 3
+    └──  StreamExchange Hash([0]) from 4
 
     Fragment 3
-      Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_orderkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-        Upstream
-        BatchPlanNode
+    Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_orderkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 4
-      StreamProject { exprs: [part.p_partkey] }
-        StreamFilter { predicate: (part.p_brand = 'Brand#13':Varchar) AND (part.p_container = 'JUMBO PKG':Varchar) }
-          Chain { table: part, columns: [part.p_partkey, part.p_brand, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [part.p_partkey] }
+    └── StreamFilter { predicate: (part.p_brand = 'Brand#13':Varchar) AND (part.p_container = 'JUMBO PKG':Varchar) }
+        └── Chain { table: part, columns: [part.p_partkey, part.p_brand, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 5
-      StreamProject { exprs: [part.p_partkey] }
-        StreamHashAgg { group_key: [part.p_partkey], aggs: [count] }
-            result table: 14, state tables: [], distinct tables: []
-          StreamProject { exprs: [part.p_partkey] }
-            StreamFilter { predicate: (part.p_brand = 'Brand#13':Varchar) AND (part.p_container = 'JUMBO PKG':Varchar) }
-              Chain { table: part, columns: [part.p_partkey, part.p_brand, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-                Upstream
-                BatchPlanNode
+    StreamProject { exprs: [part.p_partkey] }
+    └── StreamHashAgg { group_key: [part.p_partkey], aggs: [count] } { result table: 14, state tables: [], distinct tables: [] }
+        └── StreamProject { exprs: [part.p_partkey] }
+            └── StreamFilter { predicate: (part.p_brand = 'Brand#13':Varchar) AND (part.p_container = 'JUMBO PKG':Varchar) }
+                └── Chain { table: part, columns: [part.p_partkey, part.p_brand, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+                    ├──  Upstream
+                    └──  BatchPlanNode
 
     Fragment 6
-      StreamFilter { predicate: IsNotNull(lineitem.l_partkey) }
-        Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [sum(sum(lineitem_l_extendedprice)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [lineitem_l_quantity, lineitem_l_extendedprice, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, lineitem_l_partkey], primary key: [$2 ASC, $3 ASC, $4 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [2], read pk prefix len hint: 1 }
-     Table 2 { columns: [part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, lineitem_l_partkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [part_p_partkey, $expr1], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [lineitem_l_partkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_orderkey, lineitem_l_linenumber], primary key: [$0 ASC, $3 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [part_p_partkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [part_p_partkey, sum(lineitem_l_quantity), count(lineitem_l_quantity), count], primary key: [$0 ASC], value indices: [1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 10 { columns: [part_p_partkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 11 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 12 { columns: [lineitem_l_partkey, lineitem_l_quantity, lineitem_l_orderkey, lineitem_l_linenumber], primary key: [$0 ASC, $2 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 13 { columns: [lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 14 { columns: [part_p_partkey, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [avg_yearly], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamFilter { predicate: IsNotNull(lineitem.l_partkey) }
+    └── Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0 { columns: [ sum(sum(lineitem_l_extendedprice)), count ], primary key: [], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 1
+    ├── columns: [ lineitem_l_quantity, lineitem_l_extendedprice, part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, lineitem_l_partkey ]
+    ├── primary key: [ $2 ASC, $3 ASC, $4 ASC, $5 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5 ]
+    ├── distribution key: [ 2 ]
+    └── read pk prefix len hint: 1
+
+    Table 2 { columns: [ part_p_partkey, lineitem_l_orderkey, lineitem_l_linenumber, lineitem_l_partkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ part_p_partkey, $expr1 ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ lineitem_l_partkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_orderkey, lineitem_l_linenumber ], primary key: [ $0 ASC, $3 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ part_p_partkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ part_p_partkey, sum(lineitem_l_quantity), count(lineitem_l_quantity), count ], primary key: [ $0 ASC ], value indices: [ 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ part_p_partkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 11 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 12 { columns: [ lineitem_l_partkey, lineitem_l_quantity, lineitem_l_orderkey, lineitem_l_linenumber ], primary key: [ $0 ASC, $2 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 13 { columns: [ lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ part_p_partkey, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ avg_yearly ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
 - id: tpch_q18
   before:
   - create_tables
@@ -2985,102 +3361,143 @@
                   └─BatchExchange { order: [], dist: HashShard(lineitem.l_orderkey) }
                     └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, quantity], pk_columns: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice], order_descs: [o_totalprice, o_orderdate, c_name, c_custkey, o_orderkey], pk_conflict: "no check" }
+    StreamMaterialize { columns: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, quantity], stream_key: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice], pk_columns: [o_totalprice, o_orderdate, c_name, c_custkey, o_orderkey], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity)] }
       └─StreamTopN { order: "[orders.o_totalprice DESC, orders.o_orderdate ASC]", limit: 100, offset: 0 }
         └─StreamExchange { dist: Single }
           └─StreamGroupTopN { order: "[orders.o_totalprice DESC, orders.o_orderdate ASC]", limit: 100, offset: 0, group_key: [6] }
             └─StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity), Vnode(orders.o_orderkey) as $expr1] }
-              └─StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity)] }
-                └─StreamHashAgg { group_key: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice], aggs: [sum(lineitem.l_quantity), count] }
-                  └─StreamHashJoin { type: LeftSemi, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
-                    ├─StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
-                    | ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
-                    | | └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate] }
-                    | |   ├─StreamExchange { dist: HashShard(customer.c_custkey) }
-                    | |   | └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_name], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-                    | |   └─StreamExchange { dist: HashShard(orders.o_custkey) }
-                    | |     └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_totalprice, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-                    | └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
-                    |   └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-                    └─StreamProject { exprs: [lineitem.l_orderkey] }
-                      └─StreamFilter { predicate: (sum(lineitem.l_quantity) > 1:Int32) }
-                        └─StreamProject { exprs: [lineitem.l_orderkey, sum(lineitem.l_quantity)] }
-                          └─StreamHashAgg { group_key: [lineitem.l_orderkey], aggs: [sum(lineitem.l_quantity), count] }
-                            └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
-                              └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+              └─StreamHashAgg { group_key: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice], aggs: [sum(lineitem.l_quantity), count] }
+                └─StreamHashJoin { type: LeftSemi, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                  ├─StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                  | ├─StreamExchange { dist: HashShard(orders.o_orderkey) }
+                  | | └─StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate] }
+                  | |   ├─StreamExchange { dist: HashShard(customer.c_custkey) }
+                  | |   | └─StreamTableScan { table: customer, columns: [customer.c_custkey, customer.c_name], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+                  | |   └─StreamExchange { dist: HashShard(orders.o_custkey) }
+                  | |     └─StreamTableScan { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_totalprice, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+                  | └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                  |   └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+                  └─StreamProject { exprs: [lineitem.l_orderkey] }
+                    └─StreamFilter { predicate: (sum(lineitem.l_quantity) > 1:Int32) }
+                      └─StreamProject { exprs: [lineitem.l_orderkey, sum(lineitem.l_quantity)] }
+                        └─StreamHashAgg { group_key: [lineitem.l_orderkey], aggs: [sum(lineitem.l_quantity), count] }
+                          └─StreamExchange { dist: HashShard(lineitem.l_orderkey) }
+                            └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, quantity], pk_columns: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice], order_descs: [o_totalprice, o_orderdate, c_name, c_custkey, o_orderkey], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity)] }
-          StreamTopN { order: "[orders.o_totalprice DESC, orders.o_orderdate ASC]", limit: 100, offset: 0 }
-              state table: 0
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, quantity], stream_key: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice], pk_columns: [o_totalprice, o_orderdate, c_name, c_custkey, o_orderkey], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity)] }
+        └── StreamTopN { order: "[orders.o_totalprice DESC, orders.o_orderdate ASC]", limit: 100, offset: 0 } { state table: 0 }
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamGroupTopN { order: "[orders.o_totalprice DESC, orders.o_orderdate ASC]", limit: 100, offset: 0, group_key: [6] }
-          state table: 1
-        StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity), Vnode(orders.o_orderkey) as $expr1] }
-          StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity)] }
-            StreamHashAgg { group_key: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice], aggs: [sum(lineitem.l_quantity), count] }
-                result table: 2, state tables: [], distinct tables: []
-              StreamHashJoin { type: LeftSemi, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
-                  left table: 3, right table 5, left degree table: 4, right degree table: 6,
-                StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
-                    left table: 7, right table 9, left degree table: 8, right degree table: 10,
-                  StreamExchange Hash([2]) from 2
-                  StreamExchange Hash([0]) from 5
-                StreamProject { exprs: [lineitem.l_orderkey] }
-                  StreamFilter { predicate: (sum(lineitem.l_quantity) > 1:Int32) }
-                    StreamProject { exprs: [lineitem.l_orderkey, sum(lineitem.l_quantity)] }
-                      StreamHashAgg { group_key: [lineitem.l_orderkey], aggs: [sum(lineitem.l_quantity), count] }
-                          result table: 15, state tables: [], distinct tables: []
-                        StreamExchange Hash([0]) from 6
+    StreamGroupTopN { order: "[orders.o_totalprice DESC, orders.o_orderdate ASC]", limit: 100, offset: 0, group_key: [6] } { state table: 1 }
+    └── StreamProject { exprs: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, sum(lineitem.l_quantity), Vnode(orders.o_orderkey) as $expr1] }
+        └── StreamHashAgg { group_key: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice], aggs: [sum(lineitem.l_quantity), count] } { result table: 2, state tables: [], distinct tables: [] }
+            └── StreamHashJoin { type: LeftSemi, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_name, customer.c_custkey, orders.o_orderkey, orders.o_orderdate, orders.o_totalprice, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                ├── left table: 3
+                ├── right table: 5
+                ├── left degree table: 4
+                ├── right degree table: 6
+                ├── StreamHashJoin { type: Inner, predicate: orders.o_orderkey = lineitem.l_orderkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                │   ├── left table: 7
+                │   ├── right table: 9
+                │   ├── left degree table: 8
+                │   ├── right degree table: 10
+                │   ├──  StreamExchange Hash([2]) from 2
+                │   └──  StreamExchange Hash([0]) from 5
+                └── StreamProject { exprs: [lineitem.l_orderkey] }
+                    └── StreamFilter { predicate: (sum(lineitem.l_quantity) > 1:Int32) }
+                        └── StreamProject { exprs: [lineitem.l_orderkey, sum(lineitem.l_quantity)] }
+                            └── StreamHashAgg { group_key: [lineitem.l_orderkey], aggs: [sum(lineitem.l_quantity), count] } { result table: 15, state tables: [], distinct tables: [] }
+                                └──  StreamExchange Hash([0]) from 6
 
     Fragment 2
-      StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate] }
-          left table: 11, right table 13, left degree table: 12, right degree table: 14,
-        StreamExchange Hash([0]) from 3
-        StreamExchange Hash([1]) from 4
+    StreamHashJoin { type: Inner, predicate: customer.c_custkey = orders.o_custkey, output: [customer.c_custkey, customer.c_name, orders.o_orderkey, orders.o_totalprice, orders.o_orderdate] }
+    ├── left table: 11
+    ├── right table: 13
+    ├── left degree table: 12
+    ├── right degree table: 14
+    ├──  StreamExchange Hash([0]) from 3
+    └──  StreamExchange Hash([1]) from 4
 
     Fragment 3
-      Chain { table: customer, columns: [customer.c_custkey, customer.c_name], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: customer, columns: [customer.c_custkey, customer.c_name], pk: [customer.c_custkey], dist: UpstreamHashShard(customer.c_custkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 4
-      Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_totalprice, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: orders, columns: [orders.o_orderkey, orders.o_custkey, orders.o_totalprice, orders.o_orderdate], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 5
-      Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-        Upstream
-        BatchPlanNode
+    Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 6
-      Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-        Upstream
-        BatchPlanNode
-
-     Table 0 { columns: [customer_c_name, customer_c_custkey, orders_o_orderkey, orders_o_orderdate, orders_o_totalprice, sum(lineitem_l_quantity), $expr1], primary key: [$4 DESC, $3 ASC, $0 ASC, $1 ASC, $2 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [customer_c_name, customer_c_custkey, orders_o_orderkey, orders_o_orderdate, orders_o_totalprice, sum(lineitem_l_quantity), $expr1], primary key: [$6 ASC, $4 DESC, $3 ASC, $0 ASC, $1 ASC, $2 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [2], read pk prefix len hint: 1, vnode column idx: 6 }
-     Table 2 { columns: [customer_c_name, customer_c_custkey, orders_o_orderkey, orders_o_orderdate, orders_o_totalprice, sum(lineitem_l_quantity), count], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC], value indices: [5, 6], distribution key: [2], read pk prefix len hint: 5 }
-     Table 3 { columns: [customer_c_custkey, customer_c_name, orders_o_orderkey, orders_o_totalprice, orders_o_orderdate, lineitem_l_quantity, lineitem_l_orderkey, lineitem_l_linenumber], primary key: [$2 ASC, $0 ASC, $6 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [2], read pk prefix len hint: 1 }
-     Table 4 { columns: [orders_o_orderkey, customer_c_custkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [lineitem_l_orderkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [lineitem_l_orderkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [customer_c_custkey, customer_c_name, orders_o_orderkey, orders_o_totalprice, orders_o_orderdate], primary key: [$2 ASC, $0 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2], read pk prefix len hint: 1 }
-     Table 8 { columns: [orders_o_orderkey, customer_c_custkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [lineitem_l_orderkey, lineitem_l_quantity, lineitem_l_linenumber], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 10 { columns: [lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 11 { columns: [customer_c_custkey, customer_c_name], primary key: [$0 ASC], value indices: [0, 1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 12 { columns: [customer_c_custkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 13 { columns: [orders_o_orderkey, orders_o_custkey, orders_o_totalprice, orders_o_orderdate], primary key: [$1 ASC, $0 ASC], value indices: [0, 1, 2, 3], distribution key: [1], read pk prefix len hint: 1 }
-     Table 14 { columns: [orders_o_custkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 15 { columns: [lineitem_l_orderkey, sum(lineitem_l_quantity), count], primary key: [$0 ASC], value indices: [1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, quantity], primary key: [$4 DESC, $3 ASC, $0 ASC, $1 ASC, $2 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [], read pk prefix len hint: 5 }
+    Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_quantity, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+    ├──  Upstream
+    └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ customer_c_name, customer_c_custkey, orders_o_orderkey, orders_o_orderdate, orders_o_totalprice, sum(lineitem_l_quantity), $expr1 ]
+    ├── primary key: [ $4 DESC, $3 ASC, $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6 ]
+    ├── distribution key: []
+    └── read pk prefix len hint: 0
+
+    Table 1
+    ├── columns: [ customer_c_name, customer_c_custkey, orders_o_orderkey, orders_o_orderdate, orders_o_totalprice, sum(lineitem_l_quantity), $expr1 ]
+    ├── primary key: [ $6 ASC, $4 DESC, $3 ASC, $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6 ]
+    ├── distribution key: [ 2 ]
+    ├── read pk prefix len hint: 1
+    └── vnode column idx: 6
+
+    Table 2
+    ├── columns: [ customer_c_name, customer_c_custkey, orders_o_orderkey, orders_o_orderdate, orders_o_totalprice, sum(lineitem_l_quantity), count ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC ]
+    ├── value indices: [ 5, 6 ]
+    ├── distribution key: [ 2 ]
+    └── read pk prefix len hint: 5
+
+    Table 3
+    ├── columns: [ customer_c_custkey, customer_c_name, orders_o_orderkey, orders_o_totalprice, orders_o_orderdate, lineitem_l_quantity, lineitem_l_orderkey, lineitem_l_linenumber ]
+    ├── primary key: [ $2 ASC, $0 ASC, $6 ASC, $7 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ]
+    ├── distribution key: [ 2 ]
+    └── read pk prefix len hint: 1
+
+    Table 4 { columns: [ orders_o_orderkey, customer_c_custkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ lineitem_l_orderkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ lineitem_l_orderkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ customer_c_custkey, customer_c_name, orders_o_orderkey, orders_o_totalprice, orders_o_orderdate ], primary key: [ $2 ASC, $0 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ orders_o_orderkey, customer_c_custkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 9 { columns: [ lineitem_l_orderkey, lineitem_l_quantity, lineitem_l_linenumber ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 11 { columns: [ customer_c_custkey, customer_c_name ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 12 { columns: [ customer_c_custkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 13 { columns: [ orders_o_orderkey, orders_o_custkey, orders_o_totalprice, orders_o_orderdate ], primary key: [ $1 ASC, $0 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ orders_o_custkey, orders_o_orderkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 15 { columns: [ lineitem_l_orderkey, sum(lineitem_l_quantity), count ], primary key: [ $0 ASC ], value indices: [ 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, quantity ], primary key: [ $4 DESC, $3 ASC, $0 ASC, $1 ASC, $2 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [], read pk prefix len hint: 5 }
+
 - id: tpch_q19
   before:
   - create_tables
@@ -3145,7 +3562,7 @@
                 └─BatchFilter { predicate: In(lineitem.l_shipmode, 'AIR':Varchar, 'AIR REG':Varchar) AND (lineitem.l_shipinstruct = 'DELIVER IN PERSON':Varchar) }
                   └─BatchScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_shipinstruct, lineitem.l_shipmode], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [revenue], pk_columns: [], pk_conflict: "no check" }
+    StreamMaterialize { columns: [revenue], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [sum(sum($expr1))] }
       └─StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), count] }
         └─StreamExchange { dist: Single }
@@ -3160,43 +3577,50 @@
                   └─StreamExchange { dist: HashShard(part.p_partkey) }
                     └─StreamFilter { predicate: (part.p_size >= 1:Int32) }
                       └─StreamTableScan { table: part, columns: [part.p_partkey, part.p_brand, part.p_size, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [revenue], pk_columns: [], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [sum(sum($expr1))] }
-          StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [revenue], stream_key: [], pk_columns: [], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [sum(sum($expr1))] }
+        └── StreamGlobalSimpleAgg { aggs: [sum(sum($expr1)), count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamStatelessLocalSimpleAgg { aggs: [sum($expr1)] }
-        StreamProject { exprs: [(lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber, part.p_partkey, lineitem.l_partkey] }
-          StreamFilter { predicate: (((((((part.p_brand = 'Brand#52':Varchar) AND In(part.p_container, 'SM CASE':Varchar, 'SM BOX':Varchar, 'SM PACK':Varchar, 'SM PKG':Varchar)) AND (lineitem.l_quantity >= 1:Int32)) AND (lineitem.l_quantity <= 11:Int32)) AND (part.p_size <= 5:Int32)) OR (((((part.p_brand = 'Brand#24':Varchar) AND In(part.p_container, 'MED BAG':Varchar, 'MED BOX':Varchar, 'MED PKG':Varchar, 'MED PACK':Varchar)) AND (lineitem.l_quantity >= 30:Int32)) AND (lineitem.l_quantity <= 40:Int32)) AND (part.p_size <= 10:Int32))) OR (((((part.p_brand = 'Brand#32':Varchar) AND In(part.p_container, 'LG CASE':Varchar, 'LG BOX':Varchar, 'LG PACK':Varchar, 'LG PKG':Varchar)) AND (lineitem.l_quantity >= 10:Int32)) AND (lineitem.l_quantity <= 20:Int32)) AND (part.p_size <= 15:Int32))) }
-            StreamHashJoin { type: Inner, predicate: lineitem.l_partkey = part.p_partkey, output: all }
-                left table: 1, right table 3, left degree table: 2, right degree table: 4,
-              StreamExchange Hash([0]) from 2
-              StreamExchange Hash([0]) from 3
+    StreamStatelessLocalSimpleAgg { aggs: [sum($expr1)] }
+    └── StreamProject { exprs: [(lineitem.l_extendedprice * (1:Int32 - lineitem.l_discount)) as $expr1, lineitem.l_orderkey, lineitem.l_linenumber, part.p_partkey, lineitem.l_partkey] }
+        └── StreamFilter { predicate: (((((((part.p_brand = 'Brand#52':Varchar) AND In(part.p_container, 'SM CASE':Varchar, 'SM BOX':Varchar, 'SM PACK':Varchar, 'SM PKG':Varchar)) AND (lineitem.l_quantity >= 1:Int32)) AND (lineitem.l_quantity <= 11:Int32)) AND (part.p_size <= 5:Int32)) OR (((((part.p_brand = 'Brand#24':Varchar) AND In(part.p_container, 'MED BAG':Varchar, 'MED BOX':Varchar, 'MED PKG':Varchar, 'MED PACK':Varchar)) AND (lineitem.l_quantity >= 30:Int32)) AND (lineitem.l_quantity <= 40:Int32)) AND (part.p_size <= 10:Int32))) OR (((((part.p_brand = 'Brand#32':Varchar) AND In(part.p_container, 'LG CASE':Varchar, 'LG BOX':Varchar, 'LG PACK':Varchar, 'LG PKG':Varchar)) AND (lineitem.l_quantity >= 10:Int32)) AND (lineitem.l_quantity <= 20:Int32)) AND (part.p_size <= 15:Int32))) }
+            └── StreamHashJoin { type: Inner, predicate: lineitem.l_partkey = part.p_partkey, output: all } { left table: 1, right table: 3, left degree table: 2, right degree table: 4 }
+                ├──  StreamExchange Hash([0]) from 2
+                └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      StreamProject { exprs: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
-        StreamFilter { predicate: In(lineitem.l_shipmode, 'AIR':Varchar, 'AIR REG':Varchar) AND (lineitem.l_shipinstruct = 'DELIVER IN PERSON':Varchar) }
-          Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipinstruct, lineitem.l_shipmode], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: In(lineitem.l_shipmode, 'AIR':Varchar, 'AIR REG':Varchar) AND (lineitem.l_shipinstruct = 'DELIVER IN PERSON':Varchar) }
+        └── Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_quantity, lineitem.l_extendedprice, lineitem.l_discount, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipinstruct, lineitem.l_shipmode], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 3
-      StreamFilter { predicate: (part.p_size >= 1:Int32) }
-        Chain { table: part, columns: [part.p_partkey, part.p_brand, part.p_size, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-          Upstream
-          BatchPlanNode
-
-     Table 0 { columns: [sum(sum($expr1)), count], primary key: [], value indices: [0, 1], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [lineitem_l_partkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_orderkey, lineitem_l_linenumber], primary key: [$0 ASC, $4 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [part_p_partkey, part_p_brand, part_p_size, part_p_container], primary key: [$0 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [revenue], primary key: [], value indices: [0], distribution key: [], read pk prefix len hint: 0 }
+    StreamFilter { predicate: (part.p_size >= 1:Int32) }
+    └── Chain { table: part, columns: [part.p_partkey, part.p_brand, part.p_size, part.p_container], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0 { columns: [ sum(sum($expr1)), count ], primary key: [], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 1 { columns: [ lineitem_l_partkey, lineitem_l_quantity, lineitem_l_extendedprice, lineitem_l_discount, lineitem_l_orderkey, lineitem_l_linenumber ], primary key: [ $0 ASC, $4 ASC, $5 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ lineitem_l_partkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ part_p_partkey, part_p_brand, part_p_size, part_p_container ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ revenue ], primary key: [], value indices: [ 0 ], distribution key: [], read pk prefix len hint: 0 }
+
 - id: tpch_q20
   before:
   - create_tables
@@ -3300,7 +3724,7 @@
                       └─BatchFilter { predicate: IsNotNull(lineitem.l_partkey) AND IsNotNull(lineitem.l_suppkey) AND (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) }
                         └─BatchScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_shipdate], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [s_name, s_address, supplier.s_suppkey(hidden), nation.n_nationkey(hidden), supplier.s_nationkey(hidden)], pk_columns: [supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], order_descs: [s_name, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], pk_conflict: "no check" }
+    StreamMaterialize { columns: [s_name, s_address, supplier.s_suppkey(hidden), nation.n_nationkey(hidden), supplier.s_nationkey(hidden)], stream_key: [supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], pk_columns: [s_name, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], pk_conflict: "NoCheck" }
     └─StreamHashJoin { type: LeftSemi, predicate: supplier.s_suppkey = partsupp.ps_suppkey, output: [supplier.s_name, supplier.s_address, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey] }
       ├─StreamExchange { dist: HashShard(supplier.s_suppkey) }
       | └─StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: all }
@@ -3334,104 +3758,124 @@
                       └─StreamProject { exprs: [lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
                         └─StreamFilter { predicate: IsNotNull(lineitem.l_partkey) AND IsNotNull(lineitem.l_suppkey) AND (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) }
                           └─StreamTableScan { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [s_name, s_address, supplier.s_suppkey(hidden), nation.n_nationkey(hidden), supplier.s_nationkey(hidden)], pk_columns: [supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], order_descs: [s_name, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamHashJoin { type: LeftSemi, predicate: supplier.s_suppkey = partsupp.ps_suppkey, output: [supplier.s_name, supplier.s_address, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey] }
-            left table: 0, right table 2, left degree table: 1, right degree table: 3,
-          StreamExchange Hash([0]) from 1
-          StreamExchange Hash([0]) from 4
+    StreamMaterialize { columns: [s_name, s_address, supplier.s_suppkey(hidden), nation.n_nationkey(hidden), supplier.s_nationkey(hidden)], stream_key: [supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], pk_columns: [s_name, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamHashJoin { type: LeftSemi, predicate: supplier.s_suppkey = partsupp.ps_suppkey, output: [supplier.s_name, supplier.s_address, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey] } { left table: 0, right table: 2, left degree table: 1, right degree table: 3 }
+        ├──  StreamExchange Hash([0]) from 1
+        └──  StreamExchange Hash([0]) from 4
 
     Fragment 1
-      StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: all }
-          left table: 4, right table 6, left degree table: 5, right degree table: 7,
-        StreamExchange Hash([3]) from 2
-        StreamExchange Hash([0]) from 3
+    StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: all } { left table: 4, right table: 6, left degree table: 5, right degree table: 7 }
+    ├──  StreamExchange Hash([3]) from 2
+    └──  StreamExchange Hash([0]) from 3
 
     Fragment 2
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 3
-      StreamProject { exprs: [nation.n_nationkey] }
-        StreamFilter { predicate: (nation.n_name = 'KENYA':Varchar) }
-          Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [nation.n_nationkey] }
+    └── StreamFilter { predicate: (nation.n_name = 'KENYA':Varchar) }
+        └── Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 4
-      StreamProject { exprs: [partsupp.ps_suppkey, partsupp.ps_partkey, partsupp.ps_partkey, partsupp.ps_suppkey] }
-        StreamFilter { predicate: ($expr1 > $expr2) }
-          StreamHashJoin { type: Inner, predicate: partsupp.ps_partkey IS NOT DISTINCT FROM partsupp.ps_partkey AND partsupp.ps_suppkey IS NOT DISTINCT FROM partsupp.ps_suppkey, output: all }
-              left table: 8, right table 10, left degree table: 9, right degree table: 11,
-            StreamExchange Hash([0, 1]) from 5
-            StreamProject { exprs: [partsupp.ps_partkey, partsupp.ps_suppkey, (0.5:Decimal * sum(lineitem.l_quantity)) as $expr2] }
-              StreamHashAgg { group_key: [partsupp.ps_partkey, partsupp.ps_suppkey], aggs: [sum(lineitem.l_quantity), count] }
-                  result table: 16, state tables: [], distinct tables: []
-                StreamHashJoin { type: LeftOuter, predicate: partsupp.ps_partkey IS NOT DISTINCT FROM lineitem.l_partkey AND partsupp.ps_suppkey IS NOT DISTINCT FROM lineitem.l_suppkey, output: [partsupp.ps_partkey, partsupp.ps_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
-                    left table: 17, right table 19, left degree table: 18, right degree table: 20,
-                  StreamExchange Hash([0, 1]) from 8
-                  StreamExchange Hash([0, 1]) from 9
+    StreamProject { exprs: [partsupp.ps_suppkey, partsupp.ps_partkey, partsupp.ps_partkey, partsupp.ps_suppkey] }
+    └── StreamFilter { predicate: ($expr1 > $expr2) }
+        └── StreamHashJoin { type: Inner, predicate: partsupp.ps_partkey IS NOT DISTINCT FROM partsupp.ps_partkey AND partsupp.ps_suppkey IS NOT DISTINCT FROM partsupp.ps_suppkey, output: all } { left table: 8, right table: 10, left degree table: 9, right degree table: 11 }
+            ├──  StreamExchange Hash([0, 1]) from 5
+            └── StreamProject { exprs: [partsupp.ps_partkey, partsupp.ps_suppkey, (0.5:Decimal * sum(lineitem.l_quantity)) as $expr2] }
+                └── StreamHashAgg { group_key: [partsupp.ps_partkey, partsupp.ps_suppkey], aggs: [sum(lineitem.l_quantity), count] } { result table: 16, state tables: [], distinct tables: [] }
+                    └── StreamHashJoin { type: LeftOuter, predicate: partsupp.ps_partkey IS NOT DISTINCT FROM lineitem.l_partkey AND partsupp.ps_suppkey IS NOT DISTINCT FROM lineitem.l_suppkey, output: [partsupp.ps_partkey, partsupp.ps_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+                        ├── left table: 17
+                        ├── right table: 19
+                        ├── left degree table: 18
+                        ├── right degree table: 20
+                        ├──  StreamExchange Hash([0, 1]) from 8
+                        └──  StreamExchange Hash([0, 1]) from 9
 
     Fragment 5
-      StreamProject { exprs: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty::Decimal as $expr1] }
-        StreamHashJoin { type: LeftSemi, predicate: partsupp.ps_partkey = part.p_partkey, output: all }
-            left table: 12, right table 14, left degree table: 13, right degree table: 15,
-          StreamExchange Hash([0]) from 6
-          StreamExchange Hash([0]) from 7
+    StreamProject { exprs: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty::Decimal as $expr1] }
+    └── StreamHashJoin { type: LeftSemi, predicate: partsupp.ps_partkey = part.p_partkey, output: all } { left table: 12, right table: 14, left degree table: 13, right degree table: 15 }
+        ├──  StreamExchange Hash([0]) from 6
+        └──  StreamExchange Hash([0]) from 7
 
     Fragment 6
-      Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey, partsupp.ps_availqty], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 7
-      StreamProject { exprs: [part.p_partkey] }
-        StreamFilter { predicate: Like(part.p_name, 'forest%':Varchar) }
-          Chain { table: part, columns: [part.p_partkey, part.p_name], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [part.p_partkey] }
+    └── StreamFilter { predicate: Like(part.p_name, 'forest%':Varchar) }
+        └── Chain { table: part, columns: [part.p_partkey, part.p_name], pk: [part.p_partkey], dist: UpstreamHashShard(part.p_partkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 8
-      StreamProject { exprs: [partsupp.ps_partkey, partsupp.ps_suppkey] }
-        StreamHashAgg { group_key: [partsupp.ps_partkey, partsupp.ps_suppkey], aggs: [count] }
-            result table: 21, state tables: [], distinct tables: []
-          Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [partsupp.ps_partkey, partsupp.ps_suppkey] }
+    └── StreamHashAgg { group_key: [partsupp.ps_partkey, partsupp.ps_suppkey], aggs: [count] } { result table: 21, state tables: [], distinct tables: [] }
+        └── Chain { table: partsupp, columns: [partsupp.ps_partkey, partsupp.ps_suppkey], pk: [partsupp.ps_partkey, partsupp.ps_suppkey], dist: UpstreamHashShard(partsupp.ps_partkey, partsupp.ps_suppkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 9
-      StreamProject { exprs: [lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
-        StreamFilter { predicate: IsNotNull(lineitem.l_partkey) AND IsNotNull(lineitem.l_suppkey) AND (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) }
-          Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_nationkey, nation_n_nationkey], primary key: [$0 ASC, $4 ASC, $3 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 1 { columns: [supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 2 { columns: [partsupp_ps_suppkey, partsupp_ps_partkey, partsupp_ps_partkey_0, partsupp_ps_suppkey_0], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [0, 1, 2, 3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [partsupp_ps_suppkey, partsupp_ps_partkey, partsupp_ps_partkey_0, partsupp_ps_suppkey_0, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4 { columns: [supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_nationkey], primary key: [$3 ASC, $0 ASC], value indices: [0, 1, 2, 3], distribution key: [3], read pk prefix len hint: 1 }
-     Table 5 { columns: [supplier_s_nationkey, supplier_s_suppkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [nation_n_nationkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 8 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, $expr1], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 9 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 10 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, $expr2], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 11 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 12 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_availqty], primary key: [$0 ASC, $1 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 13 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 14 { columns: [part_p_partkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 15 { columns: [part_p_partkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 16 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, sum(lineitem_l_quantity), count], primary key: [$0 ASC, $1 ASC], value indices: [2, 3], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 17 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey], primary key: [$0 ASC, $1 ASC], value indices: [0, 1], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 18 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 19 { columns: [lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_orderkey, lineitem_l_linenumber], primary key: [$0 ASC, $1 ASC, $3 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 20 { columns: [lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 21 { columns: [partsupp_ps_partkey, partsupp_ps_suppkey, count], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0, 1], read pk prefix len hint: 2 }
-     Table 4294967294 { columns: [s_name, s_address, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey], primary key: [$0 ASC, $2 ASC, $3 ASC, $4 ASC], value indices: [0, 1, 2, 3, 4], distribution key: [2], read pk prefix len hint: 3 }
+    StreamProject { exprs: [lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: IsNotNull(lineitem.l_partkey) AND IsNotNull(lineitem.l_suppkey) AND (lineitem.l_shipdate >= '1994-01-01':Date) AND (lineitem.l_shipdate < '1995-01-01 00:00:00':Timestamp) }
+        └── Chain { table: lineitem, columns: [lineitem.l_partkey, lineitem.l_suppkey, lineitem.l_quantity, lineitem.l_orderkey, lineitem.l_linenumber, lineitem.l_shipdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_nationkey, nation_n_nationkey ], primary key: [ $0 ASC, $4 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 1 { columns: [ supplier_s_suppkey, nation_n_nationkey, supplier_s_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 2 { columns: [ partsupp_ps_suppkey, partsupp_ps_partkey, partsupp_ps_partkey_0, partsupp_ps_suppkey_0 ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3 { columns: [ partsupp_ps_suppkey, partsupp_ps_partkey, partsupp_ps_partkey_0, partsupp_ps_suppkey_0, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4 { columns: [ supplier_s_suppkey, supplier_s_name, supplier_s_address, supplier_s_nationkey ], primary key: [ $3 ASC, $0 ASC ], value indices: [ 0, 1, 2, 3 ], distribution key: [ 3 ], read pk prefix len hint: 1 }
+
+    Table 5 { columns: [ supplier_s_nationkey, supplier_s_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ nation_n_nationkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 8 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, $expr1 ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 9 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 10 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, $expr2 ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 11 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 12 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, partsupp_ps_availqty ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 13 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ part_p_partkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 15 { columns: [ part_p_partkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 16 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, sum(lineitem_l_quantity), count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2, 3 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 17 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 18 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 19 { columns: [ lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_quantity, lineitem_l_orderkey, lineitem_l_linenumber ], primary key: [ $0 ASC, $1 ASC, $3 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 20 { columns: [ lineitem_l_partkey, lineitem_l_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 21 { columns: [ partsupp_ps_partkey, partsupp_ps_suppkey, count ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0, 1 ], read pk prefix len hint: 2 }
+
+    Table 4294967294 { columns: [ s_name, s_address, supplier.s_suppkey, nation.n_nationkey, supplier.s_nationkey ], primary key: [ $0 ASC, $2 ASC, $3 ASC, $4 ASC ], value indices: [ 0, 1, 2, 3, 4 ], distribution key: [ 2 ], read pk prefix len hint: 3 }
+
 - id: tpch_q21
   before:
   - create_tables
@@ -3538,7 +3982,7 @@
                   └─BatchFilter { predicate: (lineitem.l_receiptdate > lineitem.l_commitdate) }
                     └─BatchScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_commitdate, lineitem.l_receiptdate], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [s_name, numwait], pk_columns: [s_name], order_descs: [numwait, s_name], pk_conflict: "no check" }
+    StreamMaterialize { columns: [s_name, numwait], stream_key: [s_name], pk_columns: [numwait, s_name], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [supplier.s_name, count] }
       └─StreamTopN { order: "[count DESC, supplier.s_name ASC]", limit: 100, offset: 0 }
         └─StreamExchange { dist: Single }
@@ -3573,109 +4017,169 @@
                       └─StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber] }
                         └─StreamFilter { predicate: (lineitem.l_receiptdate > lineitem.l_commitdate) }
                           └─StreamTableScan { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [s_name, numwait], pk_columns: [s_name], order_descs: [numwait, s_name], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [supplier.s_name, count] }
-          StreamTopN { order: "[count DESC, supplier.s_name ASC]", limit: 100, offset: 0 }
-              state table: 0
-            StreamExchange Single from 1
+    StreamMaterialize { columns: [s_name, numwait], stream_key: [s_name], pk_columns: [numwait, s_name], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [supplier.s_name, count] }
+        └── StreamTopN { order: "[count DESC, supplier.s_name ASC]", limit: 100, offset: 0 } { state table: 0 }
+            └──  StreamExchange Single from 1
 
     Fragment 1
-      StreamGroupTopN { order: "[count DESC, supplier.s_name ASC]", limit: 100, offset: 0, group_key: [2] }
-          state table: 1
-        StreamProject { exprs: [supplier.s_name, count, Vnode(supplier.s_name) as $expr1] }
-          StreamHashAgg { group_key: [supplier.s_name], aggs: [count] }
-              result table: 2, state tables: [], distinct tables: []
-            StreamExchange Hash([0]) from 2
+    StreamGroupTopN { order: "[count DESC, supplier.s_name ASC]", limit: 100, offset: 0, group_key: [2] } { state table: 1 }
+    └── StreamProject { exprs: [supplier.s_name, count, Vnode(supplier.s_name) as $expr1] }
+        └── StreamHashAgg { group_key: [supplier.s_name], aggs: [count] }
+            ├── result table: 2
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0]) from 2
 
     Fragment 2
-      StreamHashJoin { type: LeftAnti, predicate: lineitem.l_orderkey = lineitem.l_orderkey AND (lineitem.l_suppkey <> lineitem.l_suppkey), output: [supplier.s_name, supplier.s_suppkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey] }
-          left table: 3, right table 5, left degree table: 4, right degree table: 6,
-        StreamHashJoin { type: LeftSemi, predicate: lineitem.l_orderkey = lineitem.l_orderkey AND (lineitem.l_suppkey <> lineitem.l_suppkey), output: all }
-            left table: 7, right table 9, left degree table: 8, right degree table: 10,
-          StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [supplier.s_name, lineitem.l_orderkey, lineitem.l_suppkey, supplier.s_suppkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey] }
-              left table: 11, right table 13, left degree table: 12, right degree table: 14,
-            StreamExchange Hash([1]) from 3
-            StreamExchange Hash([0]) from 8
-          StreamExchange Hash([0]) from 9
-        StreamExchange Hash([0]) from 10
+    StreamHashJoin { type: LeftAnti, predicate: lineitem.l_orderkey = lineitem.l_orderkey AND (lineitem.l_suppkey <> lineitem.l_suppkey), output: [supplier.s_name, supplier.s_suppkey, lineitem.l_orderkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey] }
+    ├── left table: 3
+    ├── right table: 5
+    ├── left degree table: 4
+    ├── right degree table: 6
+    ├── StreamHashJoin { type: LeftSemi, predicate: lineitem.l_orderkey = lineitem.l_orderkey AND (lineitem.l_suppkey <> lineitem.l_suppkey), output: all } { left table: 7, right table: 9, left degree table: 8, right degree table: 10 }
+    │   ├── StreamHashJoin { type: Inner, predicate: lineitem.l_orderkey = orders.o_orderkey, output: [supplier.s_name, lineitem.l_orderkey, lineitem.l_suppkey, supplier.s_suppkey, lineitem.l_linenumber, nation.n_nationkey, supplier.s_nationkey, orders.o_orderkey] }
+    │   │   ├── left table: 11
+    │   │   ├── right table: 13
+    │   │   ├── left degree table: 12
+    │   │   ├── right degree table: 14
+    │   │   ├──  StreamExchange Hash([1]) from 3
+    │   │   └──  StreamExchange Hash([0]) from 8
+    │   └──  StreamExchange Hash([0]) from 9
+    └──  StreamExchange Hash([0]) from 10
 
     Fragment 3
-      StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [supplier.s_name, lineitem.l_orderkey, lineitem.l_suppkey, supplier.s_suppkey, lineitem.l_linenumber, supplier.s_nationkey, nation.n_nationkey] }
-          left table: 15, right table 17, left degree table: 16, right degree table: 18,
-        StreamExchange Hash([1]) from 4
-        StreamExchange Hash([0]) from 7
+    StreamHashJoin { type: Inner, predicate: supplier.s_nationkey = nation.n_nationkey, output: [supplier.s_name, lineitem.l_orderkey, lineitem.l_suppkey, supplier.s_suppkey, lineitem.l_linenumber, supplier.s_nationkey, nation.n_nationkey] }
+    ├── left table: 15
+    ├── right table: 17
+    ├── left degree table: 16
+    ├── right degree table: 18
+    ├──  StreamExchange Hash([1]) from 4
+    └──  StreamExchange Hash([0]) from 7
 
     Fragment 4
-      StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_name, supplier.s_nationkey, lineitem.l_orderkey, lineitem.l_suppkey, supplier.s_suppkey, lineitem.l_linenumber] }
-          left table: 19, right table 21, left degree table: 20, right degree table: 22,
-        StreamExchange Hash([0]) from 5
-        StreamExchange Hash([1]) from 6
+    StreamHashJoin { type: Inner, predicate: supplier.s_suppkey = lineitem.l_suppkey, output: [supplier.s_name, supplier.s_nationkey, lineitem.l_orderkey, lineitem.l_suppkey, supplier.s_suppkey, lineitem.l_linenumber] }
+    ├── left table: 19
+    ├── right table: 21
+    ├── left degree table: 20
+    ├── right degree table: 22
+    ├──  StreamExchange Hash([0]) from 5
+    └──  StreamExchange Hash([1]) from 6
 
     Fragment 5
-      Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
-        Upstream
-        BatchPlanNode
+    Chain { table: supplier, columns: [supplier.s_suppkey, supplier.s_name, supplier.s_nationkey], pk: [supplier.s_suppkey], dist: UpstreamHashShard(supplier.s_suppkey) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 6
-      StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber] }
-        StreamFilter { predicate: (lineitem.l_receiptdate > lineitem.l_commitdate) }
-          Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: (lineitem.l_receiptdate > lineitem.l_commitdate) }
+        └── Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 7
-      StreamProject { exprs: [nation.n_nationkey] }
-        StreamFilter { predicate: (nation.n_name = 'GERMANY':Varchar) }
-          Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [nation.n_nationkey] }
+    └── StreamFilter { predicate: (nation.n_name = 'GERMANY':Varchar) }
+        └── Chain { table: nation, columns: [nation.n_nationkey, nation.n_name], pk: [nation.n_nationkey], dist: UpstreamHashShard(nation.n_nationkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 8
-      StreamProject { exprs: [orders.o_orderkey] }
-        StreamFilter { predicate: (orders.o_orderstatus = 'F':Varchar) }
-          Chain { table: orders, columns: [orders.o_orderkey, orders.o_orderstatus], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
-            Upstream
-            BatchPlanNode
+    StreamProject { exprs: [orders.o_orderkey] }
+    └── StreamFilter { predicate: (orders.o_orderstatus = 'F':Varchar) }
+        └── Chain { table: orders, columns: [orders.o_orderkey, orders.o_orderstatus], pk: [orders.o_orderkey], dist: UpstreamHashShard(orders.o_orderkey) }
+            ├──  Upstream
+            └──  BatchPlanNode
 
     Fragment 9
-      Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-        Upstream
-        BatchPlanNode
+    Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+    ├──  Upstream
+    └──  BatchPlanNode
 
     Fragment 10
-      StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber] }
-        StreamFilter { predicate: (lineitem.l_receiptdate > lineitem.l_commitdate) }
-          Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
-            Upstream
-            BatchPlanNode
-
-     Table 0 { columns: [supplier_s_name, count, $expr1], primary key: [$1 DESC, $0 ASC], value indices: [0, 1, 2], distribution key: [], read pk prefix len hint: 0 }
-     Table 1 { columns: [supplier_s_name, count, $expr1], primary key: [$2 ASC, $1 DESC, $0 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1, vnode column idx: 2 }
-     Table 2 { columns: [supplier_s_name, count], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 3 { columns: [supplier_s_name, lineitem_l_orderkey, lineitem_l_suppkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey], primary key: [$1 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [1], read pk prefix len hint: 1 }
-     Table 4 { columns: [lineitem_l_orderkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC], value indices: [6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 5 { columns: [lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_linenumber], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 6 { columns: [lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 7 { columns: [supplier_s_name, lineitem_l_orderkey, lineitem_l_suppkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey], primary key: [$1 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC], value indices: [0, 1, 2, 3, 4, 5, 6, 7], distribution key: [1], read pk prefix len hint: 1 }
-     Table 8 { columns: [lineitem_l_orderkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC], value indices: [6], distribution key: [0], read pk prefix len hint: 1 }
-     Table 9 { columns: [lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_linenumber], primary key: [$0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 10 { columns: [lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC], value indices: [2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 11 { columns: [supplier_s_name, lineitem_l_orderkey, lineitem_l_suppkey, supplier_s_suppkey, lineitem_l_linenumber, supplier_s_nationkey, nation_n_nationkey], primary key: [$1 ASC, $3 ASC, $4 ASC, $6 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5, 6], distribution key: [1], read pk prefix len hint: 1 }
-     Table 12 { columns: [lineitem_l_orderkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC], value indices: [5], distribution key: [0], read pk prefix len hint: 1 }
-     Table 13 { columns: [orders_o_orderkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 14 { columns: [orders_o_orderkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 15 { columns: [supplier_s_name, supplier_s_nationkey, lineitem_l_orderkey, lineitem_l_suppkey, supplier_s_suppkey, lineitem_l_linenumber], primary key: [$1 ASC, $4 ASC, $2 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [1], read pk prefix len hint: 1 }
-     Table 16 { columns: [supplier_s_nationkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC, $3 ASC], value indices: [4], distribution key: [0], read pk prefix len hint: 1 }
-     Table 17 { columns: [nation_n_nationkey], primary key: [$0 ASC], value indices: [0], distribution key: [0], read pk prefix len hint: 1 }
-     Table 18 { columns: [nation_n_nationkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 19 { columns: [supplier_s_suppkey, supplier_s_name, supplier_s_nationkey], primary key: [$0 ASC], value indices: [0, 1, 2], distribution key: [0], read pk prefix len hint: 1 }
-     Table 20 { columns: [supplier_s_suppkey, _degree], primary key: [$0 ASC], value indices: [1], distribution key: [0], read pk prefix len hint: 1 }
-     Table 21 { columns: [lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_linenumber], primary key: [$1 ASC, $0 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [1], read pk prefix len hint: 1 }
-     Table 22 { columns: [lineitem_l_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [s_name, numwait], primary key: [$1 DESC, $0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
+    StreamProject { exprs: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber] }
+    └── StreamFilter { predicate: (lineitem.l_receiptdate > lineitem.l_commitdate) }
+        └── Chain { table: lineitem, columns: [lineitem.l_orderkey, lineitem.l_suppkey, lineitem.l_linenumber, lineitem.l_commitdate, lineitem.l_receiptdate], pk: [lineitem.l_orderkey, lineitem.l_linenumber], dist: UpstreamHashShard(lineitem.l_orderkey, lineitem.l_linenumber) }
+            ├──  Upstream
+            └──  BatchPlanNode
+
+    Table 0 { columns: [ supplier_s_name, count, $expr1 ], primary key: [ $1 DESC, $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [], read pk prefix len hint: 0 }
+
+    Table 1 { columns: [ supplier_s_name, count, $expr1 ], primary key: [ $2 ASC, $1 DESC, $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1, vnode column idx: 2 }
+
+    Table 2 { columns: [ supplier_s_name, count ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 3
+    ├── columns: [ supplier_s_name, lineitem_l_orderkey, lineitem_l_suppkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey ]
+    ├── primary key: [ $1 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
+    Table 4
+    ├── columns: [ lineitem_l_orderkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, _degree ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC ]
+    ├── value indices: [ 6 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 5 { columns: [ lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_linenumber ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 6 { columns: [ lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 7
+    ├── columns: [ supplier_s_name, lineitem_l_orderkey, lineitem_l_suppkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey ]
+    ├── primary key: [ $1 ASC, $3 ASC, $4 ASC, $5 ASC, $6 ASC, $7 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6, 7 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
+    Table 8
+    ├── columns: [ lineitem_l_orderkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, orders_o_orderkey, _degree ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC, $5 ASC ]
+    ├── value indices: [ 6 ]
+    ├── distribution key: [ 0 ]
+    └── read pk prefix len hint: 1
+
+    Table 9 { columns: [ lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_linenumber ], primary key: [ $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 10 { columns: [ lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC ], value indices: [ 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 11
+    ├── columns: [ supplier_s_name, lineitem_l_orderkey, lineitem_l_suppkey, supplier_s_suppkey, lineitem_l_linenumber, supplier_s_nationkey, nation_n_nationkey ]
+    ├── primary key: [ $1 ASC, $3 ASC, $4 ASC, $6 ASC, $5 ASC ]
+    ├── value indices: [ 0, 1, 2, 3, 4, 5, 6 ]
+    ├── distribution key: [ 1 ]
+    └── read pk prefix len hint: 1
+
+    Table 12 { columns: [ lineitem_l_orderkey, supplier_s_suppkey, lineitem_l_linenumber, nation_n_nationkey, supplier_s_nationkey, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC, $4 ASC ], value indices: [ 5 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 13 { columns: [ orders_o_orderkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 14 { columns: [ orders_o_orderkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 15 { columns: [ supplier_s_name, supplier_s_nationkey, lineitem_l_orderkey, lineitem_l_suppkey, supplier_s_suppkey, lineitem_l_linenumber ], primary key: [ $1 ASC, $4 ASC, $2 ASC, $5 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 16 { columns: [ supplier_s_nationkey, supplier_s_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC, $3 ASC ], value indices: [ 4 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 17 { columns: [ nation_n_nationkey ], primary key: [ $0 ASC ], value indices: [ 0 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 18 { columns: [ nation_n_nationkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 19 { columns: [ supplier_s_suppkey, supplier_s_name, supplier_s_nationkey ], primary key: [ $0 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 20 { columns: [ supplier_s_suppkey, _degree ], primary key: [ $0 ASC ], value indices: [ 1 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 21 { columns: [ lineitem_l_orderkey, lineitem_l_suppkey, lineitem_l_linenumber ], primary key: [ $1 ASC, $0 ASC, $2 ASC ], value indices: [ 0, 1, 2 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
+
+    Table 22 { columns: [ lineitem_l_suppkey, lineitem_l_orderkey, lineitem_l_linenumber, _degree ], primary key: [ $0 ASC, $1 ASC, $2 ASC ], value indices: [ 3 ], distribution key: [ 0 ], read pk prefix len hint: 1 }
+
+    Table 4294967294 { columns: [ s_name, numwait ], primary key: [ $1 DESC, $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
+
 - id: tpch_q22
   before:
   - create_tables
@@ -3766,7 +4270,7 @@
                         └─BatchFilter { predicate: (customer.c_acctbal > 0.00:Decimal) AND In(Substr(customer.c_phone, 1:Int32, 2:Int32), '30':Varchar, '24':Varchar, '31':Varchar, '38':Varchar, '25':Varchar, '34':Varchar, '37':Varchar) }
                           └─BatchScan { table: customer, columns: [customer.c_acctbal, customer.c_phone], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [cntrycode, numcust, totacctbal], pk_columns: [cntrycode], pk_conflict: "no check" }
+    StreamMaterialize { columns: [cntrycode, numcust, totacctbal], stream_key: [cntrycode], pk_columns: [cntrycode], pk_conflict: "NoCheck" }
     └─StreamHashAgg { group_key: [$expr2], aggs: [count, sum(customer.c_acctbal)] }
       └─StreamExchange { dist: HashShard($expr2) }
         └─StreamProject { exprs: [Substr(customer.c_phone, 1:Int32, 2:Int32) as $expr2, customer.c_acctbal, customer.c_custkey] }
diff --git a/src/frontend/planner_test/tests/testdata/union.yaml b/src/frontend/planner_test/tests/testdata/union.yaml
index 0dfee81d93421..af635f1b3fa28 100644
--- a/src/frontend/planner_test/tests/testdata/union.yaml
+++ b/src/frontend/planner_test/tests/testdata/union.yaml
@@ -10,35 +10,36 @@
     └─BatchExchange { order: [], dist: Single }
       └─BatchScan { table: t2, columns: [t2.a, t2.b, t2.c], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a, b, c, t1._row_id(hidden), null:Int64(hidden), 0:Int32(hidden)], pk_columns: [t1._row_id, null:Int64, 0:Int32], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, b, c, t1._row_id(hidden), null:Serial(hidden), 0:Int32(hidden)], stream_key: [t1._row_id, null:Serial, 0:Int32], pk_columns: [t1._row_id, null:Serial, 0:Int32], pk_conflict: "NoCheck" }
     └─StreamUnion { all: true }
-      ├─StreamExchange { dist: HashShard(t1._row_id, null:Int64, 0:Int32) }
-      | └─StreamProject { exprs: [t1.a, t1.b, t1.c, t1._row_id, null:Int64, 0:Int32] }
+      ├─StreamExchange { dist: HashShard(t1._row_id, null:Serial, 0:Int32) }
+      | └─StreamProject { exprs: [t1.a, t1.b, t1.c, t1._row_id, null:Serial, 0:Int32] }
       |   └─StreamTableScan { table: t1, columns: [t1.a, t1.b, t1.c, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
-      └─StreamExchange { dist: HashShard(null:Int64, t2._row_id, 1:Int32) }
-        └─StreamProject { exprs: [t2.a, t2.b, t2.c, null:Int64, t2._row_id, 1:Int32] }
+      └─StreamExchange { dist: HashShard(null:Serial, t2._row_id, 1:Int32) }
+        └─StreamProject { exprs: [t2.a, t2.b, t2.c, null:Serial, t2._row_id, 1:Int32] }
           └─StreamTableScan { table: t2, columns: [t2.a, t2.b, t2.c, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a, b, c, t1._row_id(hidden), null:Int64(hidden), 0:Int32(hidden)], pk_columns: [t1._row_id, null:Int64, 0:Int32], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamUnion { all: true }
-          StreamExchange Hash([3, 4, 5]) from 1
-          StreamExchange Hash([3, 4, 5]) from 2
+    StreamMaterialize { columns: [a, b, c, t1._row_id(hidden), null:Serial(hidden), 0:Int32(hidden)], stream_key: [t1._row_id, null:Serial, 0:Int32], pk_columns: [t1._row_id, null:Serial, 0:Int32], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamUnion { all: true }
+        ├──  StreamExchange Hash([3, 4, 5]) from 1
+        └──  StreamExchange Hash([3, 4, 5]) from 2
 
     Fragment 1
-      StreamProject { exprs: [t1.a, t1.b, t1.c, t1._row_id, null:Int64, 0:Int32] }
-        Chain { table: t1, columns: [t1.a, t1.b, t1.c, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [t1.a, t1.b, t1.c, t1._row_id, null:Serial, 0:Int32] }
+    └── Chain { table: t1, columns: [t1.a, t1.b, t1.c, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
 
     Fragment 2
-      StreamProject { exprs: [t2.a, t2.b, t2.c, null:Int64, t2._row_id, 1:Int32] }
-        Chain { table: t2, columns: [t2.a, t2.b, t2.c, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [t2.a, t2.b, t2.c, null:Serial, t2._row_id, 1:Int32] }
+    └── Chain { table: t2, columns: [t2.a, t2.b, t2.c, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 4294967294 { columns: [ a, b, c, t1._row_id, null:Serial, 0:Int32 ], primary key: [ $3 ASC, $4 ASC, $5 ASC ], value indices: [ 0, 1, 2, 3, 4, 5 ], distribution key: [ 3, 4, 5 ], read pk prefix len hint: 3 }
 
-     Table 4294967294 { columns: [a, b, c, t1._row_id, null:Int64, 0:Int32], primary key: [$3 ASC, $4 ASC, $5 ASC], value indices: [0, 1, 2, 3, 4, 5], distribution key: [3, 4, 5], read pk prefix len hint: 3 }
 - sql: |
     create table t1 (a int, b numeric, c bigint);
     create table t2 (a int, b numeric, c bigint);
@@ -58,45 +59,59 @@
           └─BatchExchange { order: [], dist: Single }
             └─BatchScan { table: t2, columns: [t2.a, t2.b, t2.c], distribution: SomeShard }
   stream_plan: |
-    StreamMaterialize { columns: [a, b, c], pk_columns: [a, b, c], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, b, c], stream_key: [a, b, c], pk_columns: [a, b, c], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.a, t1.b, t1.c] }
       └─StreamHashAgg { group_key: [t1.a, t1.b, t1.c], aggs: [count] }
         └─StreamExchange { dist: HashShard(t1.a, t1.b, t1.c) }
           └─StreamUnion { all: true }
-            ├─StreamExchange { dist: HashShard(t1._row_id, null:Int64, 0:Int32) }
-            | └─StreamProject { exprs: [t1.a, t1.b, t1.c, t1._row_id, null:Int64, 0:Int32] }
+            ├─StreamExchange { dist: HashShard(t1._row_id, null:Serial, 0:Int32) }
+            | └─StreamProject { exprs: [t1.a, t1.b, t1.c, t1._row_id, null:Serial, 0:Int32] }
             |   └─StreamTableScan { table: t1, columns: [t1.a, t1.b, t1.c, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
-            └─StreamExchange { dist: HashShard(null:Int64, t2._row_id, 1:Int32) }
-              └─StreamProject { exprs: [t2.a, t2.b, t2.c, null:Int64, t2._row_id, 1:Int32] }
+            └─StreamExchange { dist: HashShard(null:Serial, t2._row_id, 1:Int32) }
+              └─StreamProject { exprs: [t2.a, t2.b, t2.c, null:Serial, t2._row_id, 1:Int32] }
                 └─StreamTableScan { table: t2, columns: [t2.a, t2.b, t2.c, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a, b, c], pk_columns: [a, b, c], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [t1.a, t1.b, t1.c] }
-          StreamHashAgg { group_key: [t1.a, t1.b, t1.c], aggs: [count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0, 1, 2]) from 1
+    StreamMaterialize { columns: [a, b, c], stream_key: [a, b, c], pk_columns: [a, b, c], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [t1.a, t1.b, t1.c] }
+        └── StreamHashAgg { group_key: [t1.a, t1.b, t1.c], aggs: [count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0, 1, 2]) from 1
 
     Fragment 1
-      StreamUnion { all: true }
-        StreamExchange Hash([3, 4, 5]) from 2
-        StreamExchange Hash([3, 4, 5]) from 3
+    StreamUnion { all: true }
+    ├──  StreamExchange Hash([3, 4, 5]) from 2
+    └──  StreamExchange Hash([3, 4, 5]) from 3
 
     Fragment 2
-      StreamProject { exprs: [t1.a, t1.b, t1.c, t1._row_id, null:Int64, 0:Int32] }
-        Chain { table: t1, columns: [t1.a, t1.b, t1.c, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [t1.a, t1.b, t1.c, t1._row_id, null:Serial, 0:Int32] }
+    └── Chain { table: t1, columns: [t1.a, t1.b, t1.c, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
 
     Fragment 3
-      StreamProject { exprs: [t2.a, t2.b, t2.c, null:Int64, t2._row_id, 1:Int32] }
-        Chain { table: t2, columns: [t2.a, t2.b, t2.c, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [t2.a, t2.b, t2.c, null:Serial, t2._row_id, 1:Int32] }
+    └── Chain { table: t2, columns: [t2.a, t2.b, t2.c, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ t1_a, t1_b, t1_c, count ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 3 ]
+    ├── distribution key: [ 0, 1, 2 ]
+    └── read pk prefix len hint: 3
+
+    Table 4294967294
+    ├── columns: [ a, b, c ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0, 1, 2 ]
+    └── read pk prefix len hint: 3
 
-     Table 0 { columns: [t1_a, t1_b, t1_c, count], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 4294967294 { columns: [a, b, c], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
 - sql: |
     create table t1 (a int, b numeric, c bigint, primary key(a));
     create table t2 (a int, b numeric, c bigint, primary key(a));
@@ -116,7 +131,7 @@
           └─BatchExchange { order: [], dist: Single }
             └─BatchScan { table: t2, columns: [t2.a, t2.b, t2.c], distribution: UpstreamHashShard(t2.a) }
   stream_plan: |
-    StreamMaterialize { columns: [a, b, c], pk_columns: [a, b, c], pk_conflict: "no check" }
+    StreamMaterialize { columns: [a, b, c], stream_key: [a, b, c], pk_columns: [a, b, c], pk_conflict: "NoCheck" }
     └─StreamProject { exprs: [t1.a, t1.b, t1.c] }
       └─StreamHashAgg { group_key: [t1.a, t1.b, t1.c], aggs: [count] }
         └─StreamExchange { dist: HashShard(t1.a, t1.b, t1.c) }
@@ -127,34 +142,48 @@
             └─StreamExchange { dist: HashShard(t2.a, 1:Int32) }
               └─StreamProject { exprs: [t2.a, t2.b, t2.c, 1:Int32] }
                 └─StreamTableScan { table: t2, columns: [t2.a, t2.b, t2.c], pk: [t2.a], dist: UpstreamHashShard(t2.a) }
-  stream_dist_plan: |
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [a, b, c], pk_columns: [a, b, c], pk_conflict: "no check" }
-          materialized table: 4294967294
-        StreamProject { exprs: [t1.a, t1.b, t1.c] }
-          StreamHashAgg { group_key: [t1.a, t1.b, t1.c], aggs: [count] }
-              result table: 0, state tables: [], distinct tables: []
-            StreamExchange Hash([0, 1, 2]) from 1
+    StreamMaterialize { columns: [a, b, c], stream_key: [a, b, c], pk_columns: [a, b, c], pk_conflict: "NoCheck" }
+    ├── materialized table: 4294967294
+    └── StreamProject { exprs: [t1.a, t1.b, t1.c] }
+        └── StreamHashAgg { group_key: [t1.a, t1.b, t1.c], aggs: [count] }
+            ├── result table: 0
+            ├── state tables: []
+            ├── distinct tables: []
+            └──  StreamExchange Hash([0, 1, 2]) from 1
 
     Fragment 1
-      StreamUnion { all: true }
-        StreamExchange Hash([0, 3]) from 2
-        StreamExchange Hash([0, 3]) from 3
+    StreamUnion { all: true }
+    ├──  StreamExchange Hash([0, 3]) from 2
+    └──  StreamExchange Hash([0, 3]) from 3
 
     Fragment 2
-      StreamProject { exprs: [t1.a, t1.b, t1.c, 0:Int32] }
-        Chain { table: t1, columns: [t1.a, t1.b, t1.c], pk: [t1.a], dist: UpstreamHashShard(t1.a) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [t1.a, t1.b, t1.c, 0:Int32] }
+    └── Chain { table: t1, columns: [t1.a, t1.b, t1.c], pk: [t1.a], dist: UpstreamHashShard(t1.a) }
+        ├──  Upstream
+        └──  BatchPlanNode
 
     Fragment 3
-      StreamProject { exprs: [t2.a, t2.b, t2.c, 1:Int32] }
-        Chain { table: t2, columns: [t2.a, t2.b, t2.c], pk: [t2.a], dist: UpstreamHashShard(t2.a) }
-          Upstream
-          BatchPlanNode
+    StreamProject { exprs: [t2.a, t2.b, t2.c, 1:Int32] }
+    └── Chain { table: t2, columns: [t2.a, t2.b, t2.c], pk: [t2.a], dist: UpstreamHashShard(t2.a) }
+        ├──  Upstream
+        └──  BatchPlanNode
+
+    Table 0
+    ├── columns: [ t1_a, t1_b, t1_c, count ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 3 ]
+    ├── distribution key: [ 0, 1, 2 ]
+    └── read pk prefix len hint: 3
+
+    Table 4294967294
+    ├── columns: [ a, b, c ]
+    ├── primary key: [ $0 ASC, $1 ASC, $2 ASC ]
+    ├── value indices: [ 0, 1, 2 ]
+    ├── distribution key: [ 0, 1, 2 ]
+    └── read pk prefix len hint: 3
 
-     Table 0 { columns: [t1_a, t1_b, t1_c, count], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [3], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
-     Table 4294967294 { columns: [a, b, c], primary key: [$0 ASC, $1 ASC, $2 ASC], value indices: [0, 1, 2], distribution key: [0, 1, 2], read pk prefix len hint: 3 }
 - sql: |
     create table t1 (a int, b numeric, c bigint);
     create table t2 (a int, b numeric, c bigint);
diff --git a/src/frontend/planner_test/tests/testdata/watermark.yaml b/src/frontend/planner_test/tests/testdata/watermark.yaml
index 020d8e3a4c0a3..51eb1bae05b6a 100644
--- a/src/frontend/planner_test/tests/testdata/watermark.yaml
+++ b/src/frontend/planner_test/tests/testdata/watermark.yaml
@@ -7,53 +7,47 @@
     LogicalProject { exprs: [(v1 - '00:00:02':Interval) as $expr1] }
     └─LogicalSource { source: t, columns: [v1, _row_id], time_range: [(Unbounded, Unbounded)] }
   stream_plan: |
-    StreamMaterialize { columns: [v1, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check", watermark_columns: [v1] }
-    └─StreamExchange { dist: HashShard(_row_id) }
-      └─StreamProject { exprs: [(AtTimeZone((AtTimeZone(v1, 'UTC':Varchar) - '00:00:00':Interval), 'UTC':Varchar) - '00:00:02':Interval) as $expr1, _row_id], output_watermarks: [$expr1] }
-        └─StreamRowIdGen { row_id_index: 1 }
-          └─StreamWatermarkFilter { watermark_descs: [idx: 0, expr: (v1 - '00:00:01':Interval)] }
-            └─StreamSource { source: "t", columns: ["v1", "_row_id"] }
-  stream_dist_plan: |
+    StreamMaterialize { columns: [v1, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck", watermark_columns: [v1] }
+    └─StreamProject { exprs: [(AtTimeZone((AtTimeZone(v1, 'UTC':Varchar) - '00:00:00':Interval), 'UTC':Varchar) - '00:00:02':Interval) as $expr1, _row_id], output_watermarks: [$expr1] }
+      └─StreamRowIdGen { row_id_index: 1 }
+        └─StreamWatermarkFilter { watermark_descs: [idx: 0, expr: (v1 - '00:00:01':Interval)] }
+          └─StreamSource { source: "t", columns: ["v1", "_row_id"] }
+  stream_dist_plan: |+
     Fragment 0
-      StreamMaterialize { columns: [v1, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check", watermark_columns: [v1] }
-          materialized table: 4294967294
-        StreamExchange Hash([1]) from 1
+    StreamMaterialize { columns: [v1, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck", watermark_columns: [v1] } { materialized table: 4294967294 }
+    └── StreamProject { exprs: [(AtTimeZone((AtTimeZone(v1, 'UTC':Varchar) - '00:00:00':Interval), 'UTC':Varchar) - '00:00:02':Interval) as $expr1, _row_id], output_watermarks: [$expr1] }
+        └── StreamRowIdGen { row_id_index: 1 }
+            └── StreamWatermarkFilter { watermark_descs: [idx: 0, expr: (v1 - '00:00:01':Interval)] }
+                └──  StreamSource { source: "t", columns: ["v1", "_row_id"] } { source state table: 1 }
+
+    Table 1 { columns: [ partition_id, offset_info ], primary key: [ $0 ASC ], value indices: [ 0, 1 ], distribution key: [], read pk prefix len hint: 1 }
 
-    Fragment 1
-      StreamProject { exprs: [(AtTimeZone((AtTimeZone(v1, 'UTC':Varchar) - '00:00:00':Interval), 'UTC':Varchar) - '00:00:02':Interval) as $expr1, _row_id], output_watermarks: [$expr1] }
-        StreamRowIdGen { row_id_index: 1 }
-          StreamWatermarkFilter { watermark_descs: [idx: 0, expr: (v1 - '00:00:01':Interval)] }
-            StreamSource { source: "t", columns: ["v1", "_row_id"] }
-                source state table: 1
+    Table 4294967294 { columns: [ v1, _row_id ], primary key: [ $1 ASC ], value indices: [ 0, 1 ], distribution key: [ 1 ], read pk prefix len hint: 1 }
 
-     Table 1 { columns: [partition_id, offset_info], primary key: [$0 ASC], value indices: [0, 1], distribution key: [], read pk prefix len hint: 1 }
-     Table 4294967294 { columns: [v1, _row_id], primary key: [$1 ASC], value indices: [0, 1], distribution key: [1], read pk prefix len hint: 1 }
 - name: watermark on append only table with source
   sql: |
     explain create table t (v1 timestamp with time zone, watermark for v1 as v1 - INTERVAL '1' SECOND) append only with (connector = 'kafka', kafka.topic = 'kafka_3_partition_topic', kafka.brokers = '127.0.0.1:1234', kafka.scan.startup.mode='earliest') ROW FORMAT JSON;
   explain_output: |
-    StreamMaterialize { columns: [v1, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check", watermark_columns: [v1] }
-    └─StreamExchange { dist: HashShard(_row_id) }
-      └─StreamRowIdGen { row_id_index: 1 }
-        └─StreamWatermarkFilter { watermark_descs: [idx: 0, expr: (v1 - '00:00:01':Interval)] }
-          └─StreamDml { columns: [v1, _row_id] }
-            └─StreamSource { source: "t", columns: ["v1", "_row_id"] }
+    StreamMaterialize { columns: [v1, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck", watermark_columns: [v1] }
+    └─StreamRowIdGen { row_id_index: 1 }
+      └─StreamWatermarkFilter { watermark_descs: [idx: 0, expr: (v1 - '00:00:01':Interval)] }
+        └─StreamDml { columns: [v1, _row_id] }
+          └─StreamSource { source: "t", columns: ["v1", "_row_id"] }
 - name: watermark on append only table without source
   sql: |
     explain create table t (v1 timestamp with time zone, watermark for v1 as v1 - INTERVAL '1' SECOND) append only;
   explain_output: |
-    StreamMaterialize { columns: [v1, _row_id(hidden)], pk_columns: [_row_id], pk_conflict: "no check", watermark_columns: [v1] }
-    └─StreamExchange { dist: HashShard(_row_id) }
-      └─StreamRowIdGen { row_id_index: 1 }
-        └─StreamWatermarkFilter { watermark_descs: [idx: 0, expr: (v1 - '00:00:01':Interval)] }
-          └─StreamDml { columns: [v1, _row_id] }
-            └─StreamSource
+    StreamMaterialize { columns: [v1, _row_id(hidden)], stream_key: [_row_id], pk_columns: [_row_id], pk_conflict: "NoCheck", watermark_columns: [v1] }
+    └─StreamRowIdGen { row_id_index: 1 }
+      └─StreamWatermarkFilter { watermark_descs: [idx: 0, expr: (v1 - '00:00:01':Interval)] }
+        └─StreamDml { columns: [v1, _row_id] }
+          └─StreamSource
 - name: hash agg
   sql: |
     create table t (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     select count(v2) from t group by ts, v1;
   stream_plan: |
-    StreamMaterialize { columns: [count, t.ts(hidden), t.v1(hidden)], pk_columns: [t.ts, t.v1], pk_conflict: "no check", watermark_columns: [t.ts(hidden)] }
+    StreamMaterialize { columns: [count, t.ts(hidden), t.v1(hidden)], stream_key: [t.ts, t.v1], pk_columns: [t.ts, t.v1], pk_conflict: "NoCheck", watermark_columns: [t.ts(hidden)] }
     └─StreamProject { exprs: [count(t.v2), t.ts, t.v1], output_watermarks: [t.ts] }
       └─StreamAppendOnlyHashAgg { group_key: [t.ts, t.v1], aggs: [count(t.v2), count], output_watermarks: [t.ts] }
         └─StreamExchange { dist: HashShard(t.ts, t.v1) }
@@ -64,25 +58,56 @@
     create table t2 (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     select t1.ts as t1_ts, t2.ts as ts2, t1.v1 as t1_v1, t1.v2 as t1_v2, t2.v1 as t2_v1, t2.v2 as t2_v2 from t1, t2 where t1.ts = t2.ts;
   stream_plan: |
-    StreamMaterialize { columns: [t1_ts, ts2, t1_v1, t1_v2, t2_v1, t2_v2, t1._row_id(hidden), t2._row_id(hidden)], pk_columns: [t1._row_id, t2._row_id, t1_ts], pk_conflict: "no check", watermark_columns: [t1_ts, ts2] }
+    StreamMaterialize { columns: [t1_ts, ts2, t1_v1, t1_v2, t2_v1, t2_v2, t1._row_id(hidden), t2._row_id(hidden)], stream_key: [t1._row_id, t2._row_id, t1_ts], pk_columns: [t1._row_id, t2._row_id, t1_ts], pk_conflict: "NoCheck", watermark_columns: [t1_ts, ts2] }
     └─StreamAppendOnlyHashJoin { type: Inner, predicate: t1.ts = t2.ts, output_watermarks: [t1.ts, t2.ts], output: [t1.ts, t2.ts, t1.v1, t1.v2, t2.v1, t2.v2, t1._row_id, t2._row_id] }
       ├─StreamExchange { dist: HashShard(t1.ts) }
       | └─StreamTableScan { table: t1, columns: [t1.ts, t1.v1, t1.v2, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
       └─StreamExchange { dist: HashShard(t2.ts) }
         └─StreamTableScan { table: t2, columns: [t2.ts, t2.v1, t2.v2, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
+- name: left semi hash join
+  sql: |
+    create table t1 (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
+    create table t2 (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
+    select t1.ts as t1_ts, t1.v1 as t1_v1, t1.v2 as t1_v2 from t1 where exists (select * from t2 where t1.ts = t2.ts);
+  stream_plan: |
+    StreamMaterialize { columns: [t1_ts, t1_v1, t1_v2, t1._row_id(hidden)], stream_key: [t1._row_id, t1_ts], pk_columns: [t1._row_id, t1_ts], pk_conflict: "NoCheck", watermark_columns: [t1_ts] }
+    └─StreamHashJoin { type: LeftSemi, predicate: t1.ts = t2.ts, output_watermarks: [t1.ts], output: all }
+      ├─StreamExchange { dist: HashShard(t1.ts) }
+      | └─StreamTableScan { table: t1, columns: [t1.ts, t1.v1, t1.v2, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
+      └─StreamExchange { dist: HashShard(t2.ts) }
+        └─StreamTableScan { table: t2, columns: [t2.ts, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
+- name: band hash join
+  sql: |
+    create table t1 (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
+    create table t2 (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
+    select t1.ts as t1_ts, t1.v1 as t1_v1, t1.v2 as t1_v2, t2.ts as t2_ts, t2.v1 as t2_v1, t2.v2 as t2_v2 from t1 left outer join t2 on (t1.v1 = t2.v1 and (t1.ts >= t2.ts + INTERVAL '1' SECOND) and (t2.ts >= t1.ts + INTERVAL '1' SECOND));
+  logical_plan: |
+    LogicalProject { exprs: [t1.ts, t1.v1, t1.v2, t2.ts, t2.v1, t2.v2] }
+    └─LogicalJoin { type: LeftOuter, on: (t1.v1 = t2.v1) AND (t1.ts >= (t2.ts + '00:00:01':Interval)) AND (t2.ts >= (t1.ts + '00:00:01':Interval)), output: all }
+      ├─LogicalScan { table: t1, columns: [t1.ts, t1.v1, t1.v2, t1._row_id] }
+      └─LogicalScan { table: t2, columns: [t2.ts, t2.v1, t2.v2, t2._row_id] }
+  stream_plan: |
+    StreamMaterialize { columns: [t1_ts, t1_v1, t1_v2, t2_ts, t2_v1, t2_v2, t1._row_id(hidden), t2._row_id(hidden)], stream_key: [t1._row_id, t2._row_id, t1_v1], pk_columns: [t1._row_id, t2._row_id, t1_v1], pk_conflict: "NoCheck", watermark_columns: [t1_ts, t2_ts] }
+    └─StreamIntervalJoin { type: LeftOuter, predicate: t1.v1 = t2.v1 AND (t1.ts >= $expr2) AND ($expr1 <= t2.ts), conditions_to_clean_left_state_table: (t1.ts >= $expr2), conditions_to_clean_right_state_table: ($expr1 <= t2.ts), output_watermarks: [t1.ts, t2.ts], output: [t1.ts, t1.v1, t1.v2, t2.ts, t2.v1, t2.v2, t1._row_id, t2._row_id] }
+      ├─StreamExchange { dist: HashShard(t1.v1) }
+      | └─StreamProject { exprs: [t1.ts, t1.v1, t1.v2, (AtTimeZone((AtTimeZone(t1.ts, 'UTC':Varchar) + '00:00:00':Interval), 'UTC':Varchar) + '00:00:01':Interval) as $expr1, t1._row_id], output_watermarks: [t1.ts, $expr1] }
+      |   └─StreamTableScan { table: t1, columns: [t1.ts, t1.v1, t1.v2, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
+      └─StreamExchange { dist: HashShard(t2.v1) }
+        └─StreamProject { exprs: [t2.ts, t2.v1, t2.v2, (AtTimeZone((AtTimeZone(t2.ts, 'UTC':Varchar) + '00:00:00':Interval), 'UTC':Varchar) + '00:00:01':Interval) as $expr2, t2._row_id], output_watermarks: [t2.ts, $expr2] }
+          └─StreamTableScan { table: t2, columns: [t2.ts, t2.v1, t2.v2, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
 - name: union all
   sql: |
     create table t1 (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     create table t2 (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     select * from t1 Union all select * from t2;
   stream_plan: |
-    StreamMaterialize { columns: [ts, v1, v2, t1._row_id(hidden), null:Int64(hidden), 0:Int32(hidden)], pk_columns: [t1._row_id, null:Int64, 0:Int32], pk_conflict: "no check", watermark_columns: [ts] }
+    StreamMaterialize { columns: [ts, v1, v2, t1._row_id(hidden), null:Serial(hidden), 0:Int32(hidden)], stream_key: [t1._row_id, null:Serial, 0:Int32], pk_columns: [t1._row_id, null:Serial, 0:Int32], pk_conflict: "NoCheck", watermark_columns: [ts] }
     └─StreamUnion { all: true, output_watermarks: [t1.ts] }
-      ├─StreamExchange { dist: HashShard(t1._row_id, null:Int64, 0:Int32) }
-      | └─StreamProject { exprs: [t1.ts, t1.v1, t1.v2, t1._row_id, null:Int64, 0:Int32], output_watermarks: [t1.ts] }
+      ├─StreamExchange { dist: HashShard(t1._row_id, null:Serial, 0:Int32) }
+      | └─StreamProject { exprs: [t1.ts, t1.v1, t1.v2, t1._row_id, null:Serial, 0:Int32], output_watermarks: [t1.ts] }
       |   └─StreamTableScan { table: t1, columns: [t1.ts, t1.v1, t1.v2, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
-      └─StreamExchange { dist: HashShard(null:Int64, t2._row_id, 1:Int32) }
-        └─StreamProject { exprs: [t2.ts, t2.v1, t2.v2, null:Int64, t2._row_id, 1:Int32], output_watermarks: [t2.ts] }
+      └─StreamExchange { dist: HashShard(null:Serial, t2._row_id, 1:Int32) }
+        └─StreamProject { exprs: [t2.ts, t2.v1, t2.v2, null:Serial, t2._row_id, 1:Int32], output_watermarks: [t2.ts] }
           └─StreamTableScan { table: t2, columns: [t2.ts, t2.v1, t2.v2, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
 - name: union
   sql: |
@@ -90,23 +115,23 @@
     create table t2 (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     select * from t1 Union select * from t2;
   stream_plan: |
-    StreamMaterialize { columns: [ts, v1, v2], pk_columns: [ts, v1, v2], pk_conflict: "no check", watermark_columns: [ts] }
+    StreamMaterialize { columns: [ts, v1, v2], stream_key: [ts, v1, v2], pk_columns: [ts, v1, v2], pk_conflict: "NoCheck", watermark_columns: [ts] }
     └─StreamProject { exprs: [t1.ts, t1.v1, t1.v2], output_watermarks: [t1.ts] }
       └─StreamAppendOnlyHashAgg { group_key: [t1.ts, t1.v1, t1.v2], aggs: [count], output_watermarks: [t1.ts] }
         └─StreamExchange { dist: HashShard(t1.ts, t1.v1, t1.v2) }
           └─StreamUnion { all: true, output_watermarks: [t1.ts] }
-            ├─StreamExchange { dist: HashShard(t1._row_id, null:Int64, 0:Int32) }
-            | └─StreamProject { exprs: [t1.ts, t1.v1, t1.v2, t1._row_id, null:Int64, 0:Int32], output_watermarks: [t1.ts] }
+            ├─StreamExchange { dist: HashShard(t1._row_id, null:Serial, 0:Int32) }
+            | └─StreamProject { exprs: [t1.ts, t1.v1, t1.v2, t1._row_id, null:Serial, 0:Int32], output_watermarks: [t1.ts] }
             |   └─StreamTableScan { table: t1, columns: [t1.ts, t1.v1, t1.v2, t1._row_id], pk: [t1._row_id], dist: UpstreamHashShard(t1._row_id) }
-            └─StreamExchange { dist: HashShard(null:Int64, t2._row_id, 1:Int32) }
-              └─StreamProject { exprs: [t2.ts, t2.v1, t2.v2, null:Int64, t2._row_id, 1:Int32], output_watermarks: [t2.ts] }
+            └─StreamExchange { dist: HashShard(null:Serial, t2._row_id, 1:Int32) }
+              └─StreamProject { exprs: [t2.ts, t2.v1, t2.v2, null:Serial, t2._row_id, 1:Int32], output_watermarks: [t2.ts] }
                 └─StreamTableScan { table: t2, columns: [t2.ts, t2.v1, t2.v2, t2._row_id], pk: [t2._row_id], dist: UpstreamHashShard(t2._row_id) }
 - name: tumble
   sql: |
     create table t (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     select * from tumble(t, ts, interval '3' minute);
   stream_plan: |
-    StreamMaterialize { columns: [ts, v1, v2, window_start, window_end, t._row_id(hidden)], pk_columns: [t._row_id], pk_conflict: "no check", watermark_columns: [ts, window_start, window_end] }
+    StreamMaterialize { columns: [ts, v1, v2, window_start, window_end, t._row_id(hidden)], stream_key: [t._row_id], pk_columns: [t._row_id], pk_conflict: "NoCheck", watermark_columns: [ts, window_start, window_end] }
     └─StreamProject { exprs: [t.ts, t.v1, t.v2, TumbleStart(t.ts, '00:03:00':Interval) as $expr1, (AtTimeZone((AtTimeZone(TumbleStart(t.ts, '00:03:00':Interval), 'UTC':Varchar) + '00:00:00':Interval), 'UTC':Varchar) + '00:03:00':Interval) as $expr2, t._row_id], output_watermarks: [t.ts, $expr1, $expr2] }
       └─StreamTableScan { table: t, columns: [t.ts, t.v1, t.v2, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
 - name: hop all
@@ -114,7 +139,7 @@
     create table t (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     select * from hop(t, ts, interval '1' minute, interval '3' minute);
   stream_plan: |
-    StreamMaterialize { columns: [ts, v1, v2, window_start, window_end, t._row_id(hidden)], pk_columns: [t._row_id, window_start, window_end], pk_conflict: "no check", watermark_columns: [ts, window_start, window_end] }
+    StreamMaterialize { columns: [ts, v1, v2, window_start, window_end, t._row_id(hidden)], stream_key: [t._row_id, window_start, window_end], pk_columns: [t._row_id, window_start, window_end], pk_conflict: "NoCheck", watermark_columns: [ts, window_start, window_end] }
     └─StreamHopWindow { time_col: t.ts, slide: 00:01:00, size: 00:03:00, output: [t.ts, t.v1, t.v2, window_start, window_end, t._row_id], output_watermarks: [t.ts, window_start, window_end] }
       └─StreamFilter { predicate: IsNotNull(t.ts) }
         └─StreamTableScan { table: t, columns: [t.ts, t.v1, t.v2, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
@@ -123,7 +148,7 @@
     create table t (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     select ts from hop(t, ts, interval '1' minute, interval '3' minute);
   stream_plan: |
-    StreamMaterialize { columns: [ts, window_start(hidden), t._row_id(hidden)], pk_columns: [t._row_id, window_start], pk_conflict: "no check", watermark_columns: [ts, window_start(hidden)] }
+    StreamMaterialize { columns: [ts, window_start(hidden), t._row_id(hidden)], stream_key: [t._row_id, window_start], pk_columns: [t._row_id, window_start], pk_conflict: "NoCheck", watermark_columns: [ts, window_start(hidden)] }
     └─StreamHopWindow { time_col: t.ts, slide: 00:01:00, size: 00:03:00, output: [t.ts, window_start, t._row_id], output_watermarks: [t.ts, window_start] }
       └─StreamFilter { predicate: IsNotNull(t.ts) }
         └─StreamTableScan { table: t, columns: [t.ts, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
@@ -132,7 +157,7 @@
     create table t (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     select window_end from hop(t, ts, interval '1' minute, interval '3' minute);
   stream_plan: |
-    StreamMaterialize { columns: [window_end, t._row_id(hidden)], pk_columns: [t._row_id, window_end], pk_conflict: "no check", watermark_columns: [window_end] }
+    StreamMaterialize { columns: [window_end, t._row_id(hidden)], stream_key: [t._row_id, window_end], pk_columns: [t._row_id, window_end], pk_conflict: "NoCheck", watermark_columns: [window_end] }
     └─StreamHopWindow { time_col: t.ts, slide: 00:01:00, size: 00:03:00, output: [window_end, t._row_id], output_watermarks: [window_end] }
       └─StreamFilter { predicate: IsNotNull(t.ts) }
         └─StreamTableScan { table: t, columns: [t.ts, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
@@ -141,7 +166,7 @@
     create table t (ts timestamp with time zone, v1 int, v2 int, watermark for ts as ts - INTERVAL '1' SECOND) append only;
     select window_start from hop(t, ts, interval '1' minute, interval '3' minute);
   stream_plan: |
-    StreamMaterialize { columns: [window_start, t._row_id(hidden)], pk_columns: [t._row_id, window_start], pk_conflict: "no check", watermark_columns: [window_start] }
+    StreamMaterialize { columns: [window_start, t._row_id(hidden)], stream_key: [t._row_id, window_start], pk_columns: [t._row_id, window_start], pk_conflict: "NoCheck", watermark_columns: [window_start] }
     └─StreamHopWindow { time_col: t.ts, slide: 00:01:00, size: 00:03:00, output: [window_start, t._row_id], output_watermarks: [window_start] }
       └─StreamFilter { predicate: IsNotNull(t.ts) }
         └─StreamTableScan { table: t, columns: [t.ts, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
diff --git a/src/frontend/src/binder/delete.rs b/src/frontend/src/binder/delete.rs
index 2de1a7e0e182d..62a268e94bab5 100644
--- a/src/frontend/src/binder/delete.rs
+++ b/src/frontend/src/binder/delete.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use risingwave_common::catalog::{Schema, TableVersionId};
-use risingwave_common::error::Result;
+use risingwave_common::error::{ErrorCode, Result, RwError};
 use risingwave_sqlparser::ast::{Expr, ObjectName, SelectItem};
 
 use super::statement::RewriteExprsRecursive;
@@ -77,6 +77,13 @@ impl Binder {
         let owner = table_catalog.owner;
         let table_version_id = table_catalog.version_id().expect("table must be versioned");
 
+        // TODO(yuhao): delete from table with generated columns
+        if table_catalog.has_generated_column() {
+            return Err(RwError::from(ErrorCode::BindError(
+                "Delete from a table with generated column has not been implemented.".to_string(),
+            )));
+        }
+
         let table = self.bind_table(schema_name, &table_name, None)?;
         let (returning_list, fields) = self.bind_returning_list(returning_items)?;
         let returning = !returning_list.is_empty();
diff --git a/src/frontend/src/binder/expr/function.rs b/src/frontend/src/binder/expr/function.rs
index 95c7cda62e15c..7db8c4f0c3488 100644
--- a/src/frontend/src/binder/expr/function.rs
+++ b/src/frontend/src/binder/expr/function.rs
@@ -303,7 +303,7 @@ impl Binder {
         fn now() -> Handle {
             Box::new(move |binder, mut inputs| {
                 binder.ensure_now_function_allowed()?;
-                if !binder.in_create_mv {
+                if !binder.in_streaming {
                     inputs.push(ExprImpl::from(Literal::new(
                         Some(ScalarImpl::Int64((binder.bind_timestamp_ms * 1000) as i64)),
                         DataType::Timestamptz,
@@ -380,6 +380,16 @@ impl Binder {
                 ("octet_length", raw_call(ExprType::OctetLength)),
                 ("bit_length", raw_call(ExprType::BitLength)),
                 ("regexp_match", raw_call(ExprType::RegexpMatch)),
+                ("chr", raw_call(ExprType::Chr)),
+                ("starts_with", raw_call(ExprType::StartsWith)),
+                ("initcap", raw_call(ExprType::Initcap)),
+                ("lpad", raw_call(ExprType::Lpad)),
+                ("rpad", raw_call(ExprType::Rpad)),
+                ("reverse", raw_call(ExprType::Reverse)),
+                ("strpos", raw_call(ExprType::Strpos)),
+                ("to_ascii", raw_call(ExprType::ToAscii)),
+                ("to_hex", raw_call(ExprType::ToHex)),
+                ("quote_ident", raw_call(ExprType::QuoteIdent)),
                 // array
                 ("array_cat", raw_call(ExprType::ArrayCat)),
                 ("array_append", raw_call(ExprType::ArrayAppend)),
@@ -387,6 +397,7 @@ impl Binder {
                 ("array_prepend", raw_call(ExprType::ArrayPrepend)),
                 ("array_to_string", raw_call(ExprType::ArrayToString)),
                 ("array_distinct", raw_call(ExprType::ArrayDistinct)),
+                ("array_length", raw_call(ExprType::ArrayLength)),
                 // jsonb
                 ("jsonb_object_field", raw_call(ExprType::JsonbAccessInner)),
                 ("jsonb_array_element", raw_call(ExprType::JsonbAccessInner)),
@@ -399,14 +410,14 @@ impl Binder {
                 // System information operations.
                 (
                     "pg_typeof",
-                    raw(|_binder, inputs| {
+                    guard_by_len(1, raw(|_binder, inputs| {
                         let input = &inputs[0];
                         let v = match input.is_unknown() {
                             true => "unknown".into(),
                             false => input.return_type().to_string(),
                         };
                         Ok(ExprImpl::literal_varchar(v))
-                    }),
+                    })),
                 ),
                 ("current_database", guard_by_len(0, raw(|binder, _inputs| {
                     Ok(ExprImpl::literal_varchar(binder.db_name.clone()))
@@ -640,7 +651,7 @@ impl Binder {
     }
 
     fn ensure_now_function_allowed(&self) -> Result<()> {
-        if self.in_create_mv
+        if self.in_streaming
             && !matches!(
                 self.context.clause,
                 Some(Clause::Where) | Some(Clause::Having)
diff --git a/src/frontend/src/binder/expr/mod.rs b/src/frontend/src/binder/expr/mod.rs
index 9a05d80c6da06..867eedcfd4848 100644
--- a/src/frontend/src/binder/expr/mod.rs
+++ b/src/frontend/src/binder/expr/mod.rs
@@ -452,6 +452,7 @@ pub fn bind_struct_field(column_def: &StructField) -> Result<ColumnDesc> {
                     name: f.name.real_value(),
                     field_descs: vec![],
                     type_name: "".to_string(),
+                    generated_column: None,
                 })
             })
             .collect::<Result<Vec<_>>>()?
@@ -464,6 +465,7 @@ pub fn bind_struct_field(column_def: &StructField) -> Result<ColumnDesc> {
         name: column_def.name.real_value(),
         field_descs,
         type_name: "".to_string(),
+        generated_column: None,
     })
 }
 
diff --git a/src/frontend/src/binder/expr/order_by.rs b/src/frontend/src/binder/expr/order_by.rs
index cdf062cae76cc..c6d494ea0b150 100644
--- a/src/frontend/src/binder/expr/order_by.rs
+++ b/src/frontend/src/binder/expr/order_by.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use risingwave_common::error::{ErrorCode, Result};
+use risingwave_common::error::Result;
 use risingwave_common::util::sort_util::OrderType;
 use risingwave_sqlparser::ast::OrderByExpr;
 
@@ -34,19 +34,7 @@ impl Binder {
             nulls_first,
         }: OrderByExpr,
     ) -> Result<BoundOrderByExpr> {
-        // TODO(rc): support `NULLS FIRST | LAST`
-        if nulls_first.is_some() {
-            return Err(ErrorCode::NotImplemented(
-                "NULLS FIRST or NULLS LAST".to_string(),
-                4743.into(),
-            )
-            .into());
-        }
-        let order_type = match asc {
-            None => OrderType::default(),
-            Some(true) => OrderType::ascending(),
-            Some(false) => OrderType::descending(),
-        };
+        let order_type = OrderType::from_bools(asc, nulls_first);
         let expr = self.bind_expr(expr)?;
         Ok(BoundOrderByExpr { expr, order_type })
     }
diff --git a/src/frontend/src/binder/expr/value.rs b/src/frontend/src/binder/expr/value.rs
index 7b920ef07fb95..0bfe20783c6ce 100644
--- a/src/frontend/src/binder/expr/value.rs
+++ b/src/frontend/src/binder/expr/value.rs
@@ -17,7 +17,7 @@ use std::str::{from_utf8, Chars};
 
 use itertools::Itertools;
 use risingwave_common::error::{ErrorCode, Result, RwError};
-use risingwave_common::types::{DataType, DateTimeField, Decimal, IntervalUnit, ScalarImpl};
+use risingwave_common::types::{DataType, DateTimeField, Decimal, Interval, ScalarImpl};
 use risingwave_sqlparser::ast::{DateTimeField as AstDateTimeField, Expr, Value};
 
 use crate::binder::Binder;
@@ -78,7 +78,7 @@ impl Binder {
         leading_field: Option<AstDateTimeField>,
     ) -> Result<Literal> {
         let interval =
-            IntervalUnit::parse_with_fields(&s, leading_field.map(Self::bind_date_time_field))?;
+            Interval::parse_with_fields(&s, leading_field.map(Self::bind_date_time_field))?;
         let datum = Some(ScalarImpl::Interval(interval));
         let literal = Literal::new(datum, DataType::Interval);
 
@@ -292,7 +292,7 @@ fn unescape_c_style(s: &str) -> Result<String> {
 
 #[cfg(test)]
 mod tests {
-    use risingwave_common::types::test_utils::IntervalUnitTestExt;
+    use risingwave_common::types::test_utils::IntervalTestExt;
     use risingwave_common::types::DataType;
     use risingwave_expr::expr::build_from_prost;
     use risingwave_sqlparser::ast::Value::Number;
@@ -443,27 +443,27 @@ mod tests {
         ];
         let data = vec![
             Ok(Literal::new(
-                Some(ScalarImpl::Interval(IntervalUnit::from_minutes(60))),
+                Some(ScalarImpl::Interval(Interval::from_minutes(60))),
                 DataType::Interval,
             )),
             Ok(Literal::new(
-                Some(ScalarImpl::Interval(IntervalUnit::from_minutes(60))),
+                Some(ScalarImpl::Interval(Interval::from_minutes(60))),
                 DataType::Interval,
             )),
             Ok(Literal::new(
-                Some(ScalarImpl::Interval(IntervalUnit::from_ymd(1, 0, 0))),
+                Some(ScalarImpl::Interval(Interval::from_ymd(1, 0, 0))),
                 DataType::Interval,
             )),
             Ok(Literal::new(
-                Some(ScalarImpl::Interval(IntervalUnit::from_millis(6 * 1000))),
+                Some(ScalarImpl::Interval(Interval::from_millis(6 * 1000))),
                 DataType::Interval,
             )),
             Ok(Literal::new(
-                Some(ScalarImpl::Interval(IntervalUnit::from_minutes(2))),
+                Some(ScalarImpl::Interval(Interval::from_minutes(2))),
                 DataType::Interval,
             )),
             Ok(Literal::new(
-                Some(ScalarImpl::Interval(IntervalUnit::from_month(1))),
+                Some(ScalarImpl::Interval(Interval::from_month(1))),
                 DataType::Interval,
             )),
         ];
diff --git a/src/frontend/src/binder/insert.rs b/src/frontend/src/binder/insert.rs
index 46b6c969cb058..b832cd2c97cf1 100644
--- a/src/frontend/src/binder/insert.rs
+++ b/src/frontend/src/binder/insert.rs
@@ -100,19 +100,41 @@ impl Binder {
         let table_id = table_catalog.id;
         let owner = table_catalog.owner;
         let table_version_id = table_catalog.version_id().expect("table must be versioned");
-        let columns_to_insert = table_catalog
-            .columns
-            .clone()
-            .into_iter()
-            .filter(|c| !c.is_hidden())
-            .collect_vec();
-        let row_id_index = table_catalog.row_id_index;
+        let columns_to_insert = table_catalog.columns_to_insert().cloned().collect_vec();
 
         let expected_types: Vec<DataType> = columns_to_insert
             .iter()
             .map(|c| c.data_type().clone())
             .collect();
 
+        let generated_column_names: HashSet<_> = table_catalog.generated_column_names().collect();
+        for query_col in &columns {
+            let query_col_name = query_col.real_value();
+            if generated_column_names.contains(query_col_name.as_str()) {
+                return Err(RwError::from(ErrorCode::BindError(format!(
+                    "cannot insert a non-DEFAULT value into column \"{0}\".  Column \"{0}\" is a generated column.",
+                    &query_col_name
+                ))));
+            }
+        }
+
+        // TODO(yuhao): refine this if row_id is always the last column.
+        //
+        // `row_id_index` in bin insert operation should rule out generated column
+        let row_id_index = {
+            if let Some(row_id_index) = table_catalog.row_id_index {
+                let mut cnt = 0;
+                for col in table_catalog.columns().iter().take(row_id_index + 1) {
+                    if col.is_generated() {
+                        cnt += 1;
+                    }
+                }
+                Some(row_id_index - cnt)
+            } else {
+                None
+            }
+        };
+
         // When the column types of `source` query do not match `expected_types`, casting is
         // needed.
         //
diff --git a/src/frontend/src/binder/mod.rs b/src/frontend/src/binder/mod.rs
index 962f37cce54d3..3dc55c5114254 100644
--- a/src/frontend/src/binder/mod.rs
+++ b/src/frontend/src/binder/mod.rs
@@ -89,8 +89,8 @@ pub struct Binder {
     next_share_id: ShareId,
 
     search_path: SearchPath,
-    /// Whether the Binder is binding an MV.
-    in_create_mv: bool,
+    /// Whether the Binder is binding an MV/SINK.
+    in_streaming: bool,
 
     /// `ShareId`s identifying shared views.
     shared_views: HashMap<ViewId, ShareId>,
@@ -109,7 +109,7 @@ pub struct Binder {
 /// 4. After bind finished:
 ///     (a) parameter not in `ParameterTypes` means that the user didn't specify it and it didn't
 /// occur in the query. `export` will return error if there is a kind of
-/// parameter. This rule is compatible with PostgreSQL    
+/// parameter. This rule is compatible with PostgreSQL
 ///     (b) parameter is None means that it's a unknown type. The user didn't specify it
 /// and we can't infer it in the query. We will treat it as VARCHAR type finally. This rule is
 /// compatible with PostgreSQL.
@@ -181,7 +181,7 @@ impl ParameterTypes {
 }
 
 impl Binder {
-    fn new_inner(session: &SessionImpl, in_create_mv: bool, param_types: Vec<DataType>) -> Binder {
+    fn new_inner(session: &SessionImpl, in_streaming: bool, param_types: Vec<DataType>) -> Binder {
         let now_ms = session
             .env()
             .hummock_snapshot_manager()
@@ -200,7 +200,7 @@ impl Binder {
             next_values_id: 0,
             next_share_id: 0,
             search_path: session.config().get_search_path(),
-            in_create_mv,
+            in_streaming,
             shared_views: HashMap::new(),
             param_types: ParameterTypes::new(param_types),
         }
@@ -227,6 +227,10 @@ impl Binder {
         self.param_types.export()
     }
 
+    pub fn shared_views(&self) -> &HashMap<ViewId, ShareId> {
+        &self.shared_views
+    }
+
     fn push_context(&mut self) {
         let new_context = std::mem::take(&mut self.context);
         self.context.cte_to_relation = new_context.cte_to_relation.clone();
diff --git a/src/frontend/src/binder/query.rs b/src/frontend/src/binder/query.rs
index 74b5c591fcf3e..3cac14efd1cdf 100644
--- a/src/frontend/src/binder/query.rs
+++ b/src/frontend/src/binder/query.rs
@@ -221,19 +221,7 @@ impl Binder {
         extra_order_exprs: &mut Vec<ExprImpl>,
         visible_output_num: usize,
     ) -> Result<ColumnOrder> {
-        // TODO(rc): support `NULLS FIRST | LAST`
-        if nulls_first.is_some() {
-            return Err(ErrorCode::NotImplemented(
-                "NULLS FIRST or NULLS LAST".to_string(),
-                4743.into(),
-            )
-            .into());
-        }
-        let order_type = match asc {
-            None => OrderType::default(),
-            Some(true) => OrderType::ascending(),
-            Some(false) => OrderType::descending(),
-        };
+        let order_type = OrderType::from_bools(asc, nulls_first);
         let column_index = match expr {
             Expr::Identifier(name) if let Some(index) = name_to_index.get(&name.real_value()) => match *index != usize::MAX {
                 true => *index,
diff --git a/src/frontend/src/binder/relation/mod.rs b/src/frontend/src/binder/relation/mod.rs
index 18e0fdd206747..48fd90bd7da23 100644
--- a/src/frontend/src/binder/relation/mod.rs
+++ b/src/frontend/src/binder/relation/mod.rs
@@ -18,9 +18,11 @@ use std::str::FromStr;
 
 use itertools::Itertools;
 use risingwave_common::catalog::{
-    Field, TableId, DEFAULT_SCHEMA_NAME, PG_CATALOG_SCHEMA_NAME, RW_INTERNAL_TABLE_FUNCTION_NAME,
+    Field, Schema, TableId, DEFAULT_SCHEMA_NAME, PG_CATALOG_SCHEMA_NAME,
+    RW_INTERNAL_TABLE_FUNCTION_NAME,
 };
 use risingwave_common::error::{internal_error, ErrorCode, Result, RwError};
+use risingwave_common::types::DataType;
 use risingwave_sqlparser::ast::{
     Expr as ParserExpr, FunctionArg, FunctionArgExpr, Ident, ObjectName, TableAlias, TableFactor,
 };
@@ -28,7 +30,8 @@ use risingwave_sqlparser::ast::{
 use self::watermark::is_watermark_func;
 use super::bind_context::ColumnBinding;
 use super::statement::RewriteExprsRecursive;
-use crate::binder::{Binder, BoundSetExpr};
+use crate::binder::Binder;
+use crate::catalog::function_catalog::FunctionKind;
 use crate::catalog::system_catalog::pg_catalog::{
     PG_GET_KEYWORDS_FUNC_NAME, PG_KEYWORDS_TABLE_NAME,
 };
@@ -86,24 +89,6 @@ impl RewriteExprsRecursive for Relation {
 }
 
 impl Relation {
-    pub fn contains_sys_table(&self) -> bool {
-        match self {
-            Relation::SystemTable(_) => true,
-            Relation::Subquery(s) => {
-                if let BoundSetExpr::Select(select) = &s.query.body
-                    && let Some(relation) = &select.from {
-                    relation.contains_sys_table()
-                } else {
-                    false
-                }
-            },
-            Relation::Join(j) => {
-                j.left.contains_sys_table() || j.right.contains_sys_table()
-            },
-            _ => false,
-        }
-    }
-
     pub fn is_correlated(&self, depth: Depth) -> bool {
         match self {
             Relation::Subquery(subquery) => subquery.query.is_correlated(depth),
@@ -203,6 +188,26 @@ impl Binder {
         Self::resolve_single_name(name.0, "index name")
     }
 
+    /// return the `view_name`
+    pub fn resolve_view_name(name: ObjectName) -> Result<String> {
+        Self::resolve_single_name(name.0, "view name")
+    }
+
+    /// return the `sink_name`
+    pub fn resolve_sink_name(name: ObjectName) -> Result<String> {
+        Self::resolve_single_name(name.0, "sink name")
+    }
+
+    /// return the `table_name`
+    pub fn resolve_table_name(name: ObjectName) -> Result<String> {
+        Self::resolve_single_name(name.0, "table name")
+    }
+
+    /// return the `source_name`
+    pub fn resolve_source_name(name: ObjectName) -> Result<String> {
+        Self::resolve_single_name(name.0, "source name")
+    }
+
     /// return the `user_name`
     pub fn resolve_user_name(name: ObjectName) -> Result<String> {
         Self::resolve_single_name(name.0, "user name")
@@ -393,59 +398,69 @@ impl Binder {
             TableFactor::TableFunction { name, alias, args } => {
                 let func_name = &name.0[0].real_value();
                 if func_name.eq_ignore_ascii_case(RW_INTERNAL_TABLE_FUNCTION_NAME) {
-                    self.bind_internal_table(args, alias)
-                } else if func_name.eq_ignore_ascii_case(PG_GET_KEYWORDS_FUNC_NAME)
+                    return self.bind_internal_table(args, alias);
+                }
+                if func_name.eq_ignore_ascii_case(PG_GET_KEYWORDS_FUNC_NAME)
                     || name.real_value().eq_ignore_ascii_case(
                         format!("{}.{}", PG_CATALOG_SCHEMA_NAME, PG_GET_KEYWORDS_FUNC_NAME)
                             .as_str(),
                     )
                 {
-                    self.bind_relation_by_name_inner(
+                    return self.bind_relation_by_name_inner(
                         Some(PG_CATALOG_SCHEMA_NAME),
                         PG_KEYWORDS_TABLE_NAME,
                         alias,
                         false,
-                    )
-                } else if let Ok(table_function_type) = TableFunctionType::from_str(func_name) {
-                    let args: Vec<ExprImpl> = args
-                        .into_iter()
-                        .map(|arg| self.bind_function_arg(arg))
-                        .flatten_ok()
-                        .try_collect()?;
-                    let tf = TableFunction::new(table_function_type, args)?;
-                    let columns = [(
-                        false,
-                        Field {
-                            data_type: tf.return_type(),
-                            name: tf.function_type.name().to_string(),
-                            sub_fields: vec![],
-                            type_name: "".to_string(),
-                        },
-                    )]
-                    .into_iter();
-
-                    self.bind_table_to_context(
-                        columns,
-                        tf.function_type.name().to_string(),
-                        alias,
-                    )?;
-
-                    Ok(Relation::TableFunction(Box::new(tf)))
-                } else if let Ok(kind) = WindowTableFunctionKind::from_str(func_name) {
-                    Ok(Relation::WindowTableFunction(Box::new(
+                    );
+                }
+                if let Ok(kind) = WindowTableFunctionKind::from_str(func_name) {
+                    return Ok(Relation::WindowTableFunction(Box::new(
                         self.bind_window_table_function(alias, kind, args)?,
-                    )))
-                } else if is_watermark_func(func_name) {
-                    Ok(Relation::Watermark(Box::new(
+                    )));
+                }
+                if is_watermark_func(func_name) {
+                    return Ok(Relation::Watermark(Box::new(
                         self.bind_watermark(alias, args)?,
-                    )))
+                    )));
+                };
+
+                let args: Vec<ExprImpl> = args
+                    .into_iter()
+                    .map(|arg| self.bind_function_arg(arg))
+                    .flatten_ok()
+                    .try_collect()?;
+                let tf = if let Some(func) = self
+                    .catalog
+                    .first_valid_schema(
+                        &self.db_name,
+                        &self.search_path,
+                        &self.auth_context.user_name,
+                    )?
+                    .get_function_by_name_args(
+                        func_name,
+                        &args.iter().map(|arg| arg.return_type()).collect_vec(),
+                    ) && matches!(func.kind, FunctionKind::Table { .. })
+                {
+                    TableFunction::new_user_defined(func.clone(), args)
+                } else if let Ok(table_function_type) = TableFunctionType::from_str(func_name) {
+                    TableFunction::new(table_function_type, args)?
                 } else {
-                    Err(ErrorCode::NotImplemented(
-                        format!("unknown table function kind: {}", func_name),
+                    return Err(ErrorCode::NotImplemented(
+                        format!("unknown table function: {}", func_name),
                         1191.into(),
                     )
-                    .into())
-                }
+                    .into());
+                };
+                let columns = if let DataType::Struct(s) = tf.return_type() {
+                    let schema = Schema::from(&*s);
+                    schema.fields.into_iter().map(|f| (false, f)).collect_vec()
+                } else {
+                    vec![(false, Field::with_name(tf.return_type(), tf.name()))]
+                };
+
+                self.bind_table_to_context(columns, tf.name().to_string(), alias)?;
+
+                Ok(Relation::TableFunction(Box::new(tf)))
             }
             TableFactor::Derived {
                 lateral,
diff --git a/src/frontend/src/catalog/catalog_service.rs b/src/frontend/src/catalog/catalog_service.rs
index 736cb307c0b31..04c888cc93872 100644
--- a/src/frontend/src/catalog/catalog_service.rs
+++ b/src/frontend/src/catalog/catalog_service.rs
@@ -21,10 +21,9 @@ use risingwave_common::error::ErrorCode::InternalError;
 use risingwave_common::error::{Result, RwError};
 use risingwave_common::util::column_index_mapping::ColIndexMapping;
 use risingwave_pb::catalog::{
-    Database as ProstDatabase, Function as ProstFunction, Index as ProstIndex,
-    Schema as ProstSchema, Sink as ProstSink, Source as ProstSource, Table as ProstTable,
-    View as ProstView,
+    PbDatabase, PbFunction, PbIndex, PbSchema, PbSink, PbSource, PbTable, PbView,
 };
+use risingwave_pb::ddl_service::alter_relation_name_request::Relation;
 use risingwave_pb::stream_plan::StreamFragmentGraph;
 use risingwave_rpc_client::MetaClient;
 use tokio::sync::watch::Receiver;
@@ -64,40 +63,40 @@ pub trait CatalogWriter: Send + Sync {
         owner: UserId,
     ) -> Result<()>;
 
-    async fn create_view(&self, view: ProstView) -> Result<()>;
+    async fn create_view(&self, view: PbView) -> Result<()>;
 
     async fn create_materialized_view(
         &self,
-        table: ProstTable,
+        table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<()>;
 
     async fn create_table(
         &self,
-        source: Option<ProstSource>,
-        table: ProstTable,
+        source: Option<PbSource>,
+        table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<()>;
 
     async fn replace_table(
         &self,
-        table: ProstTable,
+        table: PbTable,
         graph: StreamFragmentGraph,
         mapping: ColIndexMapping,
     ) -> Result<()>;
 
     async fn create_index(
         &self,
-        index: ProstIndex,
-        table: ProstTable,
+        index: PbIndex,
+        table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<()>;
 
-    async fn create_source(&self, source: ProstSource) -> Result<()>;
+    async fn create_source(&self, source: PbSource) -> Result<()>;
 
-    async fn create_sink(&self, sink: ProstSink, graph: StreamFragmentGraph) -> Result<()>;
+    async fn create_sink(&self, sink: PbSink, graph: StreamFragmentGraph) -> Result<()>;
 
-    async fn create_function(&self, function: ProstFunction) -> Result<()>;
+    async fn create_function(&self, function: PbFunction) -> Result<()>;
 
     async fn drop_table(&self, source_id: Option<u32>, table_id: TableId) -> Result<()>;
 
@@ -116,6 +115,16 @@ pub trait CatalogWriter: Send + Sync {
     async fn drop_index(&self, index_id: IndexId) -> Result<()>;
 
     async fn drop_function(&self, function_id: FunctionId) -> Result<()>;
+
+    async fn alter_table_name(&self, table_id: u32, table_name: &str) -> Result<()>;
+
+    async fn alter_view_name(&self, view_id: u32, view_name: &str) -> Result<()>;
+
+    async fn alter_index_name(&self, index_id: u32, index_name: &str) -> Result<()>;
+
+    async fn alter_sink_name(&self, sink_id: u32, sink_name: &str) -> Result<()>;
+
+    async fn alter_source_name(&self, source_id: u32, source_name: &str) -> Result<()>;
 }
 
 #[derive(Clone)]
@@ -129,7 +138,7 @@ impl CatalogWriter for CatalogWriterImpl {
     async fn create_database(&self, db_name: &str, owner: UserId) -> Result<()> {
         let (_, version) = self
             .meta_client
-            .create_database(ProstDatabase {
+            .create_database(PbDatabase {
                 name: db_name.to_string(),
                 id: 0,
                 owner,
@@ -146,7 +155,7 @@ impl CatalogWriter for CatalogWriterImpl {
     ) -> Result<()> {
         let (_, version) = self
             .meta_client
-            .create_schema(ProstSchema {
+            .create_schema(PbSchema {
                 id: 0,
                 name: schema_name.to_string(),
                 database_id: db_id,
@@ -159,7 +168,7 @@ impl CatalogWriter for CatalogWriterImpl {
     // TODO: maybe here to pass a materialize plan node
     async fn create_materialized_view(
         &self,
-        table: ProstTable,
+        table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<()> {
         let (_, version) = self
@@ -169,15 +178,15 @@ impl CatalogWriter for CatalogWriterImpl {
         self.wait_version(version).await
     }
 
-    async fn create_view(&self, view: ProstView) -> Result<()> {
+    async fn create_view(&self, view: PbView) -> Result<()> {
         let (_, version) = self.meta_client.create_view(view).await?;
         self.wait_version(version).await
     }
 
     async fn create_index(
         &self,
-        index: ProstIndex,
-        table: ProstTable,
+        index: PbIndex,
+        table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<()> {
         let (_, version) = self.meta_client.create_index(index, table, graph).await?;
@@ -186,8 +195,8 @@ impl CatalogWriter for CatalogWriterImpl {
 
     async fn create_table(
         &self,
-        source: Option<ProstSource>,
-        table: ProstTable,
+        source: Option<PbSource>,
+        table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<()> {
         let (_, version) = self.meta_client.create_table(source, table, graph).await?;
@@ -196,7 +205,7 @@ impl CatalogWriter for CatalogWriterImpl {
 
     async fn replace_table(
         &self,
-        table: ProstTable,
+        table: PbTable,
         graph: StreamFragmentGraph,
         mapping: ColIndexMapping,
     ) -> Result<()> {
@@ -207,17 +216,17 @@ impl CatalogWriter for CatalogWriterImpl {
         self.wait_version(version).await
     }
 
-    async fn create_source(&self, source: ProstSource) -> Result<()> {
+    async fn create_source(&self, source: PbSource) -> Result<()> {
         let (_id, version) = self.meta_client.create_source(source).await?;
         self.wait_version(version).await
     }
 
-    async fn create_sink(&self, sink: ProstSink, graph: StreamFragmentGraph) -> Result<()> {
+    async fn create_sink(&self, sink: PbSink, graph: StreamFragmentGraph) -> Result<()> {
         let (_id, version) = self.meta_client.create_sink(sink, graph).await?;
         self.wait_version(version).await
     }
 
-    async fn create_function(&self, function: ProstFunction) -> Result<()> {
+    async fn create_function(&self, function: PbFunction) -> Result<()> {
         let (_, version) = self.meta_client.create_function(function).await?;
         self.wait_version(version).await
     }
@@ -266,6 +275,46 @@ impl CatalogWriter for CatalogWriterImpl {
         let version = self.meta_client.drop_database(database_id).await?;
         self.wait_version(version).await
     }
+
+    async fn alter_table_name(&self, table_id: u32, table_name: &str) -> Result<()> {
+        let version = self
+            .meta_client
+            .alter_relation_name(Relation::TableId(table_id), table_name)
+            .await?;
+        self.wait_version(version).await
+    }
+
+    async fn alter_view_name(&self, view_id: u32, view_name: &str) -> Result<()> {
+        let version = self
+            .meta_client
+            .alter_relation_name(Relation::ViewId(view_id), view_name)
+            .await?;
+        self.wait_version(version).await
+    }
+
+    async fn alter_index_name(&self, index_id: u32, index_name: &str) -> Result<()> {
+        let version = self
+            .meta_client
+            .alter_relation_name(Relation::IndexId(index_id), index_name)
+            .await?;
+        self.wait_version(version).await
+    }
+
+    async fn alter_sink_name(&self, sink_id: u32, sink_name: &str) -> Result<()> {
+        let version = self
+            .meta_client
+            .alter_relation_name(Relation::SinkId(sink_id), sink_name)
+            .await?;
+        self.wait_version(version).await
+    }
+
+    async fn alter_source_name(&self, source_id: u32, source_name: &str) -> Result<()> {
+        let version = self
+            .meta_client
+            .alter_relation_name(Relation::SourceId(source_id), source_name)
+            .await?;
+        self.wait_version(version).await
+    }
 }
 
 impl CatalogWriterImpl {
diff --git a/src/frontend/src/catalog/database_catalog.rs b/src/frontend/src/catalog/database_catalog.rs
index c63b2aeda6669..74b5ee26985d7 100644
--- a/src/frontend/src/catalog/database_catalog.rs
+++ b/src/frontend/src/catalog/database_catalog.rs
@@ -16,7 +16,7 @@ use std::collections::HashMap;
 
 use itertools::Itertools;
 use risingwave_common::catalog::PG_CATALOG_SCHEMA_NAME;
-use risingwave_pb::catalog::{Database as ProstDatabase, Schema as ProstSchema};
+use risingwave_pb::catalog::{PbDatabase, PbSchema};
 
 use crate::catalog::schema_catalog::SchemaCatalog;
 use crate::catalog::{DatabaseId, SchemaId};
@@ -32,7 +32,7 @@ pub struct DatabaseCatalog {
 }
 
 impl DatabaseCatalog {
-    pub fn create_schema(&mut self, proto: &ProstSchema) {
+    pub fn create_schema(&mut self, proto: &PbSchema) {
         let name = proto.name.clone();
         let id = proto.id;
         let schema = proto.into();
@@ -51,11 +51,11 @@ impl DatabaseCatalog {
         self.schema_by_name.keys().cloned().collect_vec()
     }
 
-    pub fn get_all_schema_info(&self) -> Vec<ProstSchema> {
+    pub fn get_all_schema_info(&self) -> Vec<PbSchema> {
         self.schema_by_name
             .values()
             .cloned()
-            .map(|schema| ProstSchema {
+            .map(|schema| PbSchema {
                 id: schema.id(),
                 database_id: self.id,
                 name: schema.name(),
@@ -94,8 +94,8 @@ impl DatabaseCatalog {
         self.owner
     }
 }
-impl From<&ProstDatabase> for DatabaseCatalog {
-    fn from(db: &ProstDatabase) -> Self {
+impl From<&PbDatabase> for DatabaseCatalog {
+    fn from(db: &PbDatabase) -> Self {
         Self {
             id: db.id,
             name: db.name.clone(),
diff --git a/src/frontend/src/catalog/function_catalog.rs b/src/frontend/src/catalog/function_catalog.rs
index 2d2de2fd7c22b..70daeaf065b34 100644
--- a/src/frontend/src/catalog/function_catalog.rs
+++ b/src/frontend/src/catalog/function_catalog.rs
@@ -14,8 +14,8 @@
 
 use risingwave_common::catalog::FunctionId;
 use risingwave_common::types::DataType;
-use risingwave_pb::catalog::function::Kind as ProstKind;
-use risingwave_pb::catalog::Function as ProstFunction;
+use risingwave_pb::catalog::function::PbKind;
+use risingwave_pb::catalog::PbFunction;
 
 #[derive(Clone, PartialEq, Eq, Hash, Debug)]
 pub struct FunctionCatalog {
@@ -37,8 +37,8 @@ pub enum FunctionKind {
     Aggregate,
 }
 
-impl From<&ProstKind> for FunctionKind {
-    fn from(prost: &ProstKind) -> Self {
+impl From<&PbKind> for FunctionKind {
+    fn from(prost: &PbKind) -> Self {
         use risingwave_pb::catalog::function::*;
         match prost {
             Kind::Scalar(ScalarFunction {}) => Self::Scalar,
@@ -48,8 +48,8 @@ impl From<&ProstKind> for FunctionKind {
     }
 }
 
-impl From<&ProstFunction> for FunctionCatalog {
-    fn from(prost: &ProstFunction) -> Self {
+impl From<&PbFunction> for FunctionCatalog {
+    fn from(prost: &PbFunction) -> Self {
         FunctionCatalog {
             id: prost.id.into(),
             name: prost.name.clone(),
diff --git a/src/frontend/src/catalog/index_catalog.rs b/src/frontend/src/catalog/index_catalog.rs
index f0ac7a0fac776..1763cfbc18bca 100644
--- a/src/frontend/src/catalog/index_catalog.rs
+++ b/src/frontend/src/catalog/index_catalog.rs
@@ -19,12 +19,13 @@ use itertools::Itertools;
 use risingwave_common::catalog::IndexId;
 use risingwave_common::types::DataType;
 use risingwave_common::util::sort_util::ColumnOrder;
-use risingwave_pb::catalog::Index as ProstIndex;
+use risingwave_pb::catalog::PbIndex;
 use risingwave_pb::expr::expr_node::RexNode;
 
 use super::ColumnId;
-use crate::catalog::{DatabaseId, SchemaId, TableCatalog};
+use crate::catalog::{DatabaseId, RelationCatalog, SchemaId, TableCatalog};
 use crate::expr::{Expr, InputRef};
+use crate::user::UserId;
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct IndexCatalog {
@@ -50,7 +51,7 @@ pub struct IndexCatalog {
 
 impl IndexCatalog {
     pub fn build_from(
-        index_prost: &ProstIndex,
+        index_prost: &PbIndex,
         index_table: &TableCatalog,
         primary_table: &TableCatalog,
     ) -> Self {
@@ -134,8 +135,8 @@ impl IndexCatalog {
         &self.primary_to_secondary_mapping
     }
 
-    pub fn to_prost(&self, schema_id: SchemaId, database_id: DatabaseId) -> ProstIndex {
-        ProstIndex {
+    pub fn to_prost(&self, schema_id: SchemaId, database_id: DatabaseId) -> PbIndex {
+        PbIndex {
             id: self.id.index_id,
             schema_id,
             database_id,
@@ -152,3 +153,9 @@ impl IndexCatalog {
         }
     }
 }
+
+impl RelationCatalog for IndexCatalog {
+    fn owner(&self) -> UserId {
+        self.index_table.owner
+    }
+}
diff --git a/src/frontend/src/catalog/mod.rs b/src/frontend/src/catalog/mod.rs
index 84bd7cd860a23..dc4d9e9729683 100644
--- a/src/frontend/src/catalog/mod.rs
+++ b/src/frontend/src/catalog/mod.rs
@@ -47,7 +47,6 @@ pub(crate) type SchemaId = u32;
 pub(crate) type TableId = risingwave_common::catalog::TableId;
 pub(crate) type ColumnId = risingwave_common::catalog::ColumnId;
 pub(crate) type FragmentId = u32;
-pub(crate) type ConflictBehaviorType = i32;
 
 /// Check if the column name does not conflict with the internally reserved column name.
 pub fn check_valid_column_name(column_name: &str) -> Result<()> {
diff --git a/src/frontend/src/catalog/root_catalog.rs b/src/frontend/src/catalog/root_catalog.rs
index 5077b6e4a2b6e..b563dd38bb8e4 100644
--- a/src/frontend/src/catalog/root_catalog.rs
+++ b/src/frontend/src/catalog/root_catalog.rs
@@ -21,9 +21,7 @@ use risingwave_common::session_config::{SearchPath, USER_NAME_WILD_CARD};
 use risingwave_common::types::DataType;
 use risingwave_connector::sink::catalog::SinkCatalog;
 use risingwave_pb::catalog::{
-    Database as ProstDatabase, Function as ProstFunction, Index as ProstIndex,
-    Schema as ProstSchema, Sink as ProstSink, Source as ProstSource, Table as ProstTable,
-    View as ProstView,
+    PbDatabase, PbFunction, PbIndex, PbSchema, PbSink, PbSource, PbTable, PbView,
 };
 
 use super::function_catalog::FunctionCatalog;
@@ -122,7 +120,7 @@ impl Catalog {
         self.table_by_id.clear();
     }
 
-    pub fn create_database(&mut self, db: &ProstDatabase) {
+    pub fn create_database(&mut self, db: &PbDatabase) {
         let name = db.name.clone();
         let id = db.id;
 
@@ -132,7 +130,7 @@ impl Catalog {
         self.db_name_by_id.try_insert(id, name).unwrap();
     }
 
-    pub fn create_schema(&mut self, proto: &ProstSchema) {
+    pub fn create_schema(&mut self, proto: &PbSchema) {
         self.get_database_mut(proto.database_id)
             .unwrap()
             .create_schema(proto);
@@ -148,7 +146,7 @@ impl Catalog {
         }
     }
 
-    pub fn create_table(&mut self, proto: &ProstTable) {
+    pub fn create_table(&mut self, proto: &PbTable) {
         self.table_by_id.insert(proto.id.into(), proto.into());
         self.get_database_mut(proto.database_id)
             .unwrap()
@@ -157,7 +155,7 @@ impl Catalog {
             .create_table(proto);
     }
 
-    pub fn create_index(&mut self, proto: &ProstIndex) {
+    pub fn create_index(&mut self, proto: &PbIndex) {
         self.get_database_mut(proto.database_id)
             .unwrap()
             .get_schema_mut(proto.schema_id)
@@ -165,7 +163,7 @@ impl Catalog {
             .create_index(proto);
     }
 
-    pub fn create_source(&mut self, proto: &ProstSource) {
+    pub fn create_source(&mut self, proto: &PbSource) {
         self.get_database_mut(proto.database_id)
             .unwrap()
             .get_schema_mut(proto.schema_id)
@@ -173,7 +171,7 @@ impl Catalog {
             .create_source(proto);
     }
 
-    pub fn create_sink(&mut self, proto: &ProstSink) {
+    pub fn create_sink(&mut self, proto: &PbSink) {
         self.get_database_mut(proto.database_id)
             .unwrap()
             .get_schema_mut(proto.schema_id)
@@ -181,7 +179,7 @@ impl Catalog {
             .create_sink(proto);
     }
 
-    pub fn create_view(&mut self, proto: &ProstView) {
+    pub fn create_view(&mut self, proto: &PbView) {
         self.get_database_mut(proto.database_id)
             .unwrap()
             .get_schema_mut(proto.schema_id)
@@ -189,7 +187,7 @@ impl Catalog {
             .create_view(proto);
     }
 
-    pub fn create_function(&mut self, proto: &ProstFunction) {
+    pub fn create_function(&mut self, proto: &PbFunction) {
         self.get_database_mut(proto.database_id)
             .unwrap()
             .get_schema_mut(proto.schema_id)
@@ -215,7 +213,7 @@ impl Catalog {
             .drop_table(tb_id);
     }
 
-    pub fn update_table(&mut self, proto: &ProstTable) {
+    pub fn update_table(&mut self, proto: &PbTable) {
         self.table_by_id.insert(proto.id.into(), proto.into());
         self.get_database_mut(proto.database_id)
             .unwrap()
@@ -224,6 +222,14 @@ impl Catalog {
             .update_table(proto);
     }
 
+    pub fn update_index(&mut self, proto: &PbIndex) {
+        self.get_database_mut(proto.database_id)
+            .unwrap()
+            .get_schema_mut(proto.schema_id)
+            .unwrap()
+            .update_index(proto);
+    }
+
     pub fn drop_source(&mut self, db_id: DatabaseId, schema_id: SchemaId, source_id: SourceId) {
         self.get_database_mut(db_id)
             .unwrap()
@@ -232,6 +238,14 @@ impl Catalog {
             .drop_source(source_id);
     }
 
+    pub fn update_source(&mut self, proto: &PbSource) {
+        self.get_database_mut(proto.database_id)
+            .unwrap()
+            .get_schema_mut(proto.schema_id)
+            .unwrap()
+            .update_source(proto);
+    }
+
     pub fn drop_sink(&mut self, db_id: DatabaseId, schema_id: SchemaId, sink_id: SinkId) {
         self.get_database_mut(db_id)
             .unwrap()
@@ -240,6 +254,14 @@ impl Catalog {
             .drop_sink(sink_id);
     }
 
+    pub fn update_sink(&mut self, proto: &PbSink) {
+        self.get_database_mut(proto.database_id)
+            .unwrap()
+            .get_schema_mut(proto.schema_id)
+            .unwrap()
+            .update_sink(proto);
+    }
+
     pub fn drop_index(&mut self, db_id: DatabaseId, schema_id: SchemaId, index_id: IndexId) {
         self.get_database_mut(db_id)
             .unwrap()
@@ -256,6 +278,14 @@ impl Catalog {
             .drop_view(view_id);
     }
 
+    pub fn update_view(&mut self, proto: &PbView) {
+        self.get_database_mut(proto.database_id)
+            .unwrap()
+            .get_schema_mut(proto.schema_id)
+            .unwrap()
+            .update_view(proto);
+    }
+
     pub fn drop_function(
         &mut self,
         db_id: DatabaseId,
@@ -289,7 +319,7 @@ impl Catalog {
         Ok(self.get_database_by_name(db_name)?.get_all_schema_names())
     }
 
-    pub fn get_all_schema_info(&self, db_name: &str) -> CatalogResult<Vec<ProstSchema>> {
+    pub fn get_all_schema_info(&self, db_name: &str) -> CatalogResult<Vec<PbSchema>> {
         Ok(self.get_database_by_name(db_name)?.get_all_schema_info())
     }
 
@@ -373,6 +403,30 @@ impl Catalog {
             .ok_or_else(|| CatalogError::NotFound("table id", table_id.to_string()))
     }
 
+    // Used by test_utils only.
+    pub fn alter_table_name_by_id(&mut self, table_id: &TableId, table_name: &str) {
+        let (mut database_id, mut schema_id) = (0, 0);
+        let mut found = false;
+        for database in self.database_by_name.values() {
+            if !found {
+                for schema in database.iter_schemas() {
+                    if schema.iter_table().any(|t| t.id() == *table_id) {
+                        found = true;
+                        database_id = database.id();
+                        schema_id = schema.id();
+                        break;
+                    }
+                }
+            }
+        }
+
+        if found {
+            let mut table = self.get_table_by_id(table_id).unwrap();
+            table.name = table_name.to_string();
+            self.update_table(&table.to_prost(schema_id, database_id));
+        }
+    }
+
     #[cfg(test)]
     pub fn insert_table_id_mapping(&mut self, table_id: TableId, fragment_id: super::FragmentId) {
         self.table_by_id.insert(
diff --git a/src/frontend/src/catalog/schema_catalog.rs b/src/frontend/src/catalog/schema_catalog.rs
index 1e1862965b84a..e2bea264d915c 100644
--- a/src/frontend/src/catalog/schema_catalog.rs
+++ b/src/frontend/src/catalog/schema_catalog.rs
@@ -19,10 +19,7 @@ use std::sync::Arc;
 use risingwave_common::catalog::{valid_table_name, FunctionId, IndexId, TableId};
 use risingwave_common::types::DataType;
 use risingwave_connector::sink::catalog::SinkCatalog;
-use risingwave_pb::catalog::{
-    Function as ProstFunction, Index as ProstIndex, Schema as ProstSchema, Sink as ProstSink,
-    Source as ProstSource, Table as ProstTable, View as ProstView,
-};
+use risingwave_pb::catalog::{PbFunction, PbIndex, PbSchema, PbSink, PbSource, PbTable, PbView};
 
 use super::source_catalog::SourceCatalog;
 use super::ViewId;
@@ -60,7 +57,7 @@ pub struct SchemaCatalog {
 }
 
 impl SchemaCatalog {
-    pub fn create_table(&mut self, prost: &ProstTable) {
+    pub fn create_table(&mut self, prost: &PbTable) {
         let name = prost.name.clone();
         let id = prost.id.into();
         let table: TableCatalog = prost.into();
@@ -78,23 +75,61 @@ impl SchemaCatalog {
             .unwrap();
     }
 
-    pub fn update_table(&mut self, prost: &ProstTable) {
+    pub fn update_table(&mut self, prost: &PbTable) {
         let name = prost.name.clone();
         let id = prost.id.into();
         let table: TableCatalog = prost.into();
         let table_ref = Arc::new(table);
 
+        let old_table = self.table_by_id.get(&id).unwrap();
+        // check if table name get updated.
+        if old_table.name() != name {
+            self.table_by_name.remove(old_table.name());
+        }
         self.table_by_name.insert(name, table_ref.clone());
         self.table_by_id.insert(id, table_ref);
     }
 
+    pub fn update_index(&mut self, prost: &PbIndex) {
+        let name = prost.name.clone();
+        let id = prost.id.into();
+        let old_index = self.index_by_id.get(&id).unwrap();
+        let index_table = self.get_table_by_id(&prost.index_table_id.into()).unwrap();
+        let primary_table = self
+            .get_table_by_id(&prost.primary_table_id.into())
+            .unwrap();
+        let index: IndexCatalog = IndexCatalog::build_from(prost, index_table, primary_table);
+        let index_ref = Arc::new(index);
+
+        // check if index name get updated.
+        if old_index.name != name {
+            self.index_by_name.remove(&old_index.name);
+        }
+        self.index_by_name.insert(name, index_ref.clone());
+        self.index_by_id.insert(id, index_ref.clone());
+
+        match self.indexes_by_table_id.entry(index_ref.primary_table.id) {
+            Occupied(mut entry) => {
+                let pos = entry
+                    .get()
+                    .iter()
+                    .position(|x| x.id == index_ref.id)
+                    .unwrap();
+                *entry.get_mut().get_mut(pos).unwrap() = index_ref;
+            }
+            Vacant(_entry) => {
+                unreachable!()
+            }
+        };
+    }
+
     pub fn drop_table(&mut self, id: TableId) {
         let table_ref = self.table_by_id.remove(&id).unwrap();
         self.table_by_name.remove(&table_ref.name).unwrap();
         self.indexes_by_table_id.remove(&table_ref.id);
     }
 
-    pub fn create_index(&mut self, prost: &ProstIndex) {
+    pub fn create_index(&mut self, prost: &PbIndex) {
         let name = prost.name.clone();
         let id = prost.id.into();
 
@@ -135,7 +170,7 @@ impl SchemaCatalog {
         };
     }
 
-    pub fn create_source(&mut self, prost: &ProstSource) {
+    pub fn create_source(&mut self, prost: &PbSource) {
         let name = prost.name.clone();
         let id = prost.id;
         let source = SourceCatalog::from(prost);
@@ -152,7 +187,23 @@ impl SchemaCatalog {
         self.source_by_name.remove(&source_ref.name).unwrap();
     }
 
-    pub fn create_sink(&mut self, prost: &ProstSink) {
+    pub fn update_source(&mut self, prost: &PbSource) {
+        let name = prost.name.clone();
+        let id = prost.id;
+        let source = SourceCatalog::from(prost);
+        let source_ref = Arc::new(source);
+
+        let old_source = self.source_by_id.get(&id).unwrap();
+        // check if source name get updated.
+        if old_source.name != name {
+            self.source_by_name.remove(&old_source.name);
+        }
+
+        self.source_by_name.insert(name, source_ref.clone());
+        self.source_by_id.insert(id, source_ref);
+    }
+
+    pub fn create_sink(&mut self, prost: &PbSink) {
         let name = prost.name.clone();
         let id = prost.id;
         let sink = SinkCatalog::from(prost);
@@ -169,7 +220,23 @@ impl SchemaCatalog {
         self.sink_by_name.remove(&sink_ref.name).unwrap();
     }
 
-    pub fn create_view(&mut self, prost: &ProstView) {
+    pub fn update_sink(&mut self, prost: &PbSink) {
+        let name = prost.name.clone();
+        let id = prost.id;
+        let sink = SinkCatalog::from(prost);
+        let sink_ref = Arc::new(sink);
+
+        let old_sink = self.sink_by_id.get(&id).unwrap();
+        // check if sink name get updated.
+        if old_sink.name != name {
+            self.sink_by_name.remove(&old_sink.name);
+        }
+
+        self.sink_by_name.insert(name, sink_ref.clone());
+        self.sink_by_id.insert(id, sink_ref);
+    }
+
+    pub fn create_view(&mut self, prost: &PbView) {
         let name = prost.name.clone();
         let id = prost.id;
         let view = ViewCatalog::from(prost);
@@ -186,7 +253,23 @@ impl SchemaCatalog {
         self.view_by_name.remove(&view_ref.name).unwrap();
     }
 
-    pub fn create_function(&mut self, prost: &ProstFunction) {
+    pub fn update_view(&mut self, prost: &PbView) {
+        let name = prost.name.clone();
+        let id = prost.id;
+        let view = ViewCatalog::from(prost);
+        let view_ref = Arc::new(view);
+
+        let old_view = self.view_by_id.get(&id).unwrap();
+        // check if view name get updated.
+        if old_view.name != name {
+            self.view_by_name.remove(&old_view.name);
+        }
+
+        self.view_by_name.insert(name, view_ref.clone());
+        self.view_by_id.insert(id, view_ref);
+    }
+
+    pub fn create_function(&mut self, prost: &PbFunction) {
         let name = prost.name.clone();
         let id = prost.id;
         let function = FunctionCatalog::from(prost);
@@ -331,8 +414,8 @@ impl SchemaCatalog {
     }
 }
 
-impl From<&ProstSchema> for SchemaCatalog {
-    fn from(schema: &ProstSchema) -> Self {
+impl From<&PbSchema> for SchemaCatalog {
+    fn from(schema: &PbSchema) -> Self {
         Self {
             id: schema.id,
             owner: schema.owner,
diff --git a/src/frontend/src/catalog/source_catalog.rs b/src/frontend/src/catalog/source_catalog.rs
index a25b89413faa9..687604e5b5bad 100644
--- a/src/frontend/src/catalog/source_catalog.rs
+++ b/src/frontend/src/catalog/source_catalog.rs
@@ -15,14 +15,14 @@
 use std::collections::BTreeMap;
 
 use risingwave_common::catalog::ColumnCatalog;
-use risingwave_pb::catalog::{Source as ProstSource, StreamSourceInfo, WatermarkDesc};
+use risingwave_pb::catalog::{PbSource, StreamSourceInfo, WatermarkDesc};
 
 use super::{ColumnId, RelationCatalog, SourceId};
 use crate::user::UserId;
 use crate::WithOptions;
 
 /// This struct `SourceCatalog` is used in frontend.
-/// Compared with `ProstSource`, it only maintains information used during optimization.
+/// Compared with `PbSource`, it only maintains information used during optimization.
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct SourceCatalog {
     pub id: SourceId,
@@ -37,8 +37,8 @@ pub struct SourceCatalog {
     pub watermark_descs: Vec<WatermarkDesc>,
 }
 
-impl From<&ProstSource> for SourceCatalog {
-    fn from(prost: &ProstSource) -> Self {
+impl From<&PbSource> for SourceCatalog {
+    fn from(prost: &PbSource) -> Self {
         let id = prost.id;
         let name = prost.name.clone();
         let prost_columns = prost.columns.clone();
diff --git a/src/frontend/src/catalog/system_catalog/mod.rs b/src/frontend/src/catalog/system_catalog/mod.rs
index 8bdd8c5fbebe2..b2ef50bf96585 100644
--- a/src/frontend/src/catalog/system_catalog/mod.rs
+++ b/src/frontend/src/catalog/system_catalog/mod.rs
@@ -131,6 +131,7 @@ macro_rules! def_sys_catalog {
                         name: col.1.to_string(),
                         field_descs: vec![],
                         type_name: "".to_string(),
+                        generated_column: None,
                     },
                     is_hidden: false,
                 })
diff --git a/src/frontend/src/catalog/system_catalog/pg_catalog/mod.rs b/src/frontend/src/catalog/system_catalog/pg_catalog/mod.rs
index 75086c5d2dfc0..9af5a4edd54c4 100644
--- a/src/frontend/src/catalog/system_catalog/pg_catalog/mod.rs
+++ b/src/frontend/src/catalog/system_catalog/pg_catalog/mod.rs
@@ -67,7 +67,7 @@ pub use pg_views::*;
 use risingwave_common::array::ListValue;
 use risingwave_common::error::Result;
 use risingwave_common::row::OwnedRow;
-use risingwave_common::types::{NaiveDateTimeWrapper, ScalarImpl};
+use risingwave_common::types::{ScalarImpl, Timestamp};
 use risingwave_common::util::epoch::Epoch;
 use risingwave_common::util::iter_util::ZipEqDebug;
 use risingwave_pb::user::grant_privilege::{Action, Object};
@@ -201,11 +201,11 @@ impl SysCatalogReaderImpl {
                 return None;
             }
             let time_millis = Epoch::from(epoch).as_unix_millis();
-            NaiveDateTimeWrapper::with_secs_nsecs(
+            Timestamp::with_secs_nsecs(
                 (time_millis / 1000) as i64,
                 (time_millis % 1000 * 1_000_000) as u32,
             )
-            .map(ScalarImpl::NaiveDateTime)
+            .map(ScalarImpl::Timestamp)
             .ok()
         };
         let meta_snapshots = self
diff --git a/src/frontend/src/catalog/table_catalog.rs b/src/frontend/src/catalog/table_catalog.rs
index 779409d4a1254..91b2ebd703ccd 100644
--- a/src/frontend/src/catalog/table_catalog.rs
+++ b/src/frontend/src/catalog/table_catalog.rs
@@ -16,16 +16,16 @@ use std::collections::{HashMap, HashSet};
 
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
-use risingwave_common::catalog::{ColumnCatalog, TableDesc, TableId, TableVersionId};
+use risingwave_common::catalog::{
+    ColumnCatalog, ConflictBehavior, TableDesc, TableId, TableVersionId,
+};
 use risingwave_common::constants::hummock::TABLE_OPTION_DUMMY_RETENTION_SECOND;
 use risingwave_common::error::{ErrorCode, RwError};
 use risingwave_common::util::sort_util::ColumnOrder;
-use risingwave_pb::catalog::table::{
-    OptionalAssociatedSourceId, TableType as ProstTableType, TableVersion as ProstTableVersion,
-};
-use risingwave_pb::catalog::Table as ProstTable;
+use risingwave_pb::catalog::table::{OptionalAssociatedSourceId, PbTableType, PbTableVersion};
+use risingwave_pb::catalog::PbTable;
 
-use super::{ColumnId, ConflictBehaviorType, DatabaseId, FragmentId, RelationCatalog, SchemaId};
+use super::{ColumnId, DatabaseId, FragmentId, RelationCatalog, SchemaId};
 use crate::user::UserId;
 use crate::WithOptions;
 
@@ -115,7 +115,10 @@ pub struct TableCatalog {
     /// The full `CREATE TABLE` or `CREATE MATERIALIZED VIEW` definition of the table.
     pub definition: String,
 
-    pub conflict_behavior_type: ConflictBehaviorType,
+    /// The behavior of handling incoming pk conflict from source executor, we can overwrite or
+    /// ignore conflict pk. For normal materialize executor and other executors, this field will be
+    /// `No Check`.
+    pub conflict_behavior: ConflictBehavior,
 
     pub read_prefix_len_hint: usize,
 
@@ -150,27 +153,27 @@ impl Default for TableType {
 }
 
 impl TableType {
-    fn from_prost(prost: ProstTableType) -> Self {
+    fn from_prost(prost: PbTableType) -> Self {
         match prost {
-            ProstTableType::Table => Self::Table,
-            ProstTableType::MaterializedView => Self::MaterializedView,
-            ProstTableType::Index => Self::Index,
-            ProstTableType::Internal => Self::Internal,
-            ProstTableType::Unspecified => unreachable!(),
+            PbTableType::Table => Self::Table,
+            PbTableType::MaterializedView => Self::MaterializedView,
+            PbTableType::Index => Self::Index,
+            PbTableType::Internal => Self::Internal,
+            PbTableType::Unspecified => unreachable!(),
         }
     }
 
-    fn to_prost(self) -> ProstTableType {
+    pub(crate) fn to_prost(self) -> PbTableType {
         match self {
-            Self::Table => ProstTableType::Table,
-            Self::MaterializedView => ProstTableType::MaterializedView,
-            Self::Index => ProstTableType::Index,
-            Self::Internal => ProstTableType::Internal,
+            Self::Table => PbTableType::Table,
+            Self::MaterializedView => PbTableType::MaterializedView,
+            Self::Index => PbTableType::Index,
+            Self::Internal => PbTableType::Internal,
         }
     }
 }
 
-/// The version of a table, used by schema change. See [`ProstTableVersion`].
+/// The version of a table, used by schema change. See [`PbTableVersion`].
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct TableVersion {
     pub version_id: TableVersionId,
@@ -189,15 +192,15 @@ impl TableVersion {
         }
     }
 
-    pub fn from_prost(prost: ProstTableVersion) -> Self {
+    pub fn from_prost(prost: PbTableVersion) -> Self {
         Self {
             version_id: prost.version,
             next_column_id: ColumnId::from(prost.next_column_id),
         }
     }
 
-    pub fn to_prost(&self) -> ProstTableVersion {
-        ProstTableVersion {
+    pub fn to_prost(&self) -> PbTableVersion {
+        PbTableVersion {
             version: self.version_id,
             next_column_id: self.next_column_id.into(),
         }
@@ -215,8 +218,8 @@ impl TableCatalog {
         self
     }
 
-    pub fn conflict_behavior_type(&self) -> ConflictBehaviorType {
-        self.conflict_behavior_type
+    pub fn conflict_behavior(&self) -> ConflictBehavior {
+        self.conflict_behavior
     }
 
     pub fn table_type(&self) -> TableType {
@@ -315,7 +318,7 @@ impl TableCatalog {
         self.distribution_key.as_ref()
     }
 
-    pub fn to_internal_table_prost(&self) -> ProstTable {
+    pub fn to_internal_table_prost(&self) -> PbTable {
         use risingwave_common::catalog::{DatabaseId, SchemaId};
         self.to_prost(
             SchemaId::placeholder().schema_id,
@@ -338,8 +341,8 @@ impl TableCatalog {
         self.version().map(|v| v.version_id)
     }
 
-    pub fn to_prost(&self, schema_id: SchemaId, database_id: DatabaseId) -> ProstTable {
-        ProstTable {
+    pub fn to_prost(&self, schema_id: SchemaId, database_id: DatabaseId) -> PbTable {
+        PbTable {
             id: self.id.table_id,
             schema_id,
             database_id,
@@ -369,14 +372,33 @@ impl TableCatalog {
             version: self.version.as_ref().map(TableVersion::to_prost),
             watermark_indices: self.watermark_columns.ones().map(|x| x as _).collect_vec(),
             dist_key_in_pk: self.dist_key_in_pk.iter().map(|x| *x as _).collect(),
-            handle_pk_conflict_behavior: self.conflict_behavior_type,
+            handle_pk_conflict_behavior: self.conflict_behavior.to_protobuf().into(),
         }
     }
+
+    /// Get columns excluding hidden columns and generated golumns.
+    pub fn columns_to_insert(&self) -> impl Iterator<Item = &ColumnCatalog> {
+        self.columns
+            .iter()
+            .filter(|c| !c.is_hidden() && !c.is_generated())
+    }
+
+    pub fn generated_column_names(&self) -> impl Iterator<Item = &str> {
+        self.columns
+            .iter()
+            .filter(|c| c.is_generated())
+            .map(|c| c.name())
+    }
+
+    pub fn has_generated_column(&self) -> bool {
+        self.columns.iter().any(|c| c.is_generated())
+    }
 }
 
-impl From<ProstTable> for TableCatalog {
-    fn from(tb: ProstTable) -> Self {
+impl From<PbTable> for TableCatalog {
+    fn from(tb: PbTable) -> Self {
         let id = tb.id;
+        let tb_conflict_behavior = tb.handle_pk_conflict_behavior();
         let table_type = tb.get_table_type().unwrap();
         let associated_source_id = tb.optional_associated_source_id.map(|id| match id {
             OptionalAssociatedSourceId::AssociatedSourceId(id) => id,
@@ -384,6 +406,8 @@ impl From<ProstTable> for TableCatalog {
         let name = tb.name.clone();
         let mut col_names = HashSet::new();
         let mut col_index: HashMap<i32, usize> = HashMap::new();
+
+        let conflict_behavior = ConflictBehavior::from_protobuf(&tb_conflict_behavior);
         let columns: Vec<ColumnCatalog> = tb.columns.into_iter().map(ColumnCatalog::from).collect();
         for (idx, catalog) in columns.clone().into_iter().enumerate() {
             let col_name = catalog.name();
@@ -397,12 +421,10 @@ impl From<ProstTable> for TableCatalog {
 
         let pk = tb.pk.iter().map(ColumnOrder::from_protobuf).collect();
         let mut watermark_columns = FixedBitSet::with_capacity(columns.len());
-        for idx in tb.watermark_indices {
-            watermark_columns.insert(idx as _);
+        for idx in &tb.watermark_indices {
+            watermark_columns.insert(*idx as _);
         }
 
-        let conflict_behavior_type = tb.handle_pk_conflict_behavior;
-
         Self {
             id: id.into(),
             associated_source_id: associated_source_id.map(Into::into),
@@ -424,7 +446,7 @@ impl From<ProstTable> for TableCatalog {
             row_id_index: tb.row_id_index.map(|x| x as usize),
             value_indices: tb.value_indices.iter().map(|x| *x as _).collect(),
             definition: tb.definition,
-            conflict_behavior_type,
+            conflict_behavior,
             read_prefix_len_hint: tb.read_prefix_len_hint as usize,
             version: tb.version.map(TableVersion::from_prost),
             watermark_columns,
@@ -433,8 +455,8 @@ impl From<ProstTable> for TableCatalog {
     }
 }
 
-impl From<&ProstTable> for TableCatalog {
-    fn from(tb: &ProstTable) -> Self {
+impl From<&PbTable> for TableCatalog {
+    fn from(tb: &PbTable) -> Self {
         tb.clone().into()
     }
 }
@@ -456,10 +478,8 @@ mod tests {
     use risingwave_common::test_prelude::*;
     use risingwave_common::types::*;
     use risingwave_common::util::sort_util::OrderType;
-    use risingwave_pb::catalog::Table as ProstTable;
-    use risingwave_pb::plan_common::{
-        ColumnCatalog as ProstColumnCatalog, ColumnDesc as ProstColumnDesc,
-    };
+    use risingwave_pb::catalog::PbTable;
+    use risingwave_pb::plan_common::{PbColumnCatalog, PbColumnDesc};
 
     use super::*;
     use crate::catalog::table_catalog::{TableCatalog, TableType};
@@ -467,33 +487,25 @@ mod tests {
 
     #[test]
     fn test_into_table_catalog() {
-        let table: TableCatalog = ProstTable {
+        let table: TableCatalog = PbTable {
             id: 0,
             schema_id: 0,
             database_id: 0,
             name: "test".to_string(),
-            table_type: ProstTableType::Table as i32,
+            table_type: PbTableType::Table as i32,
             columns: vec![
-                ProstColumnCatalog {
+                PbColumnCatalog {
                     column_desc: Some((&row_id_column_desc()).into()),
                     is_hidden: true,
                 },
-                ProstColumnCatalog {
-                    column_desc: Some(ProstColumnDesc::new_struct(
+                PbColumnCatalog {
+                    column_desc: Some(PbColumnDesc::new_struct(
                         "country",
                         1,
                         ".test.Country",
                         vec![
-                            ProstColumnDesc::new_atomic(
-                                DataType::Varchar.to_protobuf(),
-                                "address",
-                                2,
-                            ),
-                            ProstColumnDesc::new_atomic(
-                                DataType::Varchar.to_protobuf(),
-                                "zipcode",
-                                3,
-                            ),
+                            PbColumnDesc::new_atomic(DataType::Varchar.to_protobuf(), "address", 2),
+                            PbColumnDesc::new_atomic(DataType::Varchar.to_protobuf(), "zipcode", 3),
                         ],
                     )),
                     is_hidden: false,
@@ -517,12 +529,12 @@ mod tests {
             read_prefix_len_hint: 0,
             vnode_col_index: None,
             row_id_index: None,
-            version: Some(ProstTableVersion {
+            version: Some(PbTableVersion {
                 version: 0,
                 next_column_id: 2,
             }),
             watermark_indices: vec![],
-            handle_pk_conflict_behavior: 0,
+            handle_pk_conflict_behavior: 3,
             dist_key_in_pk: vec![],
         }
         .into();
@@ -545,22 +557,11 @@ mod tests {
                             column_id: ColumnId::new(1),
                             name: "country".to_string(),
                             field_descs: vec![
-                                ColumnDesc {
-                                    data_type: DataType::Varchar,
-                                    column_id: ColumnId::new(2),
-                                    name: "address".to_string(),
-                                    field_descs: vec![],
-                                    type_name: String::new(),
-                                },
-                                ColumnDesc {
-                                    data_type: DataType::Varchar,
-                                    column_id: ColumnId::new(3),
-                                    name: "zipcode".to_string(),
-                                    field_descs: vec![],
-                                    type_name: String::new(),
-                                }
+                                ColumnDesc::new_atomic(DataType::Varchar, "address", 2),
+                                ColumnDesc::new_atomic(DataType::Varchar, "zipcode", 3),
                             ],
-                            type_name: ".test.Country".to_string()
+                            type_name: ".test.Country".to_string(),
+                            generated_column: None,
                         },
                         is_hidden: false
                     }
@@ -579,7 +580,7 @@ mod tests {
                 row_id_index: None,
                 value_indices: vec![0],
                 definition: "".into(),
-                conflict_behavior_type: 0,
+                conflict_behavior: ConflictBehavior::NoCheck,
                 read_prefix_len_hint: 0,
                 version: Some(TableVersion::new_initial_for_test(ColumnId::new(1))),
                 watermark_columns: FixedBitSet::with_capacity(2),
diff --git a/src/frontend/src/catalog/view_catalog.rs b/src/frontend/src/catalog/view_catalog.rs
index 71401657592c4..24334e237cc2d 100644
--- a/src/frontend/src/catalog/view_catalog.rs
+++ b/src/frontend/src/catalog/view_catalog.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use risingwave_common::catalog::Field;
-use risingwave_pb::catalog::View as ProstView;
+use risingwave_pb::catalog::PbView;
 
 use super::{RelationCatalog, ViewId};
 use crate::user::UserId;
@@ -30,8 +30,8 @@ pub struct ViewCatalog {
     pub columns: Vec<Field>,
 }
 
-impl From<&ProstView> for ViewCatalog {
-    fn from(view: &ProstView) -> Self {
+impl From<&PbView> for ViewCatalog {
+    fn from(view: &PbView) -> Self {
         ViewCatalog {
             id: view.id,
             name: view.name.clone(),
diff --git a/src/frontend/src/expr/function_call.rs b/src/frontend/src/expr/function_call.rs
index 1ec6593d2c79e..4c3fffb0b1a36 100644
--- a/src/frontend/src/expr/function_call.rs
+++ b/src/frontend/src/expr/function_call.rs
@@ -223,18 +223,15 @@ impl FunctionCall {
         let expr_type = func_types.remove(0);
         match expr_type {
             ExprType::Some | ExprType::All => {
-                let ensure_return_boolean = |return_type: &DataType| {
-                    if &DataType::Boolean == return_type {
-                        Ok(())
-                    } else {
-                        Err(ErrorCode::BindError(
-                            "op ANY/ALL (array) requires operator to yield boolean".to_string(),
-                        ))
-                    }
-                };
-
                 let return_type = infer_some_all(func_types, &mut inputs)?;
-                ensure_return_boolean(&return_type)?;
+
+                if return_type != DataType::Boolean {
+                    return Err(ErrorCode::BindError(format!(
+                        "op ANY/ALL (array) requires operator to yield boolean, but got {:?}",
+                        return_type
+                    ))
+                    .into());
+                }
 
                 Ok(FunctionCall::new_unchecked(expr_type, inputs, return_type).into())
             }
diff --git a/src/frontend/src/expr/input_ref.rs b/src/frontend/src/expr/input_ref.rs
index 7a7d361303ce0..58732392b6f3e 100644
--- a/src/frontend/src/expr/input_ref.rs
+++ b/src/frontend/src/expr/input_ref.rs
@@ -17,7 +17,7 @@ use std::fmt;
 use itertools::Itertools;
 use risingwave_common::catalog::Schema;
 use risingwave_common::types::DataType;
-use risingwave_pb::expr::InputRef as ProstInputRef;
+use risingwave_pb::expr::PbInputRef;
 
 use super::Expr;
 use crate::expr::ExprType;
@@ -108,8 +108,8 @@ impl InputRef {
     }
 
     /// Convert to protobuf.
-    pub fn to_proto(&self) -> ProstInputRef {
-        ProstInputRef {
+    pub fn to_proto(&self) -> PbInputRef {
+        PbInputRef {
             index: self.index as _,
             r#type: Some(self.data_type.to_protobuf()),
         }
diff --git a/src/frontend/src/expr/literal.rs b/src/frontend/src/expr/literal.rs
index 716b1d096fdc4..2cc42bea857a6 100644
--- a/src/frontend/src/expr/literal.rs
+++ b/src/frontend/src/expr/literal.rs
@@ -16,7 +16,7 @@ use risingwave_common::array::list_array::display_for_explain;
 use risingwave_common::types::to_text::ToText;
 use risingwave_common::types::{literal_type_match, DataType, Datum};
 use risingwave_common::util::value_encoding::{deserialize_datum, serialize_datum};
-use risingwave_pb::data::Datum as ProstDatum;
+use risingwave_pb::data::PbDatum;
 use risingwave_pb::expr::expr_node::RexNode;
 
 use super::Expr;
@@ -110,7 +110,7 @@ impl Expr for Literal {
 /// Convert a literal value (datum) into protobuf.
 fn literal_to_value_encoding(d: &Datum) -> RexNode {
     let body = serialize_datum(d.as_ref());
-    RexNode::Constant(ProstDatum { body })
+    RexNode::Constant(PbDatum { body })
 }
 
 /// Convert protobuf into a literal value (datum).
diff --git a/src/frontend/src/expr/mod.rs b/src/frontend/src/expr/mod.rs
index cc80dc1aad5cd..3fc05f146f125 100644
--- a/src/frontend/src/expr/mod.rs
+++ b/src/frontend/src/expr/mod.rs
@@ -291,6 +291,30 @@ macro_rules! impl_has_variant {
 
 impl_has_variant! {InputRef, Literal, FunctionCall, AggCall, Subquery, TableFunction, WindowFunction}
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub(crate) struct InequalityInputPair {
+    /// Input index of greater side of inequality.
+    pub(crate) key_required_larger: usize,
+    /// Input index of less side of inequality.
+    pub(crate) key_required_smaller: usize,
+    /// greater >= less + delta_expression
+    pub(crate) delta_expression: Option<(ExprType, ExprImpl)>,
+}
+
+impl InequalityInputPair {
+    fn new(
+        key_required_larger: usize,
+        key_required_smaller: usize,
+        delta_expression: Option<(ExprType, ExprImpl)>,
+    ) -> Self {
+        Self {
+            key_required_larger,
+            key_required_smaller,
+            delta_expression,
+        }
+    }
+}
+
 impl ExprImpl {
     /// This function is not meant to be called. In most cases you would want
     /// [`ExprImpl::has_correlated_input_ref_by_depth`].
@@ -541,12 +565,13 @@ impl ExprImpl {
         }
     }
 
-    fn reverse_comparison(comparison: ExprType) -> ExprType {
+    pub fn reverse_comparison(comparison: ExprType) -> ExprType {
         match comparison {
             ExprType::LessThan => ExprType::GreaterThan,
             ExprType::LessThanOrEqual => ExprType::GreaterThanOrEqual,
             ExprType::GreaterThan => ExprType::LessThan,
             ExprType::GreaterThanOrEqual => ExprType::LessThanOrEqual,
+            ExprType::Equal | ExprType::IsNotDistinctFrom => comparison,
             _ => unreachable!(),
         }
     }
@@ -576,11 +601,11 @@ impl ExprImpl {
         }
     }
 
-    // Accepts expressions of the form `input_expr cmp now() [+- const_expr]` or
-    // `now() [+- const_expr] cmp input_expr`, where `input_expr` contains an
-    // `InputRef` and contains no `now()`.
-    //
-    // Canonicalizes to the first ordering and returns (input_expr, cmp, now_expr)
+    /// Accepts expressions of the form `input_expr cmp now() [+- const_expr]` or
+    /// `now() [+- const_expr] cmp input_expr`, where `input_expr` contains an
+    /// `InputRef` and contains no `now()`.
+    ///
+    /// Canonicalizes to the first ordering and returns `(input_expr, cmp, now_expr)`
     pub fn as_now_comparison_cond(&self) -> Option<(ExprImpl, ExprType, ExprImpl)> {
         if let ExprImpl::FunctionCall(function_call) = self {
             match function_call.get_expr_type() {
@@ -612,7 +637,55 @@ impl ExprImpl {
         }
     }
 
-    // Checks if expr is of the form `now() [+- const_expr]`
+    /// Accepts expressions of the form `InputRef cmp InputRef [+- const_expr]` or
+    /// `InputRef [+- const_expr] cmp InputRef`.
+    pub(crate) fn as_input_comparison_cond(&self) -> Option<InequalityInputPair> {
+        if let ExprImpl::FunctionCall(function_call) = self {
+            match function_call.get_expr_type() {
+                ty @ (ExprType::LessThan
+                | ExprType::LessThanOrEqual
+                | ExprType::GreaterThan
+                | ExprType::GreaterThanOrEqual) => {
+                    let (_, mut op1, mut op2) = function_call.clone().decompose_as_binary();
+                    if matches!(ty, ExprType::LessThan | ExprType::LessThanOrEqual) {
+                        std::mem::swap(&mut op1, &mut op2);
+                    }
+                    if let (Some((lft_input, lft_offset)), Some((rht_input, rht_offset))) =
+                        (op1.as_input_offset(), op2.as_input_offset())
+                    {
+                        match (lft_offset, rht_offset) {
+                            (Some(_), Some(_)) => None,
+                            (None, rht_offset @ Some(_)) => {
+                                Some(InequalityInputPair::new(lft_input, rht_input, rht_offset))
+                            }
+                            (Some((operator, operand)), None) => Some(InequalityInputPair::new(
+                                lft_input,
+                                rht_input,
+                                Some((
+                                    if operator == ExprType::Add {
+                                        ExprType::Subtract
+                                    } else {
+                                        ExprType::Add
+                                    },
+                                    operand,
+                                )),
+                            )),
+                            (None, None) => {
+                                Some(InequalityInputPair::new(lft_input, rht_input, None))
+                            }
+                        }
+                    } else {
+                        None
+                    }
+                }
+                _ => None,
+            }
+        } else {
+            None
+        }
+    }
+
+    /// Checks if expr is of the form `now() [+- const_expr]`
     fn is_now_offset(&self) -> bool {
         if let ExprImpl::FunctionCall(f) = self {
             match f.get_expr_type() {
@@ -631,6 +704,29 @@ impl ExprImpl {
         }
     }
 
+    /// Returns the `InputRef` and offset of a predicate if it matches
+    /// the form `InputRef [+- const_expr]`, else returns None.
+    fn as_input_offset(&self) -> Option<(usize, Option<(ExprType, ExprImpl)>)> {
+        match self {
+            ExprImpl::InputRef(input_ref) => Some((input_ref.index(), None)),
+            ExprImpl::FunctionCall(function_call) => {
+                let expr_type = function_call.get_expr_type();
+                match expr_type {
+                    ExprType::Add | ExprType::Subtract => {
+                        let (_, lhs, rhs) = function_call.clone().decompose_as_binary();
+                        if let ExprImpl::InputRef(input_ref) = &lhs && rhs.is_const() {
+                            Some((input_ref.index(), Some((expr_type, rhs))))
+                        } else {
+                            None
+                        }
+                    }
+                    _ => None,
+                }
+            }
+            _ => None,
+        }
+    }
+
     pub fn as_eq_const(&self) -> Option<(InputRef, ExprImpl)> {
         if let ExprImpl::FunctionCall(function_call) = self &&
         function_call.get_expr_type() == ExprType::Equal{
diff --git a/src/frontend/src/expr/table_function.rs b/src/frontend/src/expr/table_function.rs
index b3fe68404c362..c6db231435f91 100644
--- a/src/frontend/src/expr/table_function.rs
+++ b/src/frontend/src/expr/table_function.rs
@@ -20,7 +20,7 @@ use risingwave_common::error::ErrorCode;
 use risingwave_common::types::{unnested_list_type, DataType, ScalarImpl};
 use risingwave_pb::expr::table_function::Type;
 use risingwave_pb::expr::{
-    TableFunction as TableFunctionProst, UserDefinedTableFunction as UserDefinedTableFunctionProst,
+    TableFunction as TableFunctionPb, UserDefinedTableFunction as UserDefinedTableFunctionPb,
 };
 
 use super::{Expr, ExprImpl, ExprRewriter, RwResult};
@@ -61,14 +61,14 @@ impl TableFunctionType {
     }
 }
 
-impl TableFunctionType {
+impl TableFunction {
     pub fn name(&self) -> &str {
-        match self {
+        match self.function_type {
             TableFunctionType::Generate => "generate_series",
             TableFunctionType::Range => "range",
             TableFunctionType::Unnest => "unnest",
             TableFunctionType::RegexpMatches => "regexp_matches",
-            TableFunctionType::Udtf => "udtf",
+            TableFunctionType::Udtf => &self.udtf_catalog.as_ref().unwrap().name,
         }
     }
 }
@@ -229,15 +229,15 @@ impl TableFunction {
         }
     }
 
-    pub fn to_protobuf(&self) -> TableFunctionProst {
-        TableFunctionProst {
+    pub fn to_protobuf(&self) -> TableFunctionPb {
+        TableFunctionPb {
             function_type: self.function_type.to_protobuf() as i32,
             args: self.args.iter().map(|c| c.to_expr_proto()).collect_vec(),
             return_type: Some(self.return_type.to_protobuf()),
             udtf: self
                 .udtf_catalog
                 .as_ref()
-                .map(|c| UserDefinedTableFunctionProst {
+                .map(|c| UserDefinedTableFunctionPb {
                     arg_types: c.arg_types.iter().map(|t| t.to_protobuf()).collect(),
                     language: c.language.clone(),
                     link: c.link.clone(),
diff --git a/src/frontend/src/expr/type_inference/func.rs b/src/frontend/src/expr/type_inference/func.rs
index 88c6836ae78cd..c72bf9cdbe235 100644
--- a/src/frontend/src/expr/type_inference/func.rs
+++ b/src/frontend/src/expr/type_inference/func.rs
@@ -44,7 +44,7 @@ pub fn infer_type(func_type: ExprType, inputs: &mut Vec<ExprImpl>) -> Result<Dat
     let inputs_owned = std::mem::take(inputs);
     *inputs = inputs_owned
         .into_iter()
-        .zip_eq_fast(&sig.inputs_type)
+        .zip_eq_fast(sig.inputs_type)
         .map(|(expr, t)| {
             if DataTypeName::from(expr.return_type()) != *t {
                 if t.is_scalar() {
@@ -85,9 +85,26 @@ pub fn infer_some_all(
     ];
     let sig = infer_type_name(&FUNC_SIG_MAP, final_type, &actuals)?;
     if DataTypeName::from(inputs[0].return_type()) != sig.inputs_type[0] {
+        if matches!(
+            sig.inputs_type[0],
+            DataTypeName::List | DataTypeName::Struct
+        ) {
+            return Err(ErrorCode::BindError(
+                "array of array/struct on right are not supported yet".into(),
+            )
+            .into());
+        }
         inputs[0] = inputs[0].clone().cast_implicit(sig.inputs_type[0].into())?;
     }
     if element_type != Some(sig.inputs_type[1]) {
+        if matches!(
+            sig.inputs_type[1],
+            DataTypeName::List | DataTypeName::Struct
+        ) {
+            return Err(
+                ErrorCode::BindError("array/struct on left are not supported yet".into()).into(),
+            );
+        }
         inputs[1] = inputs[1].clone().cast_implicit(DataType::List {
             datatype: Box::new(sig.inputs_type[1].into()),
         })?;
@@ -542,6 +559,24 @@ fn infer_type_for_special(
                 _ => Ok(None),
             }
         }
+        ExprType::ArrayLength => {
+            ensure_arity!("array_length", | inputs | == 1);
+            let return_type = inputs[0].return_type();
+
+            if inputs[0].is_unknown() {
+                return Err(ErrorCode::BindError(
+                    "Cannot find length for unknown type".to_string(),
+                )
+                .into());
+            }
+
+            match return_type {
+                DataType::List {
+                    datatype: _list_elem_type,
+                } => Ok(Some(DataType::Int64)),
+                _ => Ok(None),
+            }
+        }
         ExprType::Vnode => {
             ensure_arity!("vnode", 1 <= | inputs |);
             Ok(Some(DataType::Int16))
@@ -578,10 +613,7 @@ fn infer_type_name<'a>(
     func_type: ExprType,
     inputs: &[Option<DataTypeName>],
 ) -> Result<&'a FuncSign> {
-    let candidates = sig_map
-        .get(&(func_type, inputs.len()))
-        .map(std::ops::Deref::deref)
-        .unwrap_or_default();
+    let candidates = sig_map.get_with_arg_nums(func_type, inputs.len());
 
     // Binary operators have a special `unknown` handling rule for exact match. We do not
     // distinguish operators from functions as of now.
@@ -1030,108 +1062,114 @@ mod tests {
         let testcases = [
             (
                 "Binary special rule prefers arguments of same type.",
-                vec![
-                    vec![T::Int32, T::Int32],
-                    vec![T::Int32, T::Varchar],
-                    vec![T::Int32, T::Float64],
-                ],
-                &[Some(T::Int32), None] as &[_],
-                Ok(&[T::Int32, T::Int32] as &[_]),
+                &[
+                    &[T::Int32, T::Int32][..],
+                    &[T::Int32, T::Varchar],
+                    &[T::Int32, T::Float64],
+                ][..],
+                &[Some(T::Int32), None][..],
+                Ok(&[T::Int32, T::Int32][..]),
             ),
             (
                 "Without binary special rule, Rule 4e selects varchar.",
-                vec![
-                    vec![T::Int32, T::Int32, T::Int32],
-                    vec![T::Int32, T::Int32, T::Varchar],
-                    vec![T::Int32, T::Int32, T::Float64],
+                &[
+                    &[T::Int32, T::Int32, T::Int32],
+                    &[T::Int32, T::Int32, T::Varchar],
+                    &[T::Int32, T::Int32, T::Float64],
                 ],
-                &[Some(T::Int32), Some(T::Int32), None] as &[_],
-                Ok(&[T::Int32, T::Int32, T::Varchar] as &[_]),
+                &[Some(T::Int32), Some(T::Int32), None],
+                Ok(&[T::Int32, T::Int32, T::Varchar]),
             ),
             (
                 "Without binary special rule, Rule 4e selects preferred type.",
-                vec![
-                    vec![T::Int32, T::Int32, T::Int32],
-                    vec![T::Int32, T::Int32, T::Float64],
+                &[
+                    &[T::Int32, T::Int32, T::Int32],
+                    &[T::Int32, T::Int32, T::Float64],
                 ],
-                &[Some(T::Int32), Some(T::Int32), None] as &[_],
-                Ok(&[T::Int32, T::Int32, T::Float64] as &[_]),
+                &[Some(T::Int32), Some(T::Int32), None],
+                Ok(&[T::Int32, T::Int32, T::Float64]),
             ),
             (
                 "Without binary special rule, Rule 4f treats exact-match and cast-match equally.",
-                vec![
-                    vec![T::Int32, T::Int32, T::Int32],
-                    vec![T::Int32, T::Int32, T::Float32],
+                &[
+                    &[T::Int32, T::Int32, T::Int32],
+                    &[T::Int32, T::Int32, T::Float32],
                 ],
-                &[Some(T::Int32), Some(T::Int32), None] as &[_],
+                &[Some(T::Int32), Some(T::Int32), None],
                 Err("not unique"),
             ),
             (
                 "`top_matches` ranks by exact count then preferred count",
-                vec![
-                    vec![T::Float64, T::Float64, T::Float64, T::Timestamptz], /* 0 exact 3 preferred */
-                    vec![T::Float64, T::Int32, T::Float32, T::Timestamp], // 1 exact 1 preferred
-                    vec![T::Float32, T::Float32, T::Int32, T::Timestamptz], // 1 exact 0 preferred
-                    vec![T::Int32, T::Float64, T::Float32, T::Timestamptz], // 1 exact 1 preferred
-                    vec![T::Int32, T::Int16, T::Int32, T::Timestamptz],   // 2 exact 1 non-castable
-                    vec![T::Int32, T::Float64, T::Float32, T::Date],      // 1 exact 1 preferred
+                &[
+                    &[T::Float64, T::Float64, T::Float64, T::Timestamptz], /* 0 exact 3 preferred */
+                    &[T::Float64, T::Int32, T::Float32, T::Timestamp],     // 1 exact 1 preferred
+                    &[T::Float32, T::Float32, T::Int32, T::Timestamptz],   // 1 exact 0 preferred
+                    &[T::Int32, T::Float64, T::Float32, T::Timestamptz],   // 1 exact 1 preferred
+                    &[T::Int32, T::Int16, T::Int32, T::Timestamptz], // 2 exact 1 non-castable
+                    &[T::Int32, T::Float64, T::Float32, T::Date],    // 1 exact 1 preferred
                 ],
-                &[Some(T::Int32), Some(T::Int32), Some(T::Int32), None] as &[_],
-                Ok(&[T::Int32, T::Float64, T::Float32, T::Timestamptz] as &[_]),
+                &[Some(T::Int32), Some(T::Int32), Some(T::Int32), None],
+                Ok(&[T::Int32, T::Float64, T::Float32, T::Timestamptz]),
             ),
             (
                 "Rule 4e fails and Rule 4f unique.",
-                vec![
-                    vec![T::Int32, T::Int32, T::Time],
-                    vec![T::Int32, T::Int32, T::Int32],
+                &[
+                    &[T::Int32, T::Int32, T::Time],
+                    &[T::Int32, T::Int32, T::Int32],
                 ],
-                &[None, Some(T::Int32), None] as &[_],
-                Ok(&[T::Int32, T::Int32, T::Int32] as &[_]),
+                &[None, Some(T::Int32), None],
+                Ok(&[T::Int32, T::Int32, T::Int32]),
             ),
             (
                 "Rule 4e empty and Rule 4f unique.",
-                vec![
-                    vec![T::Int32, T::Int32, T::Varchar],
-                    vec![T::Int32, T::Int32, T::Int32],
-                    vec![T::Varchar, T::Int32, T::Int32],
+                &[
+                    &[T::Int32, T::Int32, T::Varchar],
+                    &[T::Int32, T::Int32, T::Int32],
+                    &[T::Varchar, T::Int32, T::Int32],
                 ],
-                &[None, Some(T::Int32), None] as &[_],
-                Ok(&[T::Int32, T::Int32, T::Int32] as &[_]),
+                &[None, Some(T::Int32), None],
+                Ok(&[T::Int32, T::Int32, T::Int32]),
             ),
             (
                 "Rule 4e varchar resolves prior category conflict.",
-                vec![
-                    vec![T::Int32, T::Int32, T::Float32],
-                    vec![T::Time, T::Int32, T::Int32],
-                    vec![T::Varchar, T::Int32, T::Int32],
+                &[
+                    &[T::Int32, T::Int32, T::Float32],
+                    &[T::Time, T::Int32, T::Int32],
+                    &[T::Varchar, T::Int32, T::Int32],
                 ],
-                &[None, Some(T::Int32), None] as &[_],
-                Ok(&[T::Varchar, T::Int32, T::Int32] as &[_]),
+                &[None, Some(T::Int32), None],
+                Ok(&[T::Varchar, T::Int32, T::Int32]),
             ),
             (
                 "Rule 4f fails.",
-                vec![
-                    vec![T::Float32, T::Float32, T::Float32, T::Float32],
-                    vec![T::Decimal, T::Decimal, T::Int64, T::Decimal],
+                &[
+                    &[T::Float32, T::Float32, T::Float32, T::Float32],
+                    &[T::Decimal, T::Decimal, T::Int64, T::Decimal],
                 ],
-                &[Some(T::Int16), Some(T::Int32), None, Some(T::Int64)] as &[_],
+                &[Some(T::Int16), Some(T::Int32), None, Some(T::Int64)],
                 Err("not unique"),
             ),
             (
                 "Rule 4f all unknown.",
-                vec![
-                    vec![T::Float32, T::Float32, T::Float32, T::Float32],
-                    vec![T::Decimal, T::Decimal, T::Int64, T::Decimal],
+                &[
+                    &[T::Float32, T::Float32, T::Float32, T::Float32],
+                    &[T::Decimal, T::Decimal, T::Int64, T::Decimal],
                 ],
-                &[None, None, None, None] as &[_],
+                &[None, None, None, None],
                 Err("not unique"),
             ),
         ];
         for (desc, candidates, inputs, expected) in testcases {
             let mut sig_map = FuncSigMap::default();
-            candidates
-                .into_iter()
-                .for_each(|formals| sig_map.insert(DUMMY_FUNC, formals, DUMMY_RET));
+            for formals in candidates {
+                sig_map.insert(FuncSign {
+                    name: "add",
+                    func: DUMMY_FUNC,
+                    inputs_type: formals,
+                    ret_type: DUMMY_RET,
+                    build: |_, _| unreachable!(),
+                });
+            }
             let result = infer_type_name(&sig_map, DUMMY_FUNC, inputs);
             match (expected, result) {
                 (Ok(expected), Ok(found)) => {
diff --git a/src/frontend/src/handler/alter_relation_rename.rs b/src/frontend/src/handler/alter_relation_rename.rs
new file mode 100644
index 0000000000000..1f6d079646027
--- /dev/null
+++ b/src/frontend/src/handler/alter_relation_rename.rs
@@ -0,0 +1,229 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 pgwire::pg_response::{PgResponse, StatementType};
+use risingwave_common::error::{ErrorCode, Result};
+use risingwave_sqlparser::ast::ObjectName;
+
+use super::{HandlerArgs, RwPgResponse};
+use crate::catalog::root_catalog::SchemaPath;
+use crate::catalog::table_catalog::TableType;
+use crate::Binder;
+
+pub async fn handle_rename_table(
+    handler_args: HandlerArgs,
+    table_type: TableType,
+    table_name: ObjectName,
+    new_table_name: ObjectName,
+) -> Result<RwPgResponse> {
+    let session = handler_args.session;
+    let db_name = session.database();
+    let (schema_name, real_table_name) =
+        Binder::resolve_schema_qualified_name(db_name, table_name.clone())?;
+    let new_table_name = Binder::resolve_table_name(new_table_name)?;
+    let search_path = session.config().get_search_path();
+    let user_name = &session.auth_context().user_name;
+
+    let schema_path = SchemaPath::new(schema_name.as_deref(), &search_path, user_name);
+
+    let table_id = {
+        let reader = session.env().catalog_reader().read_guard();
+        let (table, schema_name) =
+            reader.get_table_by_name(db_name, schema_path, &real_table_name)?;
+        if table_type != table.table_type {
+            return Err(ErrorCode::InvalidInputSyntax(format!(
+                "\"{table_name}\" is not a {}",
+                table_type.to_prost().as_str_name()
+            ))
+            .into());
+        }
+
+        session.check_privilege_for_drop_alter(schema_name, &**table)?;
+        table.id
+    };
+
+    let catalog_writer = session.env().catalog_writer();
+    catalog_writer
+        .alter_table_name(table_id.table_id, &new_table_name)
+        .await?;
+
+    let stmt_type = match table_type {
+        TableType::Table => StatementType::ALTER_TABLE,
+        TableType::MaterializedView => StatementType::ALTER_MATERIALIZED_VIEW,
+        _ => unreachable!(),
+    };
+    Ok(PgResponse::empty_result(stmt_type))
+}
+
+pub async fn handle_rename_index(
+    handler_args: HandlerArgs,
+    index_name: ObjectName,
+    new_index_name: ObjectName,
+) -> Result<RwPgResponse> {
+    let session = handler_args.session;
+    let db_name = session.database();
+    let (schema_name, real_index_name) =
+        Binder::resolve_schema_qualified_name(db_name, index_name.clone())?;
+    let new_index_name = Binder::resolve_index_name(new_index_name)?;
+    let search_path = session.config().get_search_path();
+    let user_name = &session.auth_context().user_name;
+
+    let schema_path = SchemaPath::new(schema_name.as_deref(), &search_path, user_name);
+
+    let index_id = {
+        let reader = session.env().catalog_reader().read_guard();
+        let (index, schema_name) =
+            reader.get_index_by_name(db_name, schema_path, &real_index_name)?;
+        session.check_privilege_for_drop_alter(schema_name, &**index)?;
+        index.id
+    };
+
+    let catalog_writer = session.env().catalog_writer();
+    catalog_writer
+        .alter_index_name(index_id.index_id, &new_index_name)
+        .await?;
+
+    Ok(PgResponse::empty_result(StatementType::ALTER_INDEX))
+}
+
+pub async fn handle_rename_view(
+    handler_args: HandlerArgs,
+    view_name: ObjectName,
+    new_view_name: ObjectName,
+) -> Result<RwPgResponse> {
+    let session = handler_args.session;
+    let db_name = session.database();
+    let (schema_name, real_view_name) =
+        Binder::resolve_schema_qualified_name(db_name, view_name.clone())?;
+    let new_view_name = Binder::resolve_view_name(new_view_name)?;
+    let search_path = session.config().get_search_path();
+    let user_name = &session.auth_context().user_name;
+
+    let schema_path = SchemaPath::new(schema_name.as_deref(), &search_path, user_name);
+
+    let view_id = {
+        let reader = session.env().catalog_reader().read_guard();
+        let (view, schema_name) = reader.get_view_by_name(db_name, schema_path, &real_view_name)?;
+        session.check_privilege_for_drop_alter(schema_name, &**view)?;
+        view.id
+    };
+
+    let catalog_writer = session.env().catalog_writer();
+    catalog_writer
+        .alter_view_name(view_id, &new_view_name)
+        .await?;
+
+    Ok(PgResponse::empty_result(StatementType::ALTER_VIEW))
+}
+
+pub async fn handle_rename_sink(
+    handler_args: HandlerArgs,
+    sink_name: ObjectName,
+    new_sink_name: ObjectName,
+) -> Result<RwPgResponse> {
+    let session = handler_args.session;
+    let db_name = session.database();
+    let (schema_name, real_sink_name) =
+        Binder::resolve_schema_qualified_name(db_name, sink_name.clone())?;
+    let new_sink_name = Binder::resolve_sink_name(new_sink_name)?;
+    let search_path = session.config().get_search_path();
+    let user_name = &session.auth_context().user_name;
+
+    let schema_path = SchemaPath::new(schema_name.as_deref(), &search_path, user_name);
+
+    let sink_id = {
+        let reader = session.env().catalog_reader().read_guard();
+        let (sink, schema_name) = reader.get_sink_by_name(db_name, schema_path, &real_sink_name)?;
+        session.check_privilege_for_drop_alter(schema_name, &**sink)?;
+        sink.id
+    };
+
+    let catalog_writer = session.env().catalog_writer();
+    catalog_writer
+        .alter_sink_name(sink_id.sink_id, &new_sink_name)
+        .await?;
+
+    Ok(PgResponse::empty_result(StatementType::ALTER_SINK))
+}
+
+pub async fn handle_rename_source(
+    handler_args: HandlerArgs,
+    source_name: ObjectName,
+    new_source_name: ObjectName,
+) -> Result<RwPgResponse> {
+    let session = handler_args.session;
+    let db_name = session.database();
+    let (schema_name, real_source_name) =
+        Binder::resolve_schema_qualified_name(db_name, source_name.clone())?;
+    let new_source_name = Binder::resolve_source_name(new_source_name)?;
+    let search_path = session.config().get_search_path();
+    let user_name = &session.auth_context().user_name;
+
+    let schema_path = SchemaPath::new(schema_name.as_deref(), &search_path, user_name);
+
+    let source_id = {
+        let reader = session.env().catalog_reader().read_guard();
+        let (source, schema_name) =
+            reader.get_source_by_name(db_name, schema_path, &real_source_name)?;
+        session.check_privilege_for_drop_alter(schema_name, &**source)?;
+        source.id
+    };
+
+    let catalog_writer = session.env().catalog_writer();
+    catalog_writer
+        .alter_source_name(source_id, &new_source_name)
+        .await?;
+
+    Ok(PgResponse::empty_result(StatementType::ALTER_SOURCE))
+}
+
+#[cfg(test)]
+mod tests {
+
+    use risingwave_common::catalog::{DEFAULT_DATABASE_NAME, DEFAULT_SCHEMA_NAME};
+
+    use crate::catalog::root_catalog::SchemaPath;
+    use crate::test_utils::LocalFrontend;
+
+    #[tokio::test]
+    async fn test_alter_table_name_handler() {
+        let frontend = LocalFrontend::new(Default::default()).await;
+        let session = frontend.session_ref();
+        let schema_path = SchemaPath::Name(DEFAULT_SCHEMA_NAME);
+
+        let sql = "create table t (i int, r real);";
+        frontend.run_sql(sql).await.unwrap();
+
+        let table_id = {
+            let catalog_reader = session.env().catalog_reader().read_guard();
+            catalog_reader
+                .get_table_by_name(DEFAULT_DATABASE_NAME, schema_path, "t")
+                .unwrap()
+                .0
+                .id
+        };
+
+        // Alter table name.
+        let sql = "alter table t rename to t1;";
+        frontend.run_sql(sql).await.unwrap();
+
+        let catalog_reader = session.env().catalog_reader().read_guard();
+        let altered_table_name = catalog_reader
+            .get_table_by_id(&table_id)
+            .unwrap()
+            .name()
+            .to_string();
+        assert_eq!(altered_table_name, "t1");
+    }
+}
diff --git a/src/frontend/src/handler/alter_table_column.rs b/src/frontend/src/handler/alter_table_column.rs
index bd61c83bbe83e..6e3168d983608 100644
--- a/src/frontend/src/handler/alter_table_column.rs
+++ b/src/frontend/src/handler/alter_table_column.rs
@@ -15,7 +15,7 @@
 use anyhow::Context;
 use itertools::Itertools;
 use pgwire::pg_response::{PgResponse, StatementType};
-use risingwave_common::error::{ErrorCode, Result};
+use risingwave_common::error::{ErrorCode, Result, RwError};
 use risingwave_common::util::column_index_mapping::ColIndexMapping;
 use risingwave_pb::catalog::Table;
 use risingwave_pb::stream_plan::stream_fragment_graph::Parallelism;
@@ -70,6 +70,13 @@ pub async fn handle_alter_table_column(
         table.clone()
     };
 
+    // TODO(yuhao): alter table with generated columns.
+    if original_catalog.has_generated_column() {
+        return Err(RwError::from(ErrorCode::BindError(
+            "Alter a table with generated column has not been implemented.".to_string(),
+        )));
+    }
+
     // Retrieve the original table definition and parse it to AST.
     let [mut definition]: [_; 1] = Parser::parse_sql(&original_catalog.definition)
         .context("unable to parse original table definition")?
diff --git a/src/frontend/src/handler/create_index.rs b/src/frontend/src/handler/create_index.rs
index a2db235c6d402..0025eb234d3d2 100644
--- a/src/frontend/src/handler/create_index.rs
+++ b/src/frontend/src/handler/create_index.rs
@@ -21,7 +21,7 @@ use pgwire::pg_response::{PgResponse, StatementType};
 use risingwave_common::catalog::{IndexId, TableDesc, TableId};
 use risingwave_common::error::{ErrorCode, Result, RwError};
 use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
-use risingwave_pb::catalog::{Index as ProstIndex, Table as ProstTable};
+use risingwave_pb::catalog::{PbIndex, PbTable};
 use risingwave_pb::stream_plan::stream_fragment_graph::Parallelism;
 use risingwave_pb::user::grant_privilege::{Action, Object};
 use risingwave_sqlparser::ast::{Ident, ObjectName, OrderByExpr};
@@ -47,7 +47,7 @@ pub(crate) fn gen_create_index_plan(
     columns: Vec<OrderByExpr>,
     include: Vec<Ident>,
     distributed_by: Vec<Ident>,
-) -> Result<(PlanRef, ProstTable, ProstIndex)> {
+) -> Result<(PlanRef, PbTable, PbIndex)> {
     let columns = check_columns(columns)?;
     let db_name = session.database();
     let (schema_name, table_name) = Binder::resolve_schema_qualified_name(db_name, table_name)?;
@@ -191,7 +191,7 @@ pub(crate) fn gen_create_index_plan(
 
     index_table_prost.owner = session.user_id();
 
-    let index_prost = ProstIndex {
+    let index_prost = PbIndex {
         id: IndexId::placeholder().index_id,
         schema_id: index_schema_id,
         database_id: index_database_id,
@@ -337,28 +337,12 @@ fn check_columns(columns: Vec<OrderByExpr>) -> Result<Vec<(Ident, OrderType)>> {
     columns
         .into_iter()
         .map(|column| {
-            // TODO(rc): support `NULLS FIRST | LAST`
-            if column.nulls_first.is_some() {
-                return Err(ErrorCode::NotImplemented(
-                    "nulls_first not supported".into(),
-                    None.into(),
-                )
-                .into());
-            }
+            let order_type = OrderType::from_bools(column.asc, column.nulls_first);
 
             use risingwave_sqlparser::ast::Expr;
 
             if let Expr::Identifier(ident) = column.expr {
-                Ok::<(_, _), RwError>((
-                    ident,
-                    column.asc.map_or(OrderType::ascending(), |x| {
-                        if x {
-                            OrderType::ascending()
-                        } else {
-                            OrderType::descending()
-                        }
-                    }),
-                ))
+                Ok::<(_, _), RwError>((ident, order_type))
             } else {
                 Err(ErrorCode::NotImplemented(
                     "only identifier is supported for create index".into(),
diff --git a/src/frontend/src/handler/create_mv.rs b/src/frontend/src/handler/create_mv.rs
index d27d4a05f72ab..44f2b0c3d44ab 100644
--- a/src/frontend/src/handler/create_mv.rs
+++ b/src/frontend/src/handler/create_mv.rs
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use itertools::Itertools;
 use pgwire::pg_response::{PgResponse, StatementType};
 use risingwave_common::error::{ErrorCode, Result};
-use risingwave_pb::catalog::Table as ProstTable;
+use risingwave_pb::catalog::PbTable;
 use risingwave_pb::stream_plan::stream_fragment_graph::Parallelism;
 use risingwave_pb::user::grant_privilege::Action;
 use risingwave_sqlparser::ast::{Ident, ObjectName, Query};
@@ -77,7 +78,7 @@ pub fn gen_create_mv_plan(
     query: Query,
     name: ObjectName,
     columns: Vec<Ident>,
-) -> Result<(PlanRef, ProstTable)> {
+) -> Result<(PlanRef, PbTable)> {
     let db_name = session.database();
     let (schema_name, table_name) = Binder::resolve_schema_qualified_name(db_name, name)?;
 
@@ -87,7 +88,11 @@ pub fn gen_create_mv_plan(
 
     let bound = {
         let mut binder = Binder::new_for_stream(session);
-        binder.bind_query(query)?
+        let bound = binder.bind_query(query)?;
+        // FIXME: We should record the views into mv's dependent relations to to refine the drop
+        // check and recursive rename of the views.
+        let _views = binder.shared_views().keys().cloned().collect_vec();
+        bound
     };
 
     let col_names = get_column_names(&bound, session, columns)?;
@@ -244,7 +249,7 @@ pub mod tests {
         );
         let row_id_col_name = row_id_column_name();
         let expected_columns = maplit::hashmap! {
-            row_id_col_name.as_str() => DataType::Int64,
+            row_id_col_name.as_str() => DataType::Serial,
             "country" => DataType::new_struct(
                  vec![DataType::Varchar,city_type,DataType::Varchar],
                  vec!["address".to_string(), "city".to_string(), "zipcode".to_string()],
diff --git a/src/frontend/src/handler/create_sink.rs b/src/frontend/src/handler/create_sink.rs
index b7aad90ac95b7..afc014ad3865a 100644
--- a/src/frontend/src/handler/create_sink.rs
+++ b/src/frontend/src/handler/create_sink.rs
@@ -79,7 +79,7 @@ pub fn gen_sink_plan(
     let definition = context.normalized_sql().to_owned();
 
     let bound = {
-        let mut binder = Binder::new(session);
+        let mut binder = Binder::new_for_stream(session);
         binder.bind_query(*query)?
     };
 
@@ -177,7 +177,7 @@ pub mod tests {
         let sql = r#"CREATE SINK snk1 FROM mv1
                     WITH (connector = 'mysql', mysql.endpoint = '127.0.0.1:3306', mysql.table =
                         '<table_name>', mysql.database = '<database_name>', mysql.user = '<user_name>',
-                        mysql.password = '<password>', format = 'append_only', force_append_only = 'true');"#.to_string();
+                        mysql.password = '<password>', type = 'append-only', force_append_only = 'true');"#.to_string();
         frontend.run_sql(sql).await.unwrap();
 
         let session = frontend.session_ref();
diff --git a/src/frontend/src/handler/create_source.rs b/src/frontend/src/handler/create_source.rs
index 019c219bb4771..3c0f316f86b84 100644
--- a/src/frontend/src/handler/create_source.rs
+++ b/src/frontend/src/handler/create_source.rs
@@ -34,19 +34,21 @@ use risingwave_connector::source::{
     GOOGLE_PUBSUB_CONNECTOR, KAFKA_CONNECTOR, KINESIS_CONNECTOR, NEXMARK_CONNECTOR,
     PULSAR_CONNECTOR,
 };
-use risingwave_pb::catalog::{Source as ProstSource, StreamSourceInfo, WatermarkDesc};
+use risingwave_pb::catalog::{PbSource, StreamSourceInfo, WatermarkDesc};
 use risingwave_pb::plan_common::RowFormatType;
 use risingwave_sqlparser::ast::{
     AvroSchema, CreateSourceStatement, DebeziumAvroSchema, ProtobufSchema, SourceSchema,
     SourceWatermark,
 };
 
-use super::create_table::bind_sql_table_constraints;
+use super::create_table::bind_sql_table_column_constraints;
 use super::RwPgResponse;
 use crate::binder::Binder;
 use crate::catalog::ColumnId;
 use crate::expr::Expr;
-use crate::handler::create_table::{bind_sql_columns, ColumnIdGenerator};
+use crate::handler::create_table::{
+    bind_sql_column_constraints, bind_sql_columns, ColumnIdGenerator,
+};
 use crate::handler::HandlerArgs;
 use crate::optimizer::plan_node::KAFKA_TIMESTAMP_COLUMN_NAME;
 use crate::session::SessionImpl;
@@ -456,6 +458,7 @@ fn check_and_add_timestamp_column(
             name: KAFKA_TIMESTAMP_COLUMN_NAME.to_string(),
             field_descs: vec![],
             type_name: "".to_string(),
+            generated_column: None,
         };
         column_descs.push(kafka_timestamp_column);
     }
@@ -594,16 +597,13 @@ pub async fn handle_create_source(
 
     let mut col_id_gen = ColumnIdGenerator::new_initial();
 
-    let (mut column_descs, pk_column_id_from_columns) =
-        bind_sql_columns(stmt.columns, &mut col_id_gen)?;
+    let mut column_descs = bind_sql_columns(stmt.columns.clone(), &mut col_id_gen)?;
 
     check_and_add_timestamp_column(&with_properties, &mut column_descs, &mut col_id_gen);
 
-    let (mut columns, mut pk_column_ids, mut row_id_index) = bind_sql_table_constraints(
-        column_descs.clone(),
-        pk_column_id_from_columns,
-        stmt.constraints,
-    )?;
+    let (mut columns, mut pk_column_ids, mut row_id_index) =
+        bind_sql_table_column_constraints(column_descs, stmt.columns.clone(), stmt.constraints)?;
+
     if row_id_index.is_none() {
         return Err(ErrorCode::InvalidInputSyntax(
             "Source does not support PRIMARY KEY constraint, please use \"CREATE TABLE\" instead"
@@ -629,12 +629,21 @@ pub async fn handle_create_source(
     // TODO(yuhao): allow multiple watermark on source.
     assert!(watermark_descs.len() <= 1);
 
+    bind_sql_column_constraints(&session, name.clone(), &mut columns, stmt.columns)?;
+
+    if columns.iter().any(|c| c.is_generated()) {
+        // TODO(yuhao): allow generated columns on source
+        return Err(RwError::from(ErrorCode::BindError(
+            "Generated columns on source has not been implemented.".to_string(),
+        )));
+    }
+
     let row_id_index = row_id_index.map(|index| index as _);
     let pk_column_ids = pk_column_ids.into_iter().map(Into::into).collect();
 
     let columns = columns.into_iter().map(|c| c.to_protobuf()).collect_vec();
 
-    let source = ProstSource {
+    let source = PbSource {
         id: TableId::placeholder().table_id,
         schema_id,
         database_id,
@@ -700,7 +709,7 @@ pub mod tests {
         );
         let row_id_col_name = row_id_column_name();
         let expected_columns = maplit::hashmap! {
-            row_id_col_name.as_str() => DataType::Int64,
+            row_id_col_name.as_str() => DataType::Serial,
             "id" => DataType::Int32,
             "zipcode" => DataType::Int64,
             "rate" => DataType::Float32,
diff --git a/src/frontend/src/handler/create_table.rs b/src/frontend/src/handler/create_table.rs
index 571685f9a5e5e..d6d8b22a817a6 100644
--- a/src/frontend/src/handler/create_table.rs
+++ b/src/frontend/src/handler/create_table.rs
@@ -23,9 +23,8 @@ use risingwave_common::catalog::{
     USER_COLUMN_ID_OFFSET,
 };
 use risingwave_common::error::{ErrorCode, Result};
-use risingwave_pb::catalog::{
-    Source as ProstSource, StreamSourceInfo, Table as ProstTable, WatermarkDesc,
-};
+use risingwave_pb::catalog::{PbSource, PbTable, StreamSourceInfo, WatermarkDesc};
+use risingwave_pb::plan_common::GeneratedColumnDesc;
 use risingwave_pb::stream_plan::stream_fragment_graph::Parallelism;
 use risingwave_sqlparser::ast::{
     ColumnDef, ColumnOption, DataType as AstDataType, ObjectName, SourceSchema, SourceWatermark,
@@ -37,11 +36,13 @@ use super::RwPgResponse;
 use crate::binder::{bind_data_type, bind_struct_field};
 use crate::catalog::table_catalog::TableVersion;
 use crate::catalog::{check_valid_column_name, ColumnId};
+use crate::expr::{Expr, ExprImpl};
 use crate::handler::create_source::{bind_source_watermark, UPSTREAM_SOURCE_KEY};
 use crate::handler::HandlerArgs;
 use crate::optimizer::plan_node::LogicalSource;
 use crate::optimizer::property::{Order, RequiredDist};
 use crate::optimizer::{OptimizerContext, OptimizerContextRef, PlanRef, PlanRoot};
+use crate::session::SessionImpl;
 use crate::stream_fragmenter::build_graph;
 use crate::{Binder, TableCatalog, WithOptions};
 
@@ -119,9 +120,7 @@ impl ColumnIdGenerator {
 pub fn bind_sql_columns(
     columns: Vec<ColumnDef>,
     col_id_gen: &mut ColumnIdGenerator,
-) -> Result<(Vec<ColumnDesc>, Option<ColumnId>)> {
-    // In `ColumnDef`, pk can contain only one column. So we use `Option` rather than `Vec`.
-    let mut pk_column_id = None;
+) -> Result<Vec<ColumnDesc>> {
     let mut column_descs = Vec::with_capacity(columns.len());
 
     for column in columns {
@@ -133,8 +132,9 @@ pub fn bind_sql_columns(
             name,
             data_type,
             collation,
-            options,
+            ..
         } = column;
+
         let data_type = data_type.ok_or(ErrorCode::InvalidInputSyntax(
             "data type is not specified".into(),
         ))?;
@@ -145,27 +145,9 @@ pub fn bind_sql_columns(
             )
             .into());
         }
-        for option_def in options {
-            match option_def.option {
-                ColumnOption::Unique { is_primary: true } => {
-                    if pk_column_id.is_some() {
-                        return Err(ErrorCode::BindError(
-                            "multiple primary keys are not allowed".into(),
-                        )
-                        .into());
-                    }
-                    pk_column_id = Some(column_id);
-                }
-                _ => {
-                    return Err(ErrorCode::NotImplemented(
-                        format!("column constraints \"{}\"", option_def),
-                        None.into(),
-                    )
-                    .into())
-                }
-            }
-        }
+
         check_valid_column_name(&name.real_value())?;
+
         let field_descs = if let AstDataType::Struct(fields) = &data_type {
             fields
                 .iter()
@@ -180,22 +162,137 @@ pub fn bind_sql_columns(
             name: name.real_value(),
             field_descs,
             type_name: "".to_string(),
+            generated_column: None,
         });
     }
 
-    Ok((column_descs, pk_column_id))
+    Ok(column_descs)
+}
+
+fn check_generated_column_constraints(
+    column_name: &String,
+    expr: &ExprImpl,
+    column_catalogs: &[ColumnCatalog],
+    generated_column_names: &[String],
+) -> Result<()> {
+    let input_refs = expr.collect_input_refs(column_catalogs.len());
+    for idx in input_refs.ones() {
+        let referred_generated_column = &column_catalogs[idx].column_desc.name;
+        if generated_column_names
+            .iter()
+            .any(|c| c == referred_generated_column)
+        {
+            return Err(ErrorCode::BindError(
+                format!("Generated can not reference another generated column, but here generated column \"{}\" referenced another generated column \"{}\"", column_name, referred_generated_column),
+            )
+            .into());
+        }
+    }
+    Ok(())
+}
+
+/// Binds constraints that can be only specified in column definitions.
+pub fn bind_sql_column_constraints(
+    session: &SessionImpl,
+    table_name: String,
+    column_catalogs: &mut [ColumnCatalog],
+    columns: Vec<ColumnDef>,
+) -> Result<()> {
+    let generated_column_names = {
+        let mut names = vec![];
+        for column in &columns {
+            for option_def in &column.options {
+                if let ColumnOption::GeneratedColumns(_) = option_def.option {
+                    names.push(column.name.real_value());
+                    break;
+                }
+            }
+        }
+        names
+    };
+
+    let mut binder = Binder::new_for_stream(session);
+    binder.bind_columns_to_context(table_name.clone(), column_catalogs.to_vec())?;
+    for column in columns {
+        for option_def in column.options {
+            match option_def.option {
+                ColumnOption::GeneratedColumns(expr) => {
+                    let idx = binder
+                        .get_column_binding_index(table_name.clone(), &column.name.real_value())?;
+                    let expr_impl = binder.bind_expr(expr)?;
+
+                    check_generated_column_constraints(
+                        &column.name.real_value(),
+                        &expr_impl,
+                        column_catalogs,
+                        &generated_column_names,
+                    )?;
+
+                    column_catalogs[idx].column_desc.generated_column = Some(GeneratedColumnDesc {
+                        expr: Some(expr_impl.to_expr_proto()),
+                    });
+                }
+                ColumnOption::Unique { is_primary: true } => {
+                    // Bind primary key in `bind_sql_table_column_constraints`
+                }
+                _ => {
+                    return Err(ErrorCode::NotImplemented(
+                        format!("column constraints \"{}\"", option_def),
+                        None.into(),
+                    )
+                    .into())
+                }
+            }
+        }
+    }
+    Ok(())
 }
 
-/// Binds table constraints given the binding results from column definitions.
+/// Binds constraints that can be specified in both column definitions and table definition.
+///
 /// It returns the columns together with `pk_column_ids`, and an optional row id column index if
 /// added.
-pub fn bind_sql_table_constraints(
-    column_descs: Vec<ColumnDesc>,
-    pk_column_id_from_columns: Option<ColumnId>,
-    constraints: Vec<TableConstraint>,
+pub fn bind_sql_table_column_constraints(
+    columns_descs: Vec<ColumnDesc>,
+    columns_defs: Vec<ColumnDef>,
+    table_constraints: Vec<TableConstraint>,
 ) -> Result<(Vec<ColumnCatalog>, Vec<ColumnId>, Option<usize>)> {
     let mut pk_column_names = vec![];
-    for constraint in constraints {
+    // Mapping from column name to column id.
+    let name_to_id = columns_descs
+        .iter()
+        .map(|c| (c.name.as_str(), c.column_id))
+        .collect::<HashMap<_, _>>();
+
+    // Bind column constraints
+    for column in columns_defs {
+        for option_def in column.options {
+            match option_def.option {
+                ColumnOption::Unique { is_primary: true } => {
+                    if !pk_column_names.is_empty() {
+                        return Err(ErrorCode::BindError(
+                            "multiple primary keys are not allowed".into(),
+                        )
+                        .into());
+                    }
+                    pk_column_names.push(column.name.real_value());
+                }
+                ColumnOption::GeneratedColumns(_) => {
+                    // Bind generated columns in `bind_sql_column_constraints`
+                }
+                _ => {
+                    return Err(ErrorCode::NotImplemented(
+                        format!("column constraints \"{}\"", option_def),
+                        None.into(),
+                    )
+                    .into())
+                }
+            }
+        }
+    }
+
+    // Bind table constraints.
+    for constraint in table_constraints {
         match constraint {
             TableConstraint::Unique {
                 name: _,
@@ -208,7 +305,7 @@ pub fn bind_sql_table_constraints(
                     )
                     .into());
                 }
-                pk_column_names = columns;
+                pk_column_names = columns.iter().map(|c| c.real_value()).collect_vec();
             }
             _ => {
                 return Err(ErrorCode::NotImplemented(
@@ -219,36 +316,17 @@ pub fn bind_sql_table_constraints(
             }
         }
     }
-    let mut pk_column_ids = match (pk_column_id_from_columns, pk_column_names.is_empty()) {
-        (Some(_), false) => {
-            return Err(ErrorCode::BindError("multiple primary keys are not allowed".into()).into())
-        }
-        (None, true) => {
-            // We don't have a pk column now, so we need to add row_id column as the pk column
-            // later.
-            vec![]
-        }
-        (Some(cid), true) => vec![cid],
-        (None, false) => {
-            let name_to_id = column_descs
-                .iter()
-                .map(|c| (c.name.as_str(), c.column_id))
-                .collect::<HashMap<_, _>>();
-            pk_column_names
-                .iter()
-                .map(|ident| {
-                    let name = ident.real_value();
-                    name_to_id.get(name.as_str()).copied().ok_or_else(|| {
-                        ErrorCode::BindError(format!(
-                            "column \"{name}\" named in key does not exist"
-                        ))
-                    })
-                })
-                .try_collect()?
-        }
-    };
 
-    let mut columns_catalog = column_descs
+    let mut pk_column_ids: Vec<_> = pk_column_names
+        .iter()
+        .map(|name| {
+            name_to_id.get(name.as_str()).copied().ok_or_else(|| {
+                ErrorCode::BindError(format!("column \"{name}\" named in key does not exist"))
+            })
+        })
+        .try_collect()?;
+
+    let mut columns_catalog = columns_descs
         .into_iter()
         .map(|c| {
             // All columns except `_row_id` or starts with `_rw` should be visible.
@@ -284,21 +362,22 @@ pub fn bind_sql_table_constraints(
 pub(crate) async fn gen_create_table_plan_with_source(
     context: OptimizerContext,
     table_name: ObjectName,
-    columns: Vec<ColumnDef>,
+    column_defs: Vec<ColumnDef>,
     constraints: Vec<TableConstraint>,
     source_schema: SourceSchema,
     source_watermarks: Vec<SourceWatermark>,
     mut col_id_gen: ColumnIdGenerator,
     append_only: bool,
-) -> Result<(PlanRef, Option<ProstSource>, ProstTable)> {
-    let (column_descs, pk_column_id_from_columns) = bind_sql_columns(columns, &mut col_id_gen)?;
+) -> Result<(PlanRef, Option<PbSource>, PbTable)> {
+    let session = context.session_ctx();
+    let column_descs = bind_sql_columns(column_defs.clone(), &mut col_id_gen)?;
     let mut properties = context.with_options().inner().clone().into_iter().collect();
 
     let (mut columns, mut pk_column_ids, mut row_id_index) =
-        bind_sql_table_constraints(column_descs, pk_column_id_from_columns, constraints)?;
+        bind_sql_table_column_constraints(column_descs, column_defs.clone(), constraints)?;
 
     let watermark_descs = bind_source_watermark(
-        context.session_ctx(),
+        session,
         table_name.real_value(),
         source_watermarks,
         &columns,
@@ -318,6 +397,8 @@ pub(crate) async fn gen_create_table_plan_with_source(
     )
     .await?;
 
+    bind_sql_column_constraints(session, table_name.real_value(), &mut columns, column_defs)?;
+
     gen_table_plan_inner(
         context.into(),
         table_name,
@@ -343,16 +424,16 @@ pub(crate) fn gen_create_table_plan(
     mut col_id_gen: ColumnIdGenerator,
     source_watermarks: Vec<SourceWatermark>,
     append_only: bool,
-) -> Result<(PlanRef, Option<ProstSource>, ProstTable)> {
+) -> Result<(PlanRef, Option<PbSource>, PbTable)> {
     let definition = context.normalized_sql().to_owned();
-    let (column_descs, pk_column_id_from_columns) = bind_sql_columns(columns, &mut col_id_gen)?;
+    let column_descs = bind_sql_columns(columns.clone(), &mut col_id_gen)?;
 
     let properties = context.with_options().inner().clone().into_iter().collect();
     gen_create_table_plan_without_bind(
         context,
         table_name,
         column_descs,
-        pk_column_id_from_columns,
+        columns,
         constraints,
         properties,
         definition,
@@ -367,16 +448,16 @@ pub(crate) fn gen_create_table_plan_without_bind(
     context: OptimizerContext,
     table_name: ObjectName,
     column_descs: Vec<ColumnDesc>,
-    pk_column_id_from_columns: Option<ColumnId>,
+    column_defs: Vec<ColumnDef>,
     constraints: Vec<TableConstraint>,
     properties: HashMap<String, String>,
     definition: String,
     source_watermarks: Vec<SourceWatermark>,
     append_only: bool,
     version: Option<TableVersion>,
-) -> Result<(PlanRef, Option<ProstSource>, ProstTable)> {
-    let (columns, pk_column_ids, row_id_index) =
-        bind_sql_table_constraints(column_descs, pk_column_id_from_columns, constraints)?;
+) -> Result<(PlanRef, Option<PbSource>, PbTable)> {
+    let (mut columns, pk_column_ids, row_id_index) =
+        bind_sql_table_column_constraints(column_descs, column_defs.clone(), constraints)?;
 
     let watermark_descs = bind_source_watermark(
         context.session_ctx(),
@@ -385,6 +466,13 @@ pub(crate) fn gen_create_table_plan_without_bind(
         &columns,
     )?;
 
+    bind_sql_column_constraints(
+        context.session_ctx(),
+        table_name.real_value(),
+        &mut columns,
+        column_defs,
+    )?;
+
     gen_table_plan_inner(
         context.into(),
         table_name,
@@ -414,13 +502,13 @@ fn gen_table_plan_inner(
     append_only: bool,
     version: Option<TableVersion>, /* TODO: this should always be `Some` if we support `ALTER
                                     * TABLE` for `CREATE TABLE AS`. */
-) -> Result<(PlanRef, Option<ProstSource>, ProstTable)> {
+) -> Result<(PlanRef, Option<PbSource>, PbTable)> {
     let session = context.session_ctx();
     let db_name = session.database();
     let (schema_name, name) = Binder::resolve_schema_qualified_name(db_name, table_name)?;
     let (database_id, schema_id) = session.get_database_and_schema_id_for_create(schema_name)?;
 
-    let source = source_info.map(|source_info| ProstSource {
+    let source = source_info.map(|source_info| PbSource {
         id: TableId::placeholder().table_id,
         schema_id,
         database_id,
@@ -452,21 +540,13 @@ fn gen_table_plan_inner(
     )
     .into();
 
-    let mut required_cols = FixedBitSet::with_capacity(source_node.schema().len());
-    required_cols.toggle_range(..);
-    let mut out_names = source_node.schema().names();
-
-    if let Some(row_id_index) = row_id_index {
-        required_cols.toggle(row_id_index);
-        out_names.remove(row_id_index);
-    }
-
+    let required_cols = FixedBitSet::with_capacity(source_node.schema().len());
     let mut plan_root = PlanRoot::new(
         source_node,
         RequiredDist::Any,
         Order::any(),
         required_cols,
-        out_names,
+        vec![],
     );
 
     if append_only && row_id_index.is_none() {
@@ -659,7 +739,7 @@ mod tests {
 
         let row_id_col_name = row_id_column_name();
         let expected_columns = maplit::hashmap! {
-            row_id_col_name.as_str() => DataType::Int64,
+            row_id_col_name.as_str() => DataType::Serial,
             "v1" => DataType::Int16,
             "v2" => DataType::new_struct(
                 vec![DataType::Int64,DataType::Float64,DataType::Float64],
@@ -718,13 +798,10 @@ mod tests {
                     ..
                 } = ast.remove(0) else { panic!("test case should be create table") };
             let actual: Result<_> = (|| {
-                let (column_descs, pk_column_id_from_columns) =
-                    bind_sql_columns(columns, &mut ColumnIdGenerator::new_initial())?;
-                let (_, pk_column_ids, _) = bind_sql_table_constraints(
-                    column_descs,
-                    pk_column_id_from_columns,
-                    constraints,
-                )?;
+                let column_descs =
+                    bind_sql_columns(columns.clone(), &mut ColumnIdGenerator::new_initial())?;
+                let (_, pk_column_ids, _) =
+                    bind_sql_table_column_constraints(column_descs, columns, constraints)?;
                 Ok(pk_column_ids)
             })();
             match (expected, actual) {
diff --git a/src/frontend/src/handler/create_table_as.rs b/src/frontend/src/handler/create_table_as.rs
index 4db3dbd5cfa60..488dffe8729c7 100644
--- a/src/frontend/src/handler/create_table_as.rs
+++ b/src/frontend/src/handler/create_table_as.rs
@@ -97,7 +97,7 @@ pub async fn handle_create_as(
             context,
             table_name.clone(),
             column_descs,
-            None,
+            vec![],
             vec![],
             properties,
             "".to_owned(), // TODO: support `SHOW CREATE TABLE` for `CREATE TABLE AS`
diff --git a/src/frontend/src/handler/create_view.rs b/src/frontend/src/handler/create_view.rs
index cf6a07364d814..d0850bb6e539e 100644
--- a/src/frontend/src/handler/create_view.rs
+++ b/src/frontend/src/handler/create_view.rs
@@ -19,7 +19,7 @@ use std::collections::HashSet;
 use pgwire::pg_response::{PgResponse, StatementType};
 use risingwave_common::error::Result;
 use risingwave_common::util::iter_util::ZipEqFast;
-use risingwave_pb::catalog::View as ProstView;
+use risingwave_pb::catalog::PbView;
 use risingwave_sqlparser::ast::{Ident, ObjectName, Query, Statement};
 
 use super::RwPgResponse;
@@ -80,7 +80,7 @@ pub async fn handle_create_view(
             .collect()
     };
 
-    let view = ProstView {
+    let view = PbView {
         id: 0,
         schema_id,
         database_id,
diff --git a/src/frontend/src/handler/describe.rs b/src/frontend/src/handler/describe.rs
index b14159e3a816c..22c0e474826a0 100644
--- a/src/frontend/src/handler/describe.rs
+++ b/src/frontend/src/handler/describe.rs
@@ -22,7 +22,6 @@ use pgwire::types::Row;
 use risingwave_common::catalog::ColumnDesc;
 use risingwave_common::error::Result;
 use risingwave_common::types::DataType;
-use risingwave_common::util::sort_util::Direction;
 use risingwave_sqlparser::ast::{display_comma_separated, ObjectName};
 
 use super::RwPgResponse;
@@ -120,11 +119,7 @@ pub fn handle_describe(handler_args: HandlerArgs, table_name: ObjectName) -> Res
             .filter(|x| !index_table.columns[x.column_index].is_hidden)
             .map(|x| {
                 let index_column_name = index_table.columns[x.column_index].name().to_string();
-                if Direction::Descending == x.order_type.direction() {
-                    index_column_name + " DESC"
-                } else {
-                    index_column_name
-                }
+                format!("{} {}", index_column_name, x.order_type)
             })
             .collect_vec();
 
@@ -236,12 +231,12 @@ mod tests {
         }
 
         let expected_columns: HashMap<String, String> = maplit::hashmap! {
-            "v1".into() => "Int32".into(),
-            "v2".into() => "Int32".into(),
-            "v3".into() => "Int32".into(),
-            "v4".into() => "Int32".into(),
+            "v1".into() => "integer".into(),
+            "v2".into() => "integer".into(),
+            "v3".into() => "integer".into(),
+            "v4".into() => "integer".into(),
             "primary key".into() => "v3".into(),
-            "idx1".into() => "index(v1 DESC, v2, v3) include(v4) distributed by(v1, v2)".into(),
+            "idx1".into() => "index(v1 DESC, v2 ASC, v3 ASC) include(v4) distributed by(v1, v2)".into(),
         };
 
         assert_eq!(columns, expected_columns);
diff --git a/src/frontend/src/handler/explain.rs b/src/frontend/src/handler/explain.rs
index c33e52c86d0e2..5a50370ab1d0e 100644
--- a/src/frontend/src/handler/explain.rs
+++ b/src/frontend/src/handler/explain.rs
@@ -152,7 +152,7 @@ pub async fn handle_explain(
                 Convention::Stream => {
                     let graph = build_graph(plan);
                     rows.extend(
-                        explain_stream_graph(&graph, explain_verbose)?
+                        explain_stream_graph(&graph, explain_verbose)
                             .lines()
                             .map(|s| Row::new(vec![Some(s.to_string().into())])),
                     );
diff --git a/src/frontend/src/handler/handle_privilege.rs b/src/frontend/src/handler/handle_privilege.rs
index b677f28b11cbe..9e3c46667ff93 100644
--- a/src/frontend/src/handler/handle_privilege.rs
+++ b/src/frontend/src/handler/handle_privilege.rs
@@ -14,8 +14,8 @@
 
 use pgwire::pg_response::{PgResponse, StatementType};
 use risingwave_common::error::{ErrorCode, Result};
-use risingwave_pb::user::grant_privilege::{ActionWithGrantOption, Object as ProstObject};
-use risingwave_pb::user::GrantPrivilege as ProstPrivilege;
+use risingwave_pb::user::grant_privilege::{ActionWithGrantOption, PbObject};
+use risingwave_pb::user::PbGrantPrivilege;
 use risingwave_sqlparser::ast::{GrantObjects, Privileges, Statement};
 
 use super::RwPgResponse;
@@ -31,7 +31,7 @@ fn make_prost_privilege(
     session: &SessionImpl,
     privileges: Privileges,
     objects: GrantObjects,
-) -> Result<Vec<ProstPrivilege>> {
+) -> Result<Vec<PbGrantPrivilege>> {
     check_privilege_type(&privileges, &objects)?;
 
     let catalog_reader = session.env().catalog_reader();
@@ -46,14 +46,14 @@ fn make_prost_privilege(
             for db in databases {
                 let database_name = Binder::resolve_database_name(db)?;
                 let database = reader.get_database_by_name(&database_name)?;
-                grant_objs.push(ProstObject::DatabaseId(database.id()));
+                grant_objs.push(PbObject::DatabaseId(database.id()));
             }
         }
         GrantObjects::Schemas(schemas) => {
             for schema in schemas {
                 let schema_name = Binder::resolve_schema_name(schema)?;
                 let schema = reader.get_schema_by_name(session.database(), &schema_name)?;
-                grant_objs.push(ProstObject::SchemaId(schema.id()));
+                grant_objs.push(PbObject::SchemaId(schema.id()));
             }
         }
         GrantObjects::Mviews(tables) => {
@@ -67,7 +67,7 @@ fn make_prost_privilege(
                 let schema_path = SchemaPath::new(schema_name.as_deref(), &search_path, user_name);
 
                 let (table, _) = reader.get_table_by_name(db_name, schema_path, &table_name)?;
-                grant_objs.push(ProstObject::TableId(table.id().table_id));
+                grant_objs.push(PbObject::TableId(table.id().table_id));
             }
         }
         GrantObjects::Sources(sources) => {
@@ -81,21 +81,21 @@ fn make_prost_privilege(
                 let schema_path = SchemaPath::new(schema_name.as_deref(), &search_path, user_name);
 
                 let (source, _) = reader.get_source_by_name(db_name, schema_path, &source_name)?;
-                grant_objs.push(ProstObject::SourceId(source.id));
+                grant_objs.push(PbObject::SourceId(source.id));
             }
         }
         GrantObjects::AllSourcesInSchema { schemas } => {
             for schema in schemas {
                 let schema_name = Binder::resolve_schema_name(schema)?;
                 let schema = reader.get_schema_by_name(session.database(), &schema_name)?;
-                grant_objs.push(ProstObject::AllSourcesSchemaId(schema.id()));
+                grant_objs.push(PbObject::AllSourcesSchemaId(schema.id()));
             }
         }
         GrantObjects::AllMviewsInSchema { schemas } => {
             for schema in schemas {
                 let schema_name = Binder::resolve_schema_name(schema)?;
                 let schema = reader.get_schema_by_name(session.database(), &schema_name)?;
-                grant_objs.push(ProstObject::AllTablesSchemaId(schema.id()));
+                grant_objs.push(PbObject::AllTablesSchemaId(schema.id()));
             }
         }
         o => {
@@ -120,7 +120,7 @@ fn make_prost_privilege(
 
     let mut prost_privileges = vec![];
     for objs in grant_objs {
-        prost_privileges.push(ProstPrivilege {
+        prost_privileges.push(PbGrantPrivilege {
             action_with_opts: action_with_opts.clone(),
             object: Some(objs),
         });
@@ -261,15 +261,15 @@ mod tests {
             assert_eq!(
                 user_info.grant_privileges,
                 vec![
-                    ProstPrivilege {
+                    PbGrantPrivilege {
                         action_with_opts: vec![ActionWithGrantOption {
                             action: Action::Connect as i32,
                             with_grant_option: true,
                             granted_by: session.user_id(),
                         }],
-                        object: Some(ProstObject::DatabaseId(session_database_id)),
+                        object: Some(PbObject::DatabaseId(session_database_id)),
                     },
-                    ProstPrivilege {
+                    PbGrantPrivilege {
                         action_with_opts: vec![
                             ActionWithGrantOption {
                                 action: Action::Connect as i32,
@@ -282,7 +282,7 @@ mod tests {
                                 granted_by: DEFAULT_SUPER_USER_ID,
                             }
                         ],
-                        object: Some(ProstObject::DatabaseId(database_id)),
+                        object: Some(PbObject::DatabaseId(database_id)),
                     }
                 ]
             );
@@ -299,7 +299,7 @@ mod tests {
             assert!(user_info
                 .grant_privileges
                 .iter()
-                .filter(|gp| gp.object == Some(ProstObject::DatabaseId(database_id)))
+                .filter(|gp| gp.object == Some(PbObject::DatabaseId(database_id)))
                 .all(|p| p.action_with_opts.iter().all(|ao| !ao.with_grant_option)));
         }
 
@@ -313,13 +313,13 @@ mod tests {
             let user_info = reader.get_user_by_name("user1").unwrap();
             assert_eq!(
                 user_info.grant_privileges,
-                vec![ProstPrivilege {
+                vec![PbGrantPrivilege {
                     action_with_opts: vec![ActionWithGrantOption {
                         action: Action::Connect as i32,
                         with_grant_option: true,
                         granted_by: session.user_id(),
                     }],
-                    object: Some(ProstObject::DatabaseId(session_database_id)),
+                    object: Some(PbObject::DatabaseId(session_database_id)),
                 }]
             );
         }
diff --git a/src/frontend/src/handler/mod.rs b/src/frontend/src/handler/mod.rs
index 01cd757f21c39..cd17124d20600 100644
--- a/src/frontend/src/handler/mod.rs
+++ b/src/frontend/src/handler/mod.rs
@@ -29,10 +29,12 @@ use risingwave_sqlparser::ast::*;
 
 use self::util::DataChunkToRowSetAdapter;
 use self::variable::handle_set_time_zone;
+use crate::catalog::table_catalog::TableType;
 use crate::scheduler::{DistributedQueryStream, LocalQueryStream};
 use crate::session::SessionImpl;
 use crate::utils::WithOptions;
 
+mod alter_relation_rename;
 mod alter_system;
 mod alter_table_column;
 pub mod alter_user;
@@ -322,7 +324,6 @@ pub async fn handle(
             name,
             columns,
             query,
-
             with_options: _, // It is put in OptimizerContext
             or_replace,      // not supported
             emit_mode,
@@ -387,6 +388,47 @@ pub async fn handle(
                 operation @ (AlterTableOperation::AddColumn { .. }
                 | AlterTableOperation::DropColumn { .. }),
         } => alter_table_column::handle_alter_table_column(handler_args, name, operation).await,
+        Statement::AlterTable {
+            name,
+            operation: AlterTableOperation::RenameTable { table_name },
+        } => {
+            alter_relation_rename::handle_rename_table(
+                handler_args,
+                TableType::Table,
+                name,
+                table_name,
+            )
+            .await
+        }
+        Statement::AlterIndex {
+            name,
+            operation: AlterIndexOperation::RenameIndex { index_name },
+        } => alter_relation_rename::handle_rename_index(handler_args, name, index_name).await,
+        Statement::AlterView {
+            materialized,
+            name,
+            operation: AlterViewOperation::RenameView { view_name },
+        } => {
+            if materialized {
+                alter_relation_rename::handle_rename_table(
+                    handler_args,
+                    TableType::MaterializedView,
+                    name,
+                    view_name,
+                )
+                .await
+            } else {
+                alter_relation_rename::handle_rename_view(handler_args, name, view_name).await
+            }
+        }
+        Statement::AlterSink {
+            name,
+            operation: AlterSinkOperation::RenameSink { sink_name },
+        } => alter_relation_rename::handle_rename_sink(handler_args, name, sink_name).await,
+        Statement::AlterSource {
+            name,
+            operation: AlterSourceOperation::RenameSource { source_name },
+        } => alter_relation_rename::handle_rename_source(handler_args, name, source_name).await,
         Statement::AlterSystem { param, value } => {
             alter_system::handle_alter_system(handler_args, param, value).await
         }
diff --git a/src/frontend/src/handler/privilege.rs b/src/frontend/src/handler/privilege.rs
index e144990898f1f..21c0ce5317fc6 100644
--- a/src/frontend/src/handler/privilege.rs
+++ b/src/frontend/src/handler/privilege.rs
@@ -14,7 +14,7 @@
 
 use risingwave_common::error::ErrorCode::PermissionDenied;
 use risingwave_common::error::Result;
-use risingwave_pb::user::grant_privilege::{Action as ProstAction, Object as ProstObject};
+use risingwave_pb::user::grant_privilege::{PbAction, PbObject};
 
 use crate::binder::{BoundStatement, Relation};
 use crate::catalog::RelationCatalog;
@@ -23,12 +23,12 @@ use crate::user::UserId;
 
 pub struct ObjectCheckItem {
     owner: UserId,
-    action: ProstAction,
-    object: ProstObject,
+    action: PbAction,
+    object: PbObject,
 }
 
 impl ObjectCheckItem {
-    pub fn new(owner: UserId, action: ProstAction, object: ProstObject) -> Self {
+    pub fn new(owner: UserId, action: PbAction, object: PbObject) -> Self {
         Self {
             owner,
             action,
@@ -40,7 +40,7 @@ impl ObjectCheckItem {
 /// resolve privileges in `relation`
 pub(crate) fn resolve_relation_privileges(
     relation: &Relation,
-    action: ProstAction,
+    action: PbAction,
     objects: &mut Vec<ObjectCheckItem>,
 ) {
     match relation {
@@ -48,7 +48,7 @@ pub(crate) fn resolve_relation_privileges(
             let item = ObjectCheckItem {
                 owner: source.catalog.owner,
                 action,
-                object: ProstObject::SourceId(source.catalog.id),
+                object: PbObject::SourceId(source.catalog.id),
             };
             objects.push(item);
         }
@@ -56,7 +56,7 @@ pub(crate) fn resolve_relation_privileges(
             let item = ObjectCheckItem {
                 owner: table.table_catalog.owner,
                 action,
-                object: ProstObject::TableId(table.table_id.table_id),
+                object: PbObject::TableId(table.table_id.table_id),
             };
             objects.push(item);
         }
@@ -85,36 +85,36 @@ pub(crate) fn resolve_privileges(stmt: &BoundStatement) -> Vec<ObjectCheckItem>
         BoundStatement::Insert(ref insert) => {
             let object = ObjectCheckItem {
                 owner: insert.owner,
-                action: ProstAction::Insert,
-                object: ProstObject::TableId(insert.table_id.table_id),
+                action: PbAction::Insert,
+                object: PbObject::TableId(insert.table_id.table_id),
             };
             objects.push(object);
             if let crate::binder::BoundSetExpr::Select(select) = &insert.source.body {
                 if let Some(sub_relation) = &select.from {
-                    resolve_relation_privileges(sub_relation, ProstAction::Select, &mut objects);
+                    resolve_relation_privileges(sub_relation, PbAction::Select, &mut objects);
                 }
             }
         }
         BoundStatement::Delete(ref delete) => {
             let object = ObjectCheckItem {
                 owner: delete.owner,
-                action: ProstAction::Delete,
-                object: ProstObject::TableId(delete.table_id.table_id),
+                action: PbAction::Delete,
+                object: PbObject::TableId(delete.table_id.table_id),
             };
             objects.push(object);
         }
         BoundStatement::Update(ref update) => {
             let object = ObjectCheckItem {
                 owner: update.owner,
-                action: ProstAction::Update,
-                object: ProstObject::TableId(update.table_id.table_id),
+                action: PbAction::Update,
+                object: PbObject::TableId(update.table_id.table_id),
             };
             objects.push(object);
         }
         BoundStatement::Query(ref query) => {
             if let crate::binder::BoundSetExpr::Select(select) = &query.body {
                 if let Some(sub_relation) = &select.from {
-                    resolve_relation_privileges(sub_relation, ProstAction::Select, &mut objects);
+                    resolve_relation_privileges(sub_relation, PbAction::Select, &mut objects);
                 }
             }
         }
@@ -226,8 +226,8 @@ mod tests {
             .clone();
         let check_items = vec![ObjectCheckItem::new(
             DEFAULT_SUPER_USER_ID,
-            ProstAction::Create,
-            ProstObject::SchemaId(schema.id()),
+            PbAction::Create,
+            PbObject::SchemaId(schema.id()),
         )];
         assert!(&session.check_privileges(&check_items).is_ok());
 
diff --git a/src/frontend/src/handler/query.rs b/src/frontend/src/handler/query.rs
index 7b5a4ae708511..ffa27a59a67cb 100644
--- a/src/frontend/src/handler/query.rs
+++ b/src/frontend/src/handler/query.rs
@@ -29,13 +29,15 @@ use risingwave_sqlparser::ast::{SetExpr, Statement};
 
 use super::extended_handle::{Portal, PrepareStatement};
 use super::{PgResponseStream, RwPgResponse};
-use crate::binder::{Binder, BoundSetExpr, BoundStatement};
+use crate::binder::Binder;
 use crate::handler::flush::do_flush;
 use crate::handler::privilege::resolve_privileges;
 use crate::handler::util::{to_pg_field, DataChunkToRowSetAdapter};
 use crate::handler::HandlerArgs;
 use crate::optimizer::plan_node::Explain;
-use crate::optimizer::{ExecutionModeDecider, OptimizerContext, OptimizerContextRef};
+use crate::optimizer::{
+    ExecutionModeDecider, OptimizerContext, OptimizerContextRef, SysTableVisitor,
+};
 use crate::planner::Planner;
 use crate::scheduler::plan_fragmenter::Query;
 use crate::scheduler::{
@@ -76,20 +78,6 @@ fn must_run_in_distributed_mode(stmt: &Statement) -> Result<bool> {
     ) | is_insert_using_select(stmt))
 }
 
-fn must_run_in_local_mode(bound: &BoundStatement) -> bool {
-    let mut must_local = false;
-
-    if let BoundStatement::Query(query) = &bound {
-        if let BoundSetExpr::Select(select) = &query.body
-            && let Some(relation) = &select.from
-            && relation.contains_sys_table() {
-                must_local = true;
-        }
-    }
-
-    must_local
-}
-
 pub fn gen_batch_query_plan(
     session: &SessionImpl,
     context: OptimizerContextRef,
@@ -105,14 +93,14 @@ pub fn gen_batch_query_plan(
     let check_items = resolve_privileges(&bound);
     session.check_privileges(&check_items)?;
 
-    let must_local = must_run_in_local_mode(&bound);
-
     let mut planner = Planner::new(context);
 
     let mut logical = planner.plan(bound)?;
     let schema = logical.schema();
     let batch_plan = logical.gen_batch_plan()?;
 
+    let must_local = must_run_in_local_mode(batch_plan.clone());
+
     let query_mode = match (must_dist, must_local) {
         (true, true) => {
             return Err(ErrorCode::InternalError(
@@ -145,6 +133,10 @@ fn determine_query_mode(batch_plan: PlanRef) -> QueryMode {
     }
 }
 
+fn must_run_in_local_mode(batch_plan: PlanRef) -> bool {
+    SysTableVisitor::has_sys_table(batch_plan)
+}
+
 pub async fn handle_query(
     handler_args: HandlerArgs,
     stmt: Statement,
@@ -389,7 +381,6 @@ pub async fn handle_execute(handler_args: HandlerArgs, portal: Portal) -> Result
         let context = OptimizerContext::from_handler_args(handler_args);
 
         let must_dist = must_run_in_distributed_mode(&statement)?;
-        let must_local = must_run_in_local_mode(&bound_statement);
 
         let mut planner = Planner::new(context.into());
 
@@ -397,6 +388,8 @@ pub async fn handle_execute(handler_args: HandlerArgs, portal: Portal) -> Result
         let schema = logical.schema();
         let batch_plan = logical.gen_batch_plan()?;
 
+        let must_local = must_run_in_local_mode(batch_plan.clone());
+
         let query_mode = match (must_dist, must_local) {
             (true, true) => {
                 return Err(ErrorCode::InternalError(
diff --git a/src/frontend/src/handler/show.rs b/src/frontend/src/handler/show.rs
index f03513f294fbd..2d7db829baa6f 100644
--- a/src/frontend/src/handler/show.rs
+++ b/src/frontend/src/handler/show.rs
@@ -251,14 +251,14 @@ mod tests {
         }
 
         let expected_columns: HashMap<String, String> = maplit::hashmap! {
-            "id".into() => "Int32".into(),
-            "country.zipcode".into() => "Varchar".into(),
-            "zipcode".into() => "Int64".into(),
-            "country.city.address".into() => "Varchar".into(),
-            "country.address".into() => "Varchar".into(),
+            "id".into() => "integer".into(),
+            "country.zipcode".into() => "varchar".into(),
+            "zipcode".into() => "bigint".into(),
+            "country.city.address".into() => "varchar".into(),
+            "country.address".into() => "varchar".into(),
             "country.city".into() => "test.City".into(),
-            "country.city.zipcode".into() => "Varchar".into(),
-            "rate".into() => "Float32".into(),
+            "country.city.zipcode".into() => "varchar".into(),
+            "rate".into() => "real".into(),
             "country".into() => "test.Country".into(),
         };
 
diff --git a/src/frontend/src/handler/util.rs b/src/frontend/src/handler/util.rs
index f6b02287b077f..159c247085170 100644
--- a/src/frontend/src/handler/util.rs
+++ b/src/frontend/src/handler/util.rs
@@ -177,7 +177,7 @@ pub fn col_descs_to_rows(columns: Vec<ColumnDesc>) -> Vec<Row> {
                     let type_name = if let DataType::Struct { .. } = c.data_type {
                         c.type_name.clone()
                     } else {
-                        format!("{:?}", &c.data_type)
+                        c.data_type.to_string()
                     };
                     Row::new(vec![Some(c.name.into()), Some(type_name.into())])
                 })
diff --git a/src/frontend/src/lib.rs b/src/frontend/src/lib.rs
index 3e521d7b147be..091ea516888e7 100644
--- a/src/frontend/src/lib.rs
+++ b/src/frontend/src/lib.rs
@@ -61,6 +61,8 @@ mod user;
 pub mod health_service;
 mod monitor;
 
+mod telemetry;
+
 use std::ffi::OsString;
 use std::iter;
 use std::sync::Arc;
diff --git a/src/frontend/src/observer/observer_manager.rs b/src/frontend/src/observer/observer_manager.rs
index 41995f161261d..ae22e1f8913af 100644
--- a/src/frontend/src/observer/observer_manager.rs
+++ b/src/frontend/src/observer/observer_manager.rs
@@ -20,6 +20,7 @@ use risingwave_common::hash::ParallelUnitMapping;
 use risingwave_common::system_param::local_manager::LocalSystemParamsManagerRef;
 use risingwave_common_service::observer_manager::{ObserverState, SubscribeFrontend};
 use risingwave_pb::common::WorkerNode;
+use risingwave_pb::meta::relation::RelationInfo;
 use risingwave_pb::meta::subscribe_response::{Info, Operation};
 use risingwave_pb::meta::{FragmentParallelUnitMapping, SubscribeResponse};
 use tokio::sync::watch::Sender;
@@ -49,14 +50,7 @@ impl ObserverState for FrontendObserverNode {
         };
 
         match info.to_owned() {
-            Info::Database(_)
-            | Info::Schema(_)
-            | Info::Table(_)
-            | Info::Source(_)
-            | Info::Index(_)
-            | Info::Sink(_)
-            | Info::Function(_)
-            | Info::View(_) => {
+            Info::Database(_) | Info::Schema(_) | Info::RelationGroup(_) => {
                 self.handle_catalog_notification(resp);
             }
             Info::Node(node) => {
@@ -193,51 +187,80 @@ impl FrontendObserverNode {
                 Operation::Delete => catalog_guard.drop_schema(schema.database_id, schema.id),
                 _ => panic!("receive an unsupported notify {:?}", resp),
             },
-            Info::Table(table) => match resp.operation() {
-                Operation::Add => catalog_guard.create_table(table),
-                Operation::Delete => {
-                    catalog_guard.drop_table(table.database_id, table.schema_id, table.id.into())
-                }
-                Operation::Update => catalog_guard.update_table(table),
-                _ => panic!("receive an unsupported notify {:?}", resp),
-            },
-            Info::Source(source) => match resp.operation() {
-                Operation::Add => catalog_guard.create_source(source),
-                Operation::Delete => {
-                    catalog_guard.drop_source(source.database_id, source.schema_id, source.id)
-                }
-                _ => panic!("receive an unsupported notify {:?}", resp),
-            },
-            Info::Sink(sink) => match resp.operation() {
-                Operation::Add => catalog_guard.create_sink(sink),
-                Operation::Delete => {
-                    catalog_guard.drop_sink(sink.database_id, sink.schema_id, sink.id)
-                }
-                _ => panic!("receive an unsupported notify {:?}", resp),
-            },
-            Info::Index(index) => match resp.operation() {
-                Operation::Add => catalog_guard.create_index(index),
-                Operation::Delete => {
-                    catalog_guard.drop_index(index.database_id, index.schema_id, index.id.into())
-                }
-                _ => panic!("receive an unsupported notify {:?}", resp),
-            },
-            Info::View(view) => match resp.operation() {
-                Operation::Add => catalog_guard.create_view(view),
-                Operation::Delete => {
-                    catalog_guard.drop_view(view.database_id, view.schema_id, view.id)
+            Info::RelationGroup(relation_group) => {
+                for relation in &relation_group.relations {
+                    let Some(relation) = relation.relation_info.as_ref() else {
+                        continue;
+                    };
+                    match relation {
+                        RelationInfo::Table(table) => match resp.operation() {
+                            Operation::Add => catalog_guard.create_table(table),
+                            Operation::Delete => catalog_guard.drop_table(
+                                table.database_id,
+                                table.schema_id,
+                                table.id.into(),
+                            ),
+                            Operation::Update => {
+                                let old_table =
+                                    catalog_guard.get_table_by_id(&table.id.into()).unwrap();
+                                catalog_guard.update_table(table);
+                                if old_table.fragment_id != table.fragment_id {
+                                    // FIXME: the frontend node delete its fragment for the update
+                                    // operation by itself.
+                                    self.worker_node_manager
+                                        .remove_fragment_mapping(&old_table.fragment_id);
+                                }
+                            }
+                            _ => panic!("receive an unsupported notify {:?}", resp),
+                        },
+                        RelationInfo::Source(source) => match resp.operation() {
+                            Operation::Add => catalog_guard.create_source(source),
+                            Operation::Delete => catalog_guard.drop_source(
+                                source.database_id,
+                                source.schema_id,
+                                source.id,
+                            ),
+                            Operation::Update => catalog_guard.update_source(source),
+                            _ => panic!("receive an unsupported notify {:?}", resp),
+                        },
+                        RelationInfo::Sink(sink) => match resp.operation() {
+                            Operation::Add => catalog_guard.create_sink(sink),
+                            Operation::Delete => {
+                                catalog_guard.drop_sink(sink.database_id, sink.schema_id, sink.id)
+                            }
+                            Operation::Update => catalog_guard.update_sink(sink),
+                            _ => panic!("receive an unsupported notify {:?}", resp),
+                        },
+                        RelationInfo::Index(index) => match resp.operation() {
+                            Operation::Add => catalog_guard.create_index(index),
+                            Operation::Delete => catalog_guard.drop_index(
+                                index.database_id,
+                                index.schema_id,
+                                index.id.into(),
+                            ),
+                            Operation::Update => catalog_guard.update_index(index),
+                            _ => panic!("receive an unsupported notify {:?}", resp),
+                        },
+                        RelationInfo::View(view) => match resp.operation() {
+                            Operation::Add => catalog_guard.create_view(view),
+                            Operation::Delete => {
+                                catalog_guard.drop_view(view.database_id, view.schema_id, view.id)
+                            }
+                            Operation::Update => catalog_guard.update_view(view),
+                            _ => panic!("receive an unsupported notify {:?}", resp),
+                        },
+                        RelationInfo::Function(function) => match resp.operation() {
+                            Operation::Add => catalog_guard.create_function(function),
+                            Operation::Delete => catalog_guard.drop_function(
+                                function.database_id,
+                                function.schema_id,
+                                function.id.into(),
+                            ),
+                            _ => panic!("receive an unsupported notify {:?}", resp),
+                        },
+                    }
                 }
-                _ => panic!("receive an unsupported notify {:?}", resp),
-            },
-            Info::Function(function) => match resp.operation() {
-                Operation::Add => catalog_guard.create_function(function),
-                Operation::Delete => catalog_guard.drop_function(
-                    function.database_id,
-                    function.schema_id,
-                    function.id.into(),
-                ),
-                _ => panic!("receive an unsupported notify {:?}", resp),
-            },
+            }
             _ => unreachable!(),
         }
         assert!(
diff --git a/src/frontend/src/optimizer/logical_optimization.rs b/src/frontend/src/optimizer/logical_optimization.rs
index 27506513c332c..f6a58b41e3a0f 100644
--- a/src/frontend/src/optimizer/logical_optimization.rs
+++ b/src/frontend/src/optimizer/logical_optimization.rs
@@ -159,9 +159,15 @@ lazy_static! {
         ApplyOrder::TopDown,
     );
 
-    static ref JOIN_REORDER: OptimizationStage = OptimizationStage::new(
+    static ref LEFT_DEEP_JOIN_REORDER: OptimizationStage = OptimizationStage::new(
         "Join Reorder".to_string(),
-        vec![ReorderMultiJoinRule::create()],
+        vec![LeftDeepTreeJoinOrderingRule::create()],
+        ApplyOrder::TopDown,
+    );
+
+    static ref BUSHY_TREE_JOIN_REORDER: OptimizationStage = OptimizationStage::new(
+        "Bushy tree join ordering Rule".to_string(),
+        vec![BushyTreeJoinOrderingRule::create()],
         ApplyOrder::TopDown,
     );
 
@@ -242,6 +248,12 @@ lazy_static! {
              MinMaxOnIndexRule::create()],
         ApplyOrder::TopDown,
     );
+
+    static ref ALWAYS_FALSE_FILTER: OptimizationStage = OptimizationStage::new(
+        "Void always-false filter's downstream",
+        vec![AlwaysFalseFilterRule::create()],
+        ApplyOrder::TopDown,
+    );
 }
 
 impl LogicalOptimizer {
@@ -365,9 +377,17 @@ impl LogicalOptimizer {
         // their relevant joins.
         plan = plan.optimize_by_rules(&TO_MULTI_JOIN);
 
-        // Reorder multijoin into left-deep join tree.
-        plan = plan.optimize_by_rules(&JOIN_REORDER);
-
+        // Reorder multijoin into join tree.
+        if plan
+            .ctx()
+            .session_ctx()
+            .config()
+            .get_streaming_enable_bushy_join()
+        {
+            plan = plan.optimize_by_rules(&BUSHY_TREE_JOIN_REORDER);
+        } else {
+            plan = plan.optimize_by_rules(&LEFT_DEEP_JOIN_REORDER);
+        }
         // Predicate Push-down: apply filter pushdown rules again since we pullup all join
         // conditions into a filter above the multijoin.
         plan = Self::predicate_pushdown(plan, explain_trace, &ctx);
@@ -426,6 +446,7 @@ impl LogicalOptimizer {
 
         plan = plan.optimize_by_rules(&REWRITE_LIKE_EXPR);
         plan = plan.optimize_by_rules(&UNION_MERGE);
+        plan = plan.optimize_by_rules(&ALWAYS_FALSE_FILTER);
 
         plan = Self::subquery_unnesting(plan, false, explain_trace, &ctx)?;
 
@@ -438,7 +459,7 @@ impl LogicalOptimizer {
         plan = plan.optimize_by_rules(&TO_MULTI_JOIN);
 
         // Reorder multijoin into left-deep join tree.
-        plan = plan.optimize_by_rules(&JOIN_REORDER);
+        plan = plan.optimize_by_rules(&LEFT_DEEP_JOIN_REORDER);
 
         // Predicate Push-down: apply filter pushdown rules again since we pullup all join
         // conditions into a filter above the multijoin.
diff --git a/src/frontend/src/optimizer/mod.rs b/src/frontend/src/optimizer/mod.rs
index 91dac433c14ce..94bd9cc842ee8 100644
--- a/src/frontend/src/optimizer/mod.rs
+++ b/src/frontend/src/optimizer/mod.rs
@@ -22,7 +22,7 @@ mod heuristic_optimizer;
 mod plan_rewriter;
 pub use plan_rewriter::PlanRewriter;
 mod plan_visitor;
-pub use plan_visitor::{ExecutionModeDecider, PlanVisitor};
+pub use plan_visitor::{ExecutionModeDecider, PlanVisitor, SysTableVisitor};
 mod logical_optimization;
 mod optimizer_context;
 mod plan_expr_rewriter;
@@ -41,8 +41,8 @@ use risingwave_pb::catalog::WatermarkDesc;
 
 use self::heuristic_optimizer::ApplyOrder;
 use self::plan_node::{
-    BatchProject, Convention, LogicalProject, StreamDml, StreamMaterialize, StreamProject,
-    StreamRowIdGen, StreamSink, StreamWatermarkFilter,
+    BatchProject, Convention, LogicalProject, LogicalSource, StreamDml, StreamMaterialize,
+    StreamProject, StreamRowIdGen, StreamSink, StreamWatermarkFilter,
 };
 use self::plan_visitor::has_batch_exchange;
 #[cfg(debug_assertions)]
@@ -263,12 +263,70 @@ impl PlanRoot {
         Ok(plan)
     }
 
+    /// Generate optimized stream plan
+    fn gen_optimized_stream_plan(&mut self) -> Result<PlanRef> {
+        let ctx = self.plan.ctx();
+        let _explain_trace = ctx.is_explain_trace();
+
+        let mut plan = self.gen_stream_plan()?;
+
+        plan = plan.optimize_by_rules(&OptimizationStage::new(
+            "Add identity project between exchange and share",
+            vec![AvoidExchangeShareRule::create()],
+            ApplyOrder::BottomUp,
+        ));
+
+        plan = plan.optimize_by_rules(&OptimizationStage::new(
+            "Merge StreamProject",
+            vec![StreamProjectMergeRule::create()],
+            ApplyOrder::BottomUp,
+        ));
+
+        if ctx.session_ctx().config().get_streaming_enable_delta_join() {
+            // TODO: make it a logical optimization.
+            // Rewrite joins with index to delta join
+            plan = plan.optimize_by_rules(&OptimizationStage::new(
+                "To IndexDeltaJoin",
+                vec![IndexDeltaJoinRule::create()],
+                ApplyOrder::BottomUp,
+            ));
+        }
+
+        // Inline session timezone
+        plan = inline_session_timezone_in_exprs(ctx.clone(), plan)?;
+
+        if ctx.is_explain_trace() {
+            ctx.trace("Inline session timezone:");
+            ctx.trace(plan.explain_to_string().unwrap());
+        }
+
+        // Const eval of exprs at the last minute
+        plan = const_eval_exprs(plan)?;
+
+        if ctx.is_explain_trace() {
+            ctx.trace("Const eval exprs:");
+            ctx.trace(plan.explain_to_string().unwrap());
+        }
+
+        #[cfg(debug_assertions)]
+        InputRefValidator.validate(plan.clone());
+
+        if TemporalJoinValidator::exist_dangling_temporal_scan(plan.clone()) {
+            return Err(ErrorCode::NotSupported(
+                "exist dangling temporal scan".to_string(),
+                "please check your temporal join syntax e.g. consider removing the right outer join if it is being used.".to_string(),
+            ).into());
+        }
+
+        Ok(plan)
+    }
+
     /// Generate create index or create materialize view plan.
     fn gen_stream_plan(&mut self) -> Result<PlanRef> {
         let ctx = self.plan.ctx();
         let explain_trace = ctx.is_explain_trace();
 
-        let mut plan = match self.plan.convention() {
+        let plan = match self.plan.convention() {
             Convention::Logical => {
                 let plan = self.gen_optimized_logical_plan_for_stream()?;
 
@@ -322,49 +380,6 @@ impl PlanRoot {
             ctx.trace("To Stream Plan:");
             ctx.trace(plan.explain_to_string().unwrap());
         }
-
-        plan = plan.optimize_by_rules(&OptimizationStage::new(
-            "Add identity project between exchange and share",
-            vec![AvoidExchangeShareRule::create()],
-            ApplyOrder::BottomUp,
-        ));
-
-        if ctx.session_ctx().config().get_streaming_enable_delta_join() {
-            // TODO: make it a logical optimization.
-            // Rewrite joins with index to delta join
-            plan = plan.optimize_by_rules(&OptimizationStage::new(
-                "To IndexDeltaJoin",
-                vec![IndexDeltaJoinRule::create()],
-                ApplyOrder::BottomUp,
-            ));
-        }
-
-        // Inline session timezone
-        plan = inline_session_timezone_in_exprs(ctx.clone(), plan)?;
-
-        if ctx.is_explain_trace() {
-            ctx.trace("Inline session timezone:");
-            ctx.trace(plan.explain_to_string().unwrap());
-        }
-
-        // Const eval of exprs at the last minute
-        plan = const_eval_exprs(plan)?;
-
-        if ctx.is_explain_trace() {
-            ctx.trace("Const eval exprs:");
-            ctx.trace(plan.explain_to_string().unwrap());
-        }
-
-        #[cfg(debug_assertions)]
-        InputRefValidator.validate(plan.clone());
-
-        if TemporalJoinValidator::exist_dangling_temporal_scan(plan.clone()) {
-            return Err(ErrorCode::NotSupported(
-                "exist dangling temporal scan".to_string(),
-                "please check your temporal join syntax e.g. consider removing the right outer join if it is being used.".to_string(),
-            ).into());
-        }
-
         Ok(plan)
     }
 
@@ -380,16 +395,28 @@ impl PlanRoot {
         watermark_descs: Vec<WatermarkDesc>,
         version: Option<TableVersion>,
     ) -> Result<StreamMaterialize> {
-        let mut stream_plan = self.gen_stream_plan()?;
+        let mut stream_plan = self.gen_optimized_stream_plan()?;
 
         // Add DML node.
         stream_plan = StreamDml::new(
             stream_plan,
             append_only,
-            columns.iter().map(|c| c.column_desc.clone()).collect(),
+            columns
+                .iter()
+                .filter_map(|c| (!c.is_generated()).then(|| c.column_desc.clone()))
+                .collect(),
         )
         .into();
 
+        // Add generated columns.
+        let exprs = LogicalSource::gen_optional_generated_column_project_exprs(
+            columns.iter().map(|c| c.column_desc.clone()).collect(),
+        )?;
+        if let Some(exprs) = exprs {
+            let logical_project = LogicalProject::new(stream_plan, exprs);
+            stream_plan = StreamProject::new(logical_project).into();
+        }
+
         // Add WatermarkFilter node.
         if !watermark_descs.is_empty() {
             stream_plan = StreamWatermarkFilter::new(stream_plan, watermark_descs).into();
@@ -402,7 +429,7 @@ impl PlanRoot {
 
         let conflict_behavior = match append_only {
             true => ConflictBehavior::NoCheck,
-            false => ConflictBehavior::OverWrite,
+            false => ConflictBehavior::Overwrite,
         };
         StreamMaterialize::create_for_table(
             stream_plan,
@@ -423,7 +450,7 @@ impl PlanRoot {
         mv_name: String,
         definition: String,
     ) -> Result<StreamMaterialize> {
-        let stream_plan = self.gen_stream_plan()?;
+        let stream_plan = self.gen_optimized_stream_plan()?;
 
         StreamMaterialize::create(
             stream_plan,
@@ -443,7 +470,7 @@ impl PlanRoot {
         index_name: String,
         definition: String,
     ) -> Result<StreamMaterialize> {
-        let stream_plan = self.gen_stream_plan()?;
+        let stream_plan = self.gen_optimized_stream_plan()?;
 
         StreamMaterialize::create(
             stream_plan,
@@ -464,7 +491,7 @@ impl PlanRoot {
         definition: String,
         properties: WithOptions,
     ) -> Result<StreamSink> {
-        let mut stream_plan = self.gen_stream_plan()?;
+        let mut stream_plan = self.gen_optimized_stream_plan()?;
 
         // Add a project node if there is hidden column(s).
         let input_fields = stream_plan.schema().fields();
diff --git a/src/frontend/src/optimizer/plan_node/batch_delete.rs b/src/frontend/src/optimizer/plan_node/batch_delete.rs
index e421973e17352..1b0d34dd29c3e 100644
--- a/src/frontend/src/optimizer/plan_node/batch_delete.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_delete.rs
@@ -19,7 +19,7 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::DeleteNode;
 
 use super::{
-    ExprRewritable, LogicalDelete, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst,
+    ExprRewritable, LogicalDelete, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::optimizer::plan_node::ToLocalBatch;
@@ -71,7 +71,7 @@ impl ToDistributedBatch for BatchDelete {
     }
 }
 
-impl ToBatchProst for BatchDelete {
+impl ToBatchPb for BatchDelete {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::Delete(DeleteNode {
             table_id: self.logical.table_id().table_id(),
diff --git a/src/frontend/src/optimizer/plan_node/batch_exchange.rs b/src/frontend/src/optimizer/plan_node/batch_exchange.rs
index 4018e8b83551e..d69ae041f65b8 100644
--- a/src/frontend/src/optimizer/plan_node/batch_exchange.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_exchange.rs
@@ -18,9 +18,7 @@ use risingwave_common::error::Result;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::{ExchangeNode, MergeSortExchangeNode};
 
-use super::{
-    ExprRewritable, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst, ToDistributedBatch,
-};
+use super::{ExprRewritable, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb, ToDistributedBatch};
 use crate::optimizer::plan_node::ToLocalBatch;
 use crate::optimizer::property::{Distribution, DistributionDisplay, Order, OrderDisplay};
 
@@ -76,7 +74,7 @@ impl ToDistributedBatch for BatchExchange {
 }
 
 /// The serialization of Batch Exchange is default cuz it will be rewritten in scheduler.
-impl ToBatchProst for BatchExchange {
+impl ToBatchPb for BatchExchange {
     fn to_batch_prost_body(&self) -> NodeBody {
         if self.base.order.is_any() {
             NodeBody::Exchange(ExchangeNode {
diff --git a/src/frontend/src/optimizer/plan_node/batch_expand.rs b/src/frontend/src/optimizer/plan_node/batch_expand.rs
index 99e4d746f41c3..86043cd3e1ab3 100644
--- a/src/frontend/src/optimizer/plan_node/batch_expand.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_expand.rs
@@ -22,7 +22,7 @@ use risingwave_pb::batch_plan::ExpandNode;
 
 use super::ExprRewritable;
 use crate::optimizer::plan_node::{
-    LogicalExpand, PlanBase, PlanTreeNodeUnary, ToBatchProst, ToDistributedBatch, ToLocalBatch,
+    LogicalExpand, PlanBase, PlanTreeNodeUnary, ToBatchPb, ToDistributedBatch, ToLocalBatch,
 };
 use crate::optimizer::property::{Distribution, Order};
 use crate::optimizer::PlanRef;
@@ -77,7 +77,7 @@ impl ToDistributedBatch for BatchExpand {
     }
 }
 
-impl ToBatchProst for BatchExpand {
+impl ToBatchPb for BatchExpand {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::Expand(ExpandNode {
             column_subsets: self
diff --git a/src/frontend/src/optimizer/plan_node/batch_filter.rs b/src/frontend/src/optimizer/plan_node/batch_filter.rs
index 56e51cf3bbc04..bf37f65b19842 100644
--- a/src/frontend/src/optimizer/plan_node/batch_filter.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_filter.rs
@@ -19,7 +19,7 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::FilterNode;
 
 use super::{
-    ExprRewritable, LogicalFilter, PlanRef, PlanTreeNodeUnary, ToBatchProst, ToDistributedBatch,
+    ExprRewritable, LogicalFilter, PlanRef, PlanTreeNodeUnary, ToBatchPb, ToDistributedBatch,
 };
 use crate::expr::{Expr, ExprImpl, ExprRewriter};
 use crate::optimizer::plan_node::{PlanBase, ToLocalBatch};
@@ -75,7 +75,7 @@ impl ToDistributedBatch for BatchFilter {
     }
 }
 
-impl ToBatchProst for BatchFilter {
+impl ToBatchPb for BatchFilter {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::Filter(FilterNode {
             search_condition: Some(
diff --git a/src/frontend/src/optimizer/plan_node/batch_group_topn.rs b/src/frontend/src/optimizer/plan_node/batch_group_topn.rs
index a1da0a482f96b..b9f8160cc4072 100644
--- a/src/frontend/src/optimizer/plan_node/batch_group_topn.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_group_topn.rs
@@ -19,7 +19,7 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::GroupTopNNode;
 
 use super::{
-    ExprRewritable, LogicalTopN, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst,
+    ExprRewritable, LogicalTopN, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::optimizer::plan_node::ToLocalBatch;
@@ -78,7 +78,7 @@ impl ToDistributedBatch for BatchGroupTopN {
     }
 }
 
-impl ToBatchProst for BatchGroupTopN {
+impl ToBatchPb for BatchGroupTopN {
     fn to_batch_prost_body(&self) -> NodeBody {
         let column_orders = self.logical.topn_order().to_protobuf();
         NodeBody::GroupTopN(GroupTopNNode {
diff --git a/src/frontend/src/optimizer/plan_node/batch_hash_agg.rs b/src/frontend/src/optimizer/plan_node/batch_hash_agg.rs
index 8b1a7c9414fcf..83f0ef6ae3d75 100644
--- a/src/frontend/src/optimizer/plan_node/batch_hash_agg.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_hash_agg.rs
@@ -21,7 +21,7 @@ use risingwave_pb::batch_plan::HashAggNode;
 
 use super::generic::{GenericPlanRef, PlanAggCall};
 use super::{
-    ExprRewritable, LogicalAgg, PlanBase, PlanNodeType, PlanRef, PlanTreeNodeUnary, ToBatchProst,
+    ExprRewritable, LogicalAgg, PlanBase, PlanNodeType, PlanRef, PlanTreeNodeUnary, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::expr::ExprRewriter;
@@ -135,7 +135,7 @@ impl ToDistributedBatch for BatchHashAgg {
     }
 }
 
-impl ToBatchProst for BatchHashAgg {
+impl ToBatchPb for BatchHashAgg {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::HashAgg(HashAggNode {
             agg_calls: self
diff --git a/src/frontend/src/optimizer/plan_node/batch_hash_join.rs b/src/frontend/src/optimizer/plan_node/batch_hash_join.rs
index df60d927b649a..3fcb73c48b564 100644
--- a/src/frontend/src/optimizer/plan_node/batch_hash_join.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_hash_join.rs
@@ -22,8 +22,8 @@ use risingwave_pb::plan_common::JoinType;
 
 use super::generic::GenericPlanRef;
 use super::{
-    EqJoinPredicate, ExprRewritable, LogicalJoin, PlanBase, PlanRef, PlanTreeNodeBinary,
-    ToBatchProst, ToDistributedBatch,
+    EqJoinPredicate, ExprRewritable, LogicalJoin, PlanBase, PlanRef, PlanTreeNodeBinary, ToBatchPb,
+    ToDistributedBatch,
 };
 use crate::expr::{Expr, ExprRewriter};
 use crate::optimizer::plan_node::utils::IndicesDisplay;
@@ -218,7 +218,7 @@ impl ToDistributedBatch for BatchHashJoin {
     }
 }
 
-impl ToBatchProst for BatchHashJoin {
+impl ToBatchPb for BatchHashJoin {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::HashJoin(HashJoinNode {
             join_type: self.logical.join_type() as i32,
diff --git a/src/frontend/src/optimizer/plan_node/batch_hop_window.rs b/src/frontend/src/optimizer/plan_node/batch_hop_window.rs
index 49454c4ed8c96..ccfa664f9bc40 100644
--- a/src/frontend/src/optimizer/plan_node/batch_hop_window.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_hop_window.rs
@@ -19,7 +19,7 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::HopWindowNode;
 
 use super::{
-    ExprRewritable, LogicalHopWindow, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst,
+    ExprRewritable, LogicalHopWindow, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::expr::{Expr, ExprImpl, ExprRewriter};
@@ -116,7 +116,7 @@ impl ToDistributedBatch for BatchHopWindow {
     }
 }
 
-impl ToBatchProst for BatchHopWindow {
+impl ToBatchPb for BatchHopWindow {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::HopWindow(HopWindowNode {
             time_col: self.logical.core.time_col.index() as _,
diff --git a/src/frontend/src/optimizer/plan_node/batch_insert.rs b/src/frontend/src/optimizer/plan_node/batch_insert.rs
index 3bf9b4345250f..b574c002dd8bc 100644
--- a/src/frontend/src/optimizer/plan_node/batch_insert.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_insert.rs
@@ -19,7 +19,7 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::InsertNode;
 
 use super::{
-    ExprRewritable, LogicalInsert, PlanRef, PlanTreeNodeUnary, ToBatchProst, ToDistributedBatch,
+    ExprRewritable, LogicalInsert, PlanRef, PlanTreeNodeUnary, ToBatchPb, ToDistributedBatch,
 };
 use crate::optimizer::plan_node::{PlanBase, ToLocalBatch};
 use crate::optimizer::property::{Distribution, Order, RequiredDist};
@@ -71,7 +71,7 @@ impl ToDistributedBatch for BatchInsert {
     }
 }
 
-impl ToBatchProst for BatchInsert {
+impl ToBatchPb for BatchInsert {
     fn to_batch_prost_body(&self) -> NodeBody {
         let column_indices = self
             .logical
diff --git a/src/frontend/src/optimizer/plan_node/batch_limit.rs b/src/frontend/src/optimizer/plan_node/batch_limit.rs
index 9a851dde70639..4944d312757b4 100644
--- a/src/frontend/src/optimizer/plan_node/batch_limit.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_limit.rs
@@ -19,7 +19,7 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::LimitNode;
 
 use super::{
-    ExprRewritable, LogicalLimit, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst,
+    ExprRewritable, LogicalLimit, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::optimizer::plan_node::ToLocalBatch;
@@ -98,7 +98,7 @@ impl ToDistributedBatch for BatchLimit {
     }
 }
 
-impl ToBatchProst for BatchLimit {
+impl ToBatchPb for BatchLimit {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::Limit(LimitNode {
             limit: self.logical.limit(),
diff --git a/src/frontend/src/optimizer/plan_node/batch_lookup_join.rs b/src/frontend/src/optimizer/plan_node/batch_lookup_join.rs
index 1b3fc89db7713..b3c02a220e674 100644
--- a/src/frontend/src/optimizer/plan_node/batch_lookup_join.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_lookup_join.rs
@@ -25,7 +25,7 @@ use crate::expr::{Expr, ExprRewriter};
 use crate::optimizer::plan_node::utils::IndicesDisplay;
 use crate::optimizer::plan_node::{
     EqJoinPredicate, EqJoinPredicateDisplay, LogicalJoin, PlanBase, PlanTreeNodeBinary,
-    PlanTreeNodeUnary, ToBatchProst, ToDistributedBatch, ToLocalBatch,
+    PlanTreeNodeUnary, ToBatchPb, ToDistributedBatch, ToLocalBatch,
 };
 use crate::optimizer::property::{Distribution, Order, RequiredDist};
 use crate::optimizer::PlanRef;
@@ -50,7 +50,7 @@ pub struct BatchLookupJoin {
     lookup_prefix_len: usize,
 
     /// If `distributed_lookup` is true, it will generate `DistributedLookupJoinNode` for
-    /// `ToBatchProst`. Otherwise, it will generate `LookupJoinNode`.
+    /// `ToBatchPb`. Otherwise, it will generate `LookupJoinNode`.
     distributed_lookup: bool,
 }
 
@@ -192,7 +192,7 @@ impl ToDistributedBatch for BatchLookupJoin {
     }
 }
 
-impl ToBatchProst for BatchLookupJoin {
+impl ToBatchPb for BatchLookupJoin {
     fn to_batch_prost_body(&self) -> NodeBody {
         if self.distributed_lookup {
             NodeBody::DistributedLookupJoin(DistributedLookupJoinNode {
diff --git a/src/frontend/src/optimizer/plan_node/batch_nested_loop_join.rs b/src/frontend/src/optimizer/plan_node/batch_nested_loop_join.rs
index 0712f0cd9a7c3..c2cdb71e45419 100644
--- a/src/frontend/src/optimizer/plan_node/batch_nested_loop_join.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_nested_loop_join.rs
@@ -21,7 +21,7 @@ use risingwave_pb::batch_plan::NestedLoopJoinNode;
 
 use super::generic::GenericPlanRef;
 use super::{
-    ExprRewritable, LogicalJoin, PlanBase, PlanRef, PlanTreeNodeBinary, ToBatchProst,
+    ExprRewritable, LogicalJoin, PlanBase, PlanRef, PlanTreeNodeBinary, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::expr::{Expr, ExprImpl, ExprRewriter};
@@ -127,7 +127,7 @@ impl ToDistributedBatch for BatchNestedLoopJoin {
     }
 }
 
-impl ToBatchProst for BatchNestedLoopJoin {
+impl ToBatchPb for BatchNestedLoopJoin {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::NestedLoopJoin(NestedLoopJoinNode {
             join_type: self.logical.join_type() as i32,
diff --git a/src/frontend/src/optimizer/plan_node/batch_project.rs b/src/frontend/src/optimizer/plan_node/batch_project.rs
index 15140cafc7e96..5a05c341ce97d 100644
--- a/src/frontend/src/optimizer/plan_node/batch_project.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_project.rs
@@ -20,7 +20,7 @@ use risingwave_pb::batch_plan::ProjectNode;
 use risingwave_pb::expr::ExprNode;
 
 use super::{
-    ExprRewritable, LogicalProject, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst,
+    ExprRewritable, LogicalProject, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::expr::{Expr, ExprImpl, ExprRewriter};
@@ -83,7 +83,7 @@ impl ToDistributedBatch for BatchProject {
     }
 }
 
-impl ToBatchProst for BatchProject {
+impl ToBatchPb for BatchProject {
     fn to_batch_prost_body(&self) -> NodeBody {
         let select_list = self
             .logical
diff --git a/src/frontend/src/optimizer/plan_node/batch_project_set.rs b/src/frontend/src/optimizer/plan_node/batch_project_set.rs
index 5946ad9f5fde7..2534777b7e8cf 100644
--- a/src/frontend/src/optimizer/plan_node/batch_project_set.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_project_set.rs
@@ -22,7 +22,7 @@ use risingwave_pb::batch_plan::ProjectSetNode;
 use super::ExprRewritable;
 use crate::expr::ExprRewriter;
 use crate::optimizer::plan_node::{
-    LogicalProjectSet, PlanBase, PlanTreeNodeUnary, ToBatchProst, ToDistributedBatch, ToLocalBatch,
+    LogicalProjectSet, PlanBase, PlanTreeNodeUnary, ToBatchPb, ToDistributedBatch, ToLocalBatch,
 };
 use crate::optimizer::PlanRef;
 use crate::utils::ColIndexMappingRewriteExt;
@@ -77,7 +77,7 @@ impl ToDistributedBatch for BatchProjectSet {
     // TODO: implement to_distributed_with_required like BatchProject
 }
 
-impl ToBatchProst for BatchProjectSet {
+impl ToBatchPb for BatchProjectSet {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::ProjectSet(ProjectSetNode {
             select_list: self
diff --git a/src/frontend/src/optimizer/plan_node/batch_seq_scan.rs b/src/frontend/src/optimizer/plan_node/batch_seq_scan.rs
index f38d11447c73c..0acf25cc57567 100644
--- a/src/frontend/src/optimizer/plan_node/batch_seq_scan.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_seq_scan.rs
@@ -22,9 +22,9 @@ use risingwave_common::util::scan_range::{is_full_range, ScanRange};
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::row_seq_scan_node::ChunkSize;
 use risingwave_pb::batch_plan::{RowSeqScanNode, SysRowSeqScanNode};
-use risingwave_pb::plan_common::ColumnDesc as ProstColumnDesc;
+use risingwave_pb::plan_common::PbColumnDesc;
 
-use super::{ExprRewritable, PlanBase, PlanRef, ToBatchProst, ToDistributedBatch};
+use super::{ExprRewritable, PlanBase, PlanRef, ToBatchPb, ToDistributedBatch};
 use crate::catalog::ColumnId;
 use crate::expr::ExprRewriter;
 use crate::optimizer::plan_node::{LogicalScan, ToLocalBatch};
@@ -214,13 +214,13 @@ impl ToDistributedBatch for BatchSeqScan {
     }
 }
 
-impl ToBatchProst for BatchSeqScan {
+impl ToBatchPb for BatchSeqScan {
     fn to_batch_prost_body(&self) -> NodeBody {
         let column_descs = self
             .logical
             .column_descs()
             .iter()
-            .map(ProstColumnDesc::from)
+            .map(PbColumnDesc::from)
             .collect();
 
         if self.logical.is_sys_table() {
diff --git a/src/frontend/src/optimizer/plan_node/batch_simple_agg.rs b/src/frontend/src/optimizer/plan_node/batch_simple_agg.rs
index b22cb4d0da0a2..e19cbae85aaf7 100644
--- a/src/frontend/src/optimizer/plan_node/batch_simple_agg.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_simple_agg.rs
@@ -20,8 +20,7 @@ use risingwave_pb::batch_plan::SortAggNode;
 
 use super::generic::PlanAggCall;
 use super::{
-    ExprRewritable, LogicalAgg, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst,
-    ToDistributedBatch,
+    ExprRewritable, LogicalAgg, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb, ToDistributedBatch,
 };
 use crate::expr::ExprRewriter;
 use crate::optimizer::plan_node::{BatchExchange, ToLocalBatch};
@@ -108,7 +107,7 @@ impl ToDistributedBatch for BatchSimpleAgg {
     }
 }
 
-impl ToBatchProst for BatchSimpleAgg {
+impl ToBatchPb for BatchSimpleAgg {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::SortAgg(SortAggNode {
             agg_calls: self
diff --git a/src/frontend/src/optimizer/plan_node/batch_sort.rs b/src/frontend/src/optimizer/plan_node/batch_sort.rs
index f03d819495462..38b268dd1c72d 100644
--- a/src/frontend/src/optimizer/plan_node/batch_sort.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_sort.rs
@@ -18,9 +18,7 @@ use risingwave_common::error::Result;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::SortNode;
 
-use super::{
-    ExprRewritable, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst, ToDistributedBatch,
-};
+use super::{ExprRewritable, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb, ToDistributedBatch};
 use crate::optimizer::plan_node::ToLocalBatch;
 use crate::optimizer::property::{Order, OrderDisplay};
 
@@ -73,7 +71,7 @@ impl ToDistributedBatch for BatchSort {
     }
 }
 
-impl ToBatchProst for BatchSort {
+impl ToBatchPb for BatchSort {
     fn to_batch_prost_body(&self) -> NodeBody {
         let column_orders = self.base.order.to_protobuf();
         NodeBody::Sort(SortNode { column_orders })
diff --git a/src/frontend/src/optimizer/plan_node/batch_sort_agg.rs b/src/frontend/src/optimizer/plan_node/batch_sort_agg.rs
index 28973348ed969..c348f655076f6 100644
--- a/src/frontend/src/optimizer/plan_node/batch_sort_agg.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_sort_agg.rs
@@ -22,8 +22,7 @@ use risingwave_pb::expr::ExprNode;
 
 use super::generic::{GenericPlanRef, PlanAggCall};
 use super::{
-    ExprRewritable, LogicalAgg, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst,
-    ToDistributedBatch,
+    ExprRewritable, LogicalAgg, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb, ToDistributedBatch,
 };
 use crate::expr::{Expr, ExprImpl, ExprRewriter, InputRef};
 use crate::optimizer::plan_node::ToLocalBatch;
@@ -109,7 +108,7 @@ impl ToDistributedBatch for BatchSortAgg {
     }
 }
 
-impl ToBatchProst for BatchSortAgg {
+impl ToBatchPb for BatchSortAgg {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::SortAgg(SortAggNode {
             agg_calls: self
diff --git a/src/frontend/src/optimizer/plan_node/batch_source.rs b/src/frontend/src/optimizer/plan_node/batch_source.rs
index 13d4ab98e0f1a..49eb14ada6e59 100644
--- a/src/frontend/src/optimizer/plan_node/batch_source.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_source.rs
@@ -20,8 +20,7 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::SourceNode;
 
 use super::{
-    ExprRewritable, LogicalSource, PlanBase, PlanRef, ToBatchProst, ToDistributedBatch,
-    ToLocalBatch,
+    ExprRewritable, LogicalSource, PlanBase, PlanRef, ToBatchPb, ToDistributedBatch, ToLocalBatch,
 };
 use crate::optimizer::property::{Distribution, Order};
 
@@ -92,7 +91,7 @@ impl ToDistributedBatch for BatchSource {
     }
 }
 
-impl ToBatchProst for BatchSource {
+impl ToBatchPb for BatchSource {
     fn to_batch_prost_body(&self) -> NodeBody {
         let source_catalog = self.logical.source_catalog().unwrap();
         NodeBody::Source(SourceNode {
diff --git a/src/frontend/src/optimizer/plan_node/batch_table_function.rs b/src/frontend/src/optimizer/plan_node/batch_table_function.rs
index 8e3e1568d4e5d..b8e7eb979fbe8 100644
--- a/src/frontend/src/optimizer/plan_node/batch_table_function.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_table_function.rs
@@ -18,9 +18,7 @@ use risingwave_common::error::Result;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::TableFunctionNode;
 
-use super::{
-    ExprRewritable, PlanBase, PlanRef, PlanTreeNodeLeaf, ToBatchProst, ToDistributedBatch,
-};
+use super::{ExprRewritable, PlanBase, PlanRef, PlanTreeNodeLeaf, ToBatchPb, ToDistributedBatch};
 use crate::expr::ExprRewriter;
 use crate::optimizer::plan_node::logical_table_function::LogicalTableFunction;
 use crate::optimizer::plan_node::ToLocalBatch;
@@ -68,7 +66,7 @@ impl ToDistributedBatch for BatchTableFunction {
     }
 }
 
-impl ToBatchProst for BatchTableFunction {
+impl ToBatchPb for BatchTableFunction {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::TableFunction(TableFunctionNode {
             table_function: Some(self.logical.table_function.to_protobuf()),
diff --git a/src/frontend/src/optimizer/plan_node/batch_topn.rs b/src/frontend/src/optimizer/plan_node/batch_topn.rs
index 28b21bd3e8016..e06f962ddae95 100644
--- a/src/frontend/src/optimizer/plan_node/batch_topn.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_topn.rs
@@ -19,7 +19,7 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::TopNNode;
 
 use super::{
-    ExprRewritable, LogicalTopN, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst,
+    ExprRewritable, LogicalTopN, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::optimizer::plan_node::ToLocalBatch;
@@ -88,7 +88,7 @@ impl ToDistributedBatch for BatchTopN {
     }
 }
 
-impl ToBatchProst for BatchTopN {
+impl ToBatchPb for BatchTopN {
     fn to_batch_prost_body(&self) -> NodeBody {
         let column_orders = self.logical.topn_order().to_protobuf();
         NodeBody::TopN(TopNNode {
diff --git a/src/frontend/src/optimizer/plan_node/batch_union.rs b/src/frontend/src/optimizer/plan_node/batch_union.rs
index 77665ce931fbb..4d2f415b3cdbd 100644
--- a/src/frontend/src/optimizer/plan_node/batch_union.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_union.rs
@@ -18,7 +18,7 @@ use risingwave_common::error::Result;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::UnionNode;
 
-use super::{ExprRewritable, PlanRef, ToBatchProst, ToDistributedBatch};
+use super::{ExprRewritable, PlanRef, ToBatchPb, ToDistributedBatch};
 use crate::optimizer::plan_node::{LogicalUnion, PlanBase, PlanTreeNode, ToLocalBatch};
 use crate::optimizer::property::{Distribution, Order, RequiredDist};
 
@@ -82,7 +82,7 @@ impl ToDistributedBatch for BatchUnion {
     }
 }
 
-impl ToBatchProst for BatchUnion {
+impl ToBatchPb for BatchUnion {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::Union(UnionNode {})
     }
diff --git a/src/frontend/src/optimizer/plan_node/batch_update.rs b/src/frontend/src/optimizer/plan_node/batch_update.rs
index 57eb7ea823968..b2f80cadff77e 100644
--- a/src/frontend/src/optimizer/plan_node/batch_update.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_update.rs
@@ -19,7 +19,7 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::UpdateNode;
 
 use super::{
-    ExprRewritable, LogicalUpdate, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchProst,
+    ExprRewritable, LogicalUpdate, PlanBase, PlanRef, PlanTreeNodeUnary, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::expr::{Expr, ExprRewriter};
@@ -72,7 +72,7 @@ impl ToDistributedBatch for BatchUpdate {
     }
 }
 
-impl ToBatchProst for BatchUpdate {
+impl ToBatchPb for BatchUpdate {
     fn to_batch_prost_body(&self) -> NodeBody {
         let exprs = self
             .logical
diff --git a/src/frontend/src/optimizer/plan_node/batch_values.rs b/src/frontend/src/optimizer/plan_node/batch_values.rs
index affcddc8e01d2..07b6b2b577954 100644
--- a/src/frontend/src/optimizer/plan_node/batch_values.rs
+++ b/src/frontend/src/optimizer/plan_node/batch_values.rs
@@ -20,7 +20,7 @@ use risingwave_pb::batch_plan::values_node::ExprTuple;
 use risingwave_pb::batch_plan::ValuesNode;
 
 use super::{
-    ExprRewritable, LogicalValues, PlanBase, PlanRef, PlanTreeNodeLeaf, ToBatchProst,
+    ExprRewritable, LogicalValues, PlanBase, PlanRef, PlanTreeNodeLeaf, ToBatchPb,
     ToDistributedBatch,
 };
 use crate::expr::{Expr, ExprImpl, ExprRewriter};
@@ -73,7 +73,7 @@ impl ToDistributedBatch for BatchValues {
     }
 }
 
-impl ToBatchProst for BatchValues {
+impl ToBatchPb for BatchValues {
     fn to_batch_prost_body(&self) -> NodeBody {
         NodeBody::Values(ValuesNode {
             tuples: self
diff --git a/src/frontend/src/optimizer/plan_node/eq_join_predicate.rs b/src/frontend/src/optimizer/plan_node/eq_join_predicate.rs
index 00400488095e0..cd35ffd83e15b 100644
--- a/src/frontend/src/optimizer/plan_node/eq_join_predicate.rs
+++ b/src/frontend/src/optimizer/plan_node/eq_join_predicate.rs
@@ -16,7 +16,9 @@ use std::fmt;
 
 use risingwave_common::catalog::Schema;
 
-use crate::expr::{ExprRewriter, ExprType, FunctionCall, InputRef, InputRefDisplay};
+use crate::expr::{
+    ExprRewriter, ExprType, FunctionCall, InequalityInputPair, InputRef, InputRefDisplay,
+};
 use crate::utils::{ColIndexMapping, Condition, ConditionDisplay};
 
 /// The join predicate used in optimizer
@@ -32,6 +34,7 @@ pub struct EqJoinPredicate {
     eq_keys: Vec<(InputRef, InputRef, bool)>,
 
     left_cols_num: usize,
+    right_cols_num: usize,
 }
 
 impl fmt::Display for EqJoinPredicate {
@@ -77,11 +80,13 @@ impl EqJoinPredicate {
         other_cond: Condition,
         eq_keys: Vec<(InputRef, InputRef, bool)>,
         left_cols_num: usize,
+        right_cols_num: usize,
     ) -> Self {
         Self {
             other_cond,
             eq_keys,
             left_cols_num,
+            right_cols_num,
         }
     }
 
@@ -102,7 +107,7 @@ impl EqJoinPredicate {
     /// ```
     pub fn create(left_cols_num: usize, right_cols_num: usize, on_clause: Condition) -> Self {
         let (eq_keys, other_cond) = on_clause.split_eq_keys(left_cols_num, right_cols_num);
-        Self::new(other_cond, eq_keys, left_cols_num)
+        Self::new(other_cond, eq_keys, left_cols_num, right_cols_num)
     }
 
     /// Get join predicate's eq conds.
@@ -172,6 +177,14 @@ impl EqJoinPredicate {
             .collect()
     }
 
+    pub(crate) fn inequality_pairs(&self) -> (usize, Vec<(usize, InequalityInputPair)>) {
+        (
+            self.left_cols_num,
+            self.other_cond()
+                .extract_inequality_keys(self.left_cols_num, self.right_cols_num),
+        )
+    }
+
     /// Note: `right_col_index` starts from `0`
     pub fn eq_indexes_typed(&self) -> Vec<(InputRef, InputRef)> {
         self.eq_keys
@@ -249,7 +262,12 @@ impl EqJoinPredicate {
             }
         }
 
-        Self::new(self.other_cond, new_eq_keys, self.left_cols_num)
+        Self::new(
+            self.other_cond,
+            new_eq_keys,
+            self.left_cols_num,
+            self.right_cols_num,
+        )
     }
 
     pub fn rewrite_exprs(&self, rewriter: &mut (impl ExprRewriter + ?Sized)) -> Self {
diff --git a/src/frontend/src/optimizer/plan_node/generic/agg.rs b/src/frontend/src/optimizer/plan_node/generic/agg.rs
index 931bfa2371160..ba23311a78623 100644
--- a/src/frontend/src/optimizer/plan_node/generic/agg.rs
+++ b/src/frontend/src/optimizer/plan_node/generic/agg.rs
@@ -20,8 +20,8 @@ use risingwave_common::catalog::{Field, FieldDisplay, Schema};
 use risingwave_common::types::DataType;
 use risingwave_common::util::sort_util::{ColumnOrder, ColumnOrderDisplay, OrderType};
 use risingwave_expr::expr::AggKind;
-use risingwave_pb::expr::AggCall as ProstAggCall;
-use risingwave_pb::stream_plan::{agg_call_state, AggCallState as AggCallStateProst};
+use risingwave_pb::expr::PbAggCall;
+use risingwave_pb::stream_plan::{agg_call_state, AggCallState as AggCallStatePb};
 
 use super::super::utils::TableCatalogBuilder;
 use super::{stream, GenericPlanNode, GenericPlanRef};
@@ -124,8 +124,8 @@ pub enum AggCallState {
 }
 
 impl AggCallState {
-    pub fn into_prost(self, state: &mut BuildFragmentGraphState) -> AggCallStateProst {
-        AggCallStateProst {
+    pub fn into_prost(self, state: &mut BuildFragmentGraphState) -> AggCallStatePb {
+        AggCallStatePb {
             inner: Some(match self {
                 AggCallState::ResultValue => {
                     agg_call_state::Inner::ResultValueState(agg_call_state::ResultValueState {})
@@ -572,14 +572,14 @@ impl PlanAggCall {
         });
 
         // modify filter
-        let mut rewriter = IndexRewriter { mapping };
+        let mut rewriter = IndexRewriter::new(mapping);
         self.filter.conjunctions.iter_mut().for_each(|x| {
             *x = rewriter.rewrite_expr(x.clone());
         });
     }
 
-    pub fn to_protobuf(&self) -> ProstAggCall {
-        ProstAggCall {
+    pub fn to_protobuf(&self) -> PbAggCall {
+        PbAggCall {
             r#type: self.agg_kind.to_prost().into(),
             return_type: Some(self.return_type.to_protobuf()),
             args: self.inputs.iter().map(InputRef::to_proto).collect(),
diff --git a/src/frontend/src/optimizer/plan_node/generic/hop_window.rs b/src/frontend/src/optimizer/plan_node/generic/hop_window.rs
index 475cfc2f781aa..85848c3323a94 100644
--- a/src/frontend/src/optimizer/plan_node/generic/hop_window.rs
+++ b/src/frontend/src/optimizer/plan_node/generic/hop_window.rs
@@ -18,7 +18,7 @@ use std::num::NonZeroUsize;
 use itertools::Itertools;
 use risingwave_common::catalog::{Field, Schema};
 use risingwave_common::error::Result;
-use risingwave_common::types::{DataType, IntervalUnit, IntervalUnitDisplay};
+use risingwave_common::types::{DataType, Interval, IntervalDisplay};
 use risingwave_common::util::column_index_mapping::ColIndexMapping;
 use risingwave_expr::ExprError;
 
@@ -34,9 +34,9 @@ use crate::utils::ColIndexMappingRewriteExt;
 pub struct HopWindow<PlanRef> {
     pub input: PlanRef,
     pub time_col: InputRef,
-    pub window_slide: IntervalUnit,
-    pub window_size: IntervalUnit,
-    pub window_offset: IntervalUnit,
+    pub window_slide: Interval,
+    pub window_size: Interval,
+    pub window_offset: Interval,
     /// Provides mapping from input schema, window_start, window_end to output schema.
     /// For example, if we had:
     /// input schema: | 0: trip_time | 1: trip_name |
@@ -119,16 +119,7 @@ impl<PlanRef: GenericPlanRef> GenericPlanNode for HopWindow<PlanRef> {
 }
 
 impl<PlanRef: GenericPlanRef> HopWindow<PlanRef> {
-    pub fn into_parts(
-        self,
-    ) -> (
-        PlanRef,
-        InputRef,
-        IntervalUnit,
-        IntervalUnit,
-        IntervalUnit,
-        Vec<usize>,
-    ) {
+    pub fn into_parts(self) -> (PlanRef, InputRef, Interval, Interval, Interval, Vec<usize>) {
         (
             self.input,
             self.time_col,
@@ -285,14 +276,14 @@ impl<PlanRef: GenericPlanRef> HopWindow<PlanRef> {
 
         builder.field(
             "slide",
-            &IntervalUnitDisplay {
+            &IntervalDisplay {
                 core: &self.window_slide,
             },
         );
 
         builder.field(
             "size",
-            &IntervalUnitDisplay {
+            &IntervalDisplay {
                 core: &self.window_size,
             },
         );
diff --git a/src/frontend/src/optimizer/plan_node/generic/source.rs b/src/frontend/src/optimizer/plan_node/generic/source.rs
index b1beb588e8337..8a650007f3458 100644
--- a/src/frontend/src/optimizer/plan_node/generic/source.rs
+++ b/src/frontend/src/optimizer/plan_node/generic/source.rs
@@ -49,15 +49,20 @@ pub struct Source {
 
 impl GenericPlanNode for Source {
     fn schema(&self) -> Schema {
-        let fields = self.column_descs.iter().map(Into::into).collect();
+        let fields = self.non_generated_columns().map(Into::into).collect();
+        // let fields = self.column_descs.iter().map(Into::into).collect();
         Schema { fields }
     }
 
     fn logical_pk(&self) -> Option<Vec<usize>> {
         let mut id_to_idx = HashMap::new();
-        self.column_descs.iter().enumerate().for_each(|(idx, c)| {
-            id_to_idx.insert(c.column_id, idx);
-        });
+        // self.column_descs.iter().filter(|c| !c.is_generated_column()).enumerate().for_each(|(idx,
+        // c)| {
+        self.non_generated_columns()
+            .enumerate()
+            .for_each(|(idx, c)| {
+                id_to_idx.insert(c.column_id, idx);
+            });
         self.pk_col_ids
             .iter()
             .map(|c| id_to_idx.get(c).copied())
@@ -70,11 +75,12 @@ impl GenericPlanNode for Source {
 
     fn functional_dependency(&self) -> FunctionalDependencySet {
         let pk_indices = self.logical_pk();
+        let non_generated_columns_count = self.non_generated_columns().count();
         match pk_indices {
             Some(pk_indices) => {
-                FunctionalDependencySet::with_key(self.column_descs.len(), &pk_indices)
+                FunctionalDependencySet::with_key(non_generated_columns_count, &pk_indices)
             }
-            None => FunctionalDependencySet::new(self.column_descs.len()),
+            None => FunctionalDependencySet::new(non_generated_columns_count),
         }
     }
 }
@@ -108,4 +114,11 @@ impl Source {
 
         builder.build(vec![], 1)
     }
+
+    /// Non-generated columns
+    fn non_generated_columns(&self) -> impl Iterator<Item = &ColumnDesc> {
+        self.column_descs
+            .iter()
+            .filter(|c| !c.is_generated_column())
+    }
 }
diff --git a/src/frontend/src/optimizer/plan_node/logical_agg.rs b/src/frontend/src/optimizer/plan_node/logical_agg.rs
index 03ac112e91781..794f11564d264 100644
--- a/src/frontend/src/optimizer/plan_node/logical_agg.rs
+++ b/src/frontend/src/optimizer/plan_node/logical_agg.rs
@@ -18,7 +18,7 @@ use std::fmt;
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
 use risingwave_common::error::{ErrorCode, Result, TrackingIssue};
-use risingwave_common::types::{DataType, Datum, OrderedF64, ScalarImpl};
+use risingwave_common::types::{DataType, Datum, ScalarImpl, F64};
 use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
 use risingwave_expr::expr::AggKind;
 
@@ -333,17 +333,12 @@ impl LogicalAgg {
                 .group_key()
                 .iter()
                 .map(|group_by_idx| {
-                    let order_type = if required_order
+                    required_order
                         .column_orders
-                        .contains(&ColumnOrder::new(*group_by_idx, OrderType::descending()))
-                    {
-                        // If output requires descending order, use descending order
-                        OrderType::descending()
-                    } else {
-                        // In all other cases use ascending order
-                        OrderType::ascending()
-                    };
-                    ColumnOrder::new(*group_by_idx, order_type)
+                        .iter()
+                        .find(|o| o.column_index == *group_by_idx)
+                        .cloned()
+                        .unwrap_or_else(|| ColumnOrder::new(*group_by_idx, OrderType::ascending()))
                 })
                 .collect(),
         };
@@ -761,7 +756,7 @@ impl LogicalAggBuilder {
                                 // TODO: The decimal implementation now still relies on float64, so
                                 // float64 is still used here
                                 ExprImpl::from(Literal::new(
-                                    Datum::from(ScalarImpl::Float64(OrderedF64::from(0.5))),
+                                    Datum::from(ScalarImpl::Float64(F64::from(0.5))),
                                     DataType::Float64,
                                 )),
                             ],
diff --git a/src/frontend/src/optimizer/plan_node/logical_hop_window.rs b/src/frontend/src/optimizer/plan_node/logical_hop_window.rs
index 6559b4c69e195..b6bc0f867ff04 100644
--- a/src/frontend/src/optimizer/plan_node/logical_hop_window.rs
+++ b/src/frontend/src/optimizer/plan_node/logical_hop_window.rs
@@ -17,7 +17,7 @@ use std::fmt;
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
 use risingwave_common::error::Result;
-use risingwave_common::types::IntervalUnit;
+use risingwave_common::types::Interval;
 
 use super::generic::GenericPlanNode;
 use super::{
@@ -44,9 +44,9 @@ impl LogicalHopWindow {
     fn new(
         input: PlanRef,
         time_col: InputRef,
-        window_slide: IntervalUnit,
-        window_size: IntervalUnit,
-        window_offset: IntervalUnit,
+        window_slide: Interval,
+        window_size: Interval,
+        window_offset: Interval,
         output_indices: Option<Vec<usize>>,
     ) -> Self {
         // if output_indices is not specified, use default output_indices
@@ -84,16 +84,7 @@ impl LogicalHopWindow {
         LogicalHopWindow { base, core }
     }
 
-    pub fn into_parts(
-        self,
-    ) -> (
-        PlanRef,
-        InputRef,
-        IntervalUnit,
-        IntervalUnit,
-        IntervalUnit,
-        Vec<usize>,
-    ) {
+    pub fn into_parts(self) -> (PlanRef, InputRef, Interval, Interval, Interval, Vec<usize>) {
         self.core.into_parts()
     }
 
@@ -102,9 +93,9 @@ impl LogicalHopWindow {
     pub fn create(
         input: PlanRef,
         time_col: InputRef,
-        window_slide: IntervalUnit,
-        window_size: IntervalUnit,
-        window_offset: IntervalUnit,
+        window_slide: Interval,
+        window_size: Interval,
+        window_offset: Interval,
     ) -> PlanRef {
         let input = LogicalFilter::create_with_expr(
             input,
@@ -434,9 +425,9 @@ mod test {
         let hop_window: PlanRef = LogicalHopWindow::new(
             values.into(),
             InputRef::new(0, DataType::Date),
-            IntervalUnit::from_month_day_usec(0, 1, 0),
-            IntervalUnit::from_month_day_usec(0, 3, 0),
-            IntervalUnit::from_month_day_usec(0, 0, 0),
+            Interval::from_month_day_usec(0, 1, 0),
+            Interval::from_month_day_usec(0, 3, 0),
+            Interval::from_month_day_usec(0, 0, 0),
             None,
         )
         .into();
@@ -490,9 +481,9 @@ mod test {
         let hop_window: PlanRef = LogicalHopWindow::new(
             values.into(),
             InputRef::new(0, DataType::Date),
-            IntervalUnit::from_month_day_usec(0, 1, 0),
-            IntervalUnit::from_month_day_usec(0, 3, 0),
-            IntervalUnit::from_month_day_usec(0, 0, 0),
+            Interval::from_month_day_usec(0, 1, 0),
+            Interval::from_month_day_usec(0, 3, 0),
+            Interval::from_month_day_usec(0, 0, 0),
             None,
         )
         .into();
diff --git a/src/frontend/src/optimizer/plan_node/logical_join.rs b/src/frontend/src/optimizer/plan_node/logical_join.rs
index d52366587cdf1..b0b3a431ca26b 100644
--- a/src/frontend/src/optimizer/plan_node/logical_join.rs
+++ b/src/frontend/src/optimizer/plan_node/logical_join.rs
@@ -944,6 +944,7 @@ impl LogicalJoin {
                 Condition::true_cond(),
                 predicate.eq_keys().to_vec(),
                 self.left().schema().len(),
+                self.right().schema().len(),
             );
             let logical_join = logical_join.clone_with_cond(eq_cond.eq_cond());
             let hash_join = StreamHashJoin::new(logical_join, eq_cond).into();
diff --git a/src/frontend/src/optimizer/plan_node/logical_multi_join.rs b/src/frontend/src/optimizer/plan_node/logical_multi_join.rs
index e9ff91a48db5e..faab125aea73d 100644
--- a/src/frontend/src/optimizer/plan_node/logical_multi_join.rs
+++ b/src/frontend/src/optimizer/plan_node/logical_multi_join.rs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::cmp::Ordering;
+use std::collections::{BTreeMap, BTreeSet, VecDeque};
 use std::fmt;
 
 use itertools::Itertools;
@@ -483,6 +485,243 @@ impl LogicalMultiJoin {
         Ok(join_ordering)
     }
 
+    pub fn as_bushy_tree_join(&self) -> Result<PlanRef> {
+        // Join tree internal representation
+        #[derive(Clone, Default, Debug)]
+        struct JoinTreeNode {
+            idx: Option<usize>,
+            left: Option<Box<JoinTreeNode>>,
+            right: Option<Box<JoinTreeNode>>,
+            height: usize,
+        }
+
+        // join graph internal representation
+        #[derive(Clone, Debug)]
+        struct GraphNode {
+            id: usize,
+            join_tree: JoinTreeNode,
+            // use BTreeSet for deterministic
+            relations: BTreeSet<usize>,
+        }
+
+        let mut nodes: BTreeMap<_, _> = (0..self.inputs.len())
+            .map(|idx| GraphNode {
+                id: idx,
+                relations: BTreeSet::new(),
+                join_tree: JoinTreeNode {
+                    idx: Some(idx),
+                    left: None,
+                    right: None,
+                    height: 0,
+                },
+            })
+            .enumerate()
+            .collect();
+        let (eq_join_conditions, _) = self
+            .on
+            .clone()
+            .split_by_input_col_nums(&self.input_col_nums(), true);
+
+        for ((src, dst), _) in eq_join_conditions {
+            nodes.get_mut(&src).unwrap().relations.insert(dst);
+            nodes.get_mut(&dst).unwrap().relations.insert(src);
+        }
+
+        // isolated nodes can be joined at any where.
+        let iso_nodes = nodes
+            .iter()
+            .filter_map(|n| {
+                if n.1.relations.is_empty() {
+                    Some(*n.0)
+                } else {
+                    None
+                }
+            })
+            .collect_vec();
+
+        for n in iso_nodes {
+            for adj in 0..nodes.len() {
+                if adj != n {
+                    nodes.get_mut(&n).unwrap().relations.insert(adj);
+                    nodes.get_mut(&adj).unwrap().relations.insert(n);
+                }
+            }
+        }
+
+        let mut optimized_bushy_tree = None;
+        let mut que = VecDeque::from([nodes]);
+        let mut isolated = BTreeSet::new();
+
+        while let Some(mut nodes) = que.pop_front() {
+            if nodes.len() == 1 {
+                let node = nodes.into_values().next().unwrap();
+                optimized_bushy_tree = Some(optimized_bushy_tree.map_or(
+                    node.clone(),
+                    |old_tree: GraphNode| {
+                        if node.join_tree.height < old_tree.join_tree.height {
+                            node
+                        } else {
+                            old_tree
+                        }
+                    },
+                ));
+                continue;
+            }
+
+            let (idx, _) = nodes
+                .iter()
+                .min_by(
+                    |(_, x), (_, y)| match x.relations.len().cmp(&y.relations.len()) {
+                        Ordering::Less => Ordering::Less,
+                        Ordering::Greater => Ordering::Greater,
+                        Ordering::Equal => x.join_tree.height.cmp(&y.join_tree.height),
+                    },
+                )
+                .unwrap();
+            let n = nodes.remove(&idx.clone()).unwrap();
+
+            if n.relations.is_empty() {
+                isolated.insert(n.id);
+                que.push_back(nodes);
+                continue;
+            }
+
+            for merge_node in &n.relations {
+                let mut nodes = nodes.clone();
+                for adjacent_node in &n.relations {
+                    if *adjacent_node != *merge_node {
+                        nodes
+                            .get_mut(adjacent_node)
+                            .unwrap()
+                            .relations
+                            .remove(&n.id);
+                        nodes
+                            .get_mut(adjacent_node)
+                            .unwrap()
+                            .relations
+                            .insert(*merge_node);
+                        nodes
+                            .get_mut(merge_node)
+                            .unwrap()
+                            .relations
+                            .insert(*adjacent_node);
+                    }
+                }
+                let mut merge_graph_node = nodes.get_mut(merge_node).unwrap();
+                merge_graph_node.relations.remove(&n.id);
+                let l_tree = n.join_tree.clone();
+                let r_tree = std::mem::take(&mut merge_graph_node.join_tree);
+                let new_height = usize::max(l_tree.height, r_tree.height) + 1;
+
+                if let Some(min_height) = optimized_bushy_tree.as_ref().map(|t| t.join_tree.height) && min_height < new_height {
+                    continue;
+                }
+
+                merge_graph_node.join_tree = JoinTreeNode {
+                    idx: None,
+                    left: Some(Box::new(l_tree)),
+                    right: Some(Box::new(r_tree)),
+                    height: new_height,
+                };
+                que.push_back(nodes);
+            }
+        }
+
+        fn create_logical_join(
+            s: &LogicalMultiJoin,
+            mut join_tree: JoinTreeNode,
+            join_ordering: &mut Vec<usize>,
+        ) -> Result<PlanRef> {
+            Ok(match (join_tree.left.take(), join_tree.right.take()) {
+                (Some(l), Some(r)) => LogicalJoin::new(
+                    create_logical_join(s, *l, join_ordering)?,
+                    create_logical_join(s, *r, join_ordering)?,
+                    JoinType::Inner,
+                    Condition::true_cond(),
+                )
+                .into(),
+                (None, None) => {
+                    if let Some(idx) = join_tree.idx {
+                        join_ordering.push(idx);
+                        s.inputs[idx].clone()
+                    } else {
+                        return Err(RwError::from(ErrorCode::InternalError(
+                            "id of the leaf node not found in the join tree".into(),
+                        )));
+                    }
+                }
+                (_, _) => {
+                    return Err(RwError::from(ErrorCode::InternalError(
+                        "only leaf node can have None subtree".into(),
+                    )))
+                }
+            })
+        }
+
+        let isolated = isolated.into_iter().collect_vec();
+        let mut join_ordering = vec![];
+        let mut output = if let Some(optimized_bushy_tree) = optimized_bushy_tree {
+            let mut output =
+                create_logical_join(self, optimized_bushy_tree.join_tree, &mut join_ordering)?;
+
+            output = isolated.into_iter().fold(output, |chain, n| {
+                join_ordering.push(n);
+                LogicalJoin::new(
+                    chain,
+                    self.inputs[n].clone(),
+                    JoinType::Inner,
+                    Condition::true_cond(),
+                )
+                .into()
+            });
+            output
+        } else if !isolated.is_empty() {
+            let base = isolated[0];
+            join_ordering.push(isolated[0]);
+            isolated[1..]
+                .iter()
+                .fold(self.inputs[base].clone(), |chain, n| {
+                    join_ordering.push(*n);
+                    LogicalJoin::new(
+                        chain,
+                        self.inputs[*n].clone(),
+                        JoinType::Inner,
+                        Condition::true_cond(),
+                    )
+                    .into()
+                })
+        } else {
+            return Err(RwError::from(ErrorCode::InternalError(
+                "no plan remain".into(),
+            )));
+        };
+        let total_col_num = self.inner2output.source_size();
+        let reorder_mapping = {
+            let mut reorder_mapping = vec![None; total_col_num];
+
+            join_ordering
+                .iter()
+                .cloned()
+                .flat_map(|input_idx| {
+                    (0..self.inputs[input_idx].schema().len())
+                        .map(move |col_idx| self.inner_i2o_mappings[input_idx].map(col_idx))
+                })
+                .enumerate()
+                .for_each(|(tar, src)| reorder_mapping[src] = Some(tar));
+            reorder_mapping
+        };
+        output =
+            LogicalProject::with_out_col_idx(output, reorder_mapping.iter().map(|i| i.unwrap()))
+                .into();
+
+        // We will later push down all of the filters back to the individual joins via the
+        // `FilterJoinRule`.
+        output = LogicalFilter::create(output, self.on.clone());
+        output =
+            LogicalProject::with_out_col_idx(output, self.output_indices.iter().cloned()).into();
+        Ok(output)
+    }
+
     pub(crate) fn input_col_nums(&self) -> Vec<usize> {
         self.inputs.iter().map(|i| i.schema().len()).collect()
     }
diff --git a/src/frontend/src/optimizer/plan_node/logical_scan.rs b/src/frontend/src/optimizer/plan_node/logical_scan.rs
index 799b257f4860f..79f9d56bd60c0 100644
--- a/src/frontend/src/optimizer/plan_node/logical_scan.rs
+++ b/src/frontend/src/optimizer/plan_node/logical_scan.rs
@@ -202,10 +202,6 @@ impl LogicalScan {
         ids
     }
 
-    pub fn output_column_indices(&self) -> &[usize] {
-        &self.core.output_col_idx
-    }
-
     /// Get all indexes on this table
     pub fn indexes(&self) -> &[Rc<IndexCatalog>] {
         &self.core.indexes
diff --git a/src/frontend/src/optimizer/plan_node/logical_source.rs b/src/frontend/src/optimizer/plan_node/logical_source.rs
index 5300db3ca2610..ae09243085921 100644
--- a/src/frontend/src/optimizer/plan_node/logical_source.rs
+++ b/src/frontend/src/optimizer/plan_node/logical_source.rs
@@ -21,6 +21,7 @@ use std::rc::Rc;
 use risingwave_common::catalog::{ColumnDesc, Schema};
 use risingwave_common::error::Result;
 use risingwave_connector::source::DataType;
+use risingwave_pb::plan_common::GeneratedColumnDesc;
 
 use super::stream_watermark_filter::StreamWatermarkFilter;
 use super::{
@@ -29,12 +30,12 @@ use super::{
 };
 use crate::catalog::source_catalog::SourceCatalog;
 use crate::catalog::ColumnId;
-use crate::expr::{Expr, ExprImpl, ExprType};
+use crate::expr::{Expr, ExprImpl, ExprRewriter, ExprType, InputRef};
 use crate::optimizer::optimizer_context::OptimizerContextRef;
 use crate::optimizer::plan_node::{
     ColumnPruningContext, PredicatePushdownContext, RewriteStreamContext, ToStreamContext,
 };
-use crate::utils::{ColIndexMapping, Condition};
+use crate::utils::{ColIndexMapping, Condition, IndexRewriter};
 use crate::TableCatalog;
 
 /// For kafka source, we attach a hidden column [`KAFKA_TIMESTAMP_COLUMN_NAME`] to it, so that we
@@ -83,6 +84,77 @@ impl LogicalSource {
         }
     }
 
+    pub fn gen_optional_generated_column_project_exprs(
+        column_descs: Vec<ColumnDesc>,
+    ) -> Result<Option<Vec<ExprImpl>>> {
+        if !column_descs.iter().any(|c| c.generated_column.is_some()) {
+            return Ok(None);
+        }
+
+        let col_mapping = {
+            let mut mapping = vec![None; column_descs.len()];
+            let mut cur = 0;
+            for (idx, column_desc) in column_descs.iter().enumerate() {
+                if column_desc.generated_column.is_none() {
+                    mapping[idx] = Some(cur);
+                    cur += 1;
+                } else {
+                    mapping[idx] = None;
+                }
+            }
+            ColIndexMapping::new(mapping)
+        };
+
+        let mut rewriter = IndexRewriter::new(col_mapping);
+        let mut exprs = Vec::with_capacity(column_descs.len());
+        let mut cur = 0;
+        for column_desc in column_descs {
+            let ret_data_type = column_desc.data_type.clone();
+            if let Some(generated_column) = column_desc.generated_column {
+                let GeneratedColumnDesc { expr } = generated_column;
+                // TODO(yuhao): avoid this `from_expr_proto`.
+                let proj_expr = rewriter.rewrite_expr(ExprImpl::from_expr_proto(&expr.unwrap())?);
+                let casted_expr = proj_expr.cast_assign(column_desc.data_type)?;
+                exprs.push(casted_expr);
+            } else {
+                let input_ref = InputRef {
+                    data_type: ret_data_type,
+                    index: cur,
+                };
+                cur += 1;
+                exprs.push(ExprImpl::InputRef(Box::new(input_ref)));
+            }
+        }
+
+        Ok(Some(exprs))
+    }
+
+    pub fn create(
+        source_catalog: Option<Rc<SourceCatalog>>,
+        column_descs: Vec<ColumnDesc>,
+        pk_col_ids: Vec<ColumnId>,
+        row_id_index: Option<usize>,
+        gen_row_id: bool,
+        for_table: bool,
+        ctx: OptimizerContextRef,
+    ) -> Result<PlanRef> {
+        let source = Self::new(
+            source_catalog,
+            column_descs.clone(),
+            pk_col_ids,
+            row_id_index,
+            gen_row_id,
+            for_table,
+            ctx,
+        );
+        let exprs = Self::gen_optional_generated_column_project_exprs(column_descs)?;
+        if let Some(exprs) = exprs {
+            Ok(LogicalProject::new(source.into(), exprs).into())
+        } else {
+            Ok(source.into())
+        }
+    }
+
     pub(super) fn column_names(&self) -> Vec<String> {
         self.schema()
             .fields()
diff --git a/src/frontend/src/optimizer/plan_node/logical_table_function.rs b/src/frontend/src/optimizer/plan_node/logical_table_function.rs
index 530ce11b48ae8..008fca94ee3d6 100644
--- a/src/frontend/src/optimizer/plan_node/logical_table_function.rs
+++ b/src/frontend/src/optimizer/plan_node/logical_table_function.rs
@@ -16,6 +16,7 @@ use std::fmt;
 
 use risingwave_common::catalog::{Field, Schema};
 use risingwave_common::error::{ErrorCode, Result};
+use risingwave_common::types::DataType;
 
 use super::{
     ColPrunable, ExprRewritable, LogicalFilter, PlanBase, PlanRef, PredicatePushdown, ToBatch,
@@ -40,11 +41,15 @@ pub struct LogicalTableFunction {
 impl LogicalTableFunction {
     /// Create a [`LogicalTableFunction`] node. Used internally by optimizer.
     pub fn new(table_function: TableFunction, ctx: OptimizerContextRef) -> Self {
-        let schema = Schema {
-            fields: vec![Field::with_name(
-                table_function.return_type(),
-                table_function.function_type.name(),
-            )],
+        let schema = if let DataType::Struct(s) = table_function.return_type() {
+            Schema::from(&*s)
+        } else {
+            Schema {
+                fields: vec![Field::with_name(
+                    table_function.return_type(),
+                    table_function.name(),
+                )],
+            }
         };
         let functional_dependency = FunctionalDependencySet::new(schema.len());
         let base = PlanBase::new_logical(ctx, schema, vec![], functional_dependency);
diff --git a/src/frontend/src/optimizer/plan_node/mod.rs b/src/frontend/src/optimizer/plan_node/mod.rs
index d4e879cfefcf2..fdb7b3d0c9ee0 100644
--- a/src/frontend/src/optimizer/plan_node/mod.rs
+++ b/src/frontend/src/optimizer/plan_node/mod.rs
@@ -41,8 +41,8 @@ pub use logical_source::KAFKA_TIMESTAMP_COLUMN_NAME;
 use paste::paste;
 use risingwave_common::catalog::Schema;
 use risingwave_common::error::{ErrorCode, Result};
-use risingwave_pb::batch_plan::PlanNode as BatchPlanProst;
-use risingwave_pb::stream_plan::StreamNode as StreamPlanProst;
+use risingwave_pb::batch_plan::PlanNode as BatchPlanPb;
+use risingwave_pb::stream_plan::StreamNode as StreamPlanPb;
 use serde::Serialize;
 use smallvec::SmallVec;
 
@@ -73,7 +73,7 @@ pub trait PlanNode:
     + ToBatch
     + ToStream
     + ToDistributedBatch
-    + ToProst
+    + ToPb
     + ToLocalBatch
     + PredicatePushdown
     + PlanNodeMeta
@@ -520,7 +520,7 @@ impl dyn PlanNode {
     ///
     /// Note that [`StreamTableScan`] has its own implementation of `to_stream_prost`. We have a
     /// hook inside to do some ad-hoc thing for [`StreamTableScan`].
-    pub fn to_stream_prost(&self, state: &mut BuildFragmentGraphState) -> StreamPlanProst {
+    pub fn to_stream_prost(&self, state: &mut BuildFragmentGraphState) -> StreamPlanPb {
         if let Some(stream_table_scan) = self.as_stream_table_scan() {
             return stream_table_scan.adhoc_to_stream_prost();
         }
@@ -535,7 +535,7 @@ impl dyn PlanNode {
             .map(|plan| plan.to_stream_prost(state))
             .collect();
         // TODO: support pk_indices and operator_id
-        StreamPlanProst {
+        StreamPlanPb {
             input,
             identity: format!("{}", self),
             node_body: node,
@@ -547,20 +547,20 @@ impl dyn PlanNode {
     }
 
     /// Serialize the plan node and its children to a batch plan proto.
-    pub fn to_batch_prost(&self) -> BatchPlanProst {
+    pub fn to_batch_prost(&self) -> BatchPlanPb {
         self.to_batch_prost_identity(true)
     }
 
     /// Serialize the plan node and its children to a batch plan proto without the identity field
     /// (for testing).
-    pub fn to_batch_prost_identity(&self, identity: bool) -> BatchPlanProst {
+    pub fn to_batch_prost_identity(&self, identity: bool) -> BatchPlanPb {
         let node_body = Some(self.to_batch_prost_body());
         let children = self
             .inputs()
             .into_iter()
             .map(|plan| plan.to_batch_prost_identity(identity))
             .collect();
-        BatchPlanProst {
+        BatchPlanPb {
             children,
             identity: if identity {
                 format!("{:?}", self)
diff --git a/src/frontend/src/optimizer/plan_node/stream.rs b/src/frontend/src/optimizer/plan_node/stream.rs
index c63795d5fb44c..72d9ccb21095c 100644
--- a/src/frontend/src/optimizer/plan_node/stream.rs
+++ b/src/frontend/src/optimizer/plan_node/stream.rs
@@ -422,18 +422,18 @@ impl_node!(
     TopN
 );
 
-use pb_node::NodeBody as ProstNode;
+use pb_node::PbNodeBody;
 #[allow(dead_code)]
 pub fn to_stream_prost_body(
     (base, core): &PlanOwned,
     state: &mut BuildFragmentGraphState,
-) -> ProstNode {
+) -> PbNodeBody {
     use pb::*;
     match core {
         Node::TableScan(_) => todo!(),
         Node::IndexScan(_) => todo!(),
         // ^ need standalone implementations
-        Node::Exchange(_) => ProstNode::Exchange(ExchangeNode {
+        Node::Exchange(_) => PbNodeBody::Exchange(ExchangeNode {
             strategy: Some(DispatchStrategy {
                 r#type: match &base.dist {
                     Distribution::HashShard(_) => DispatcherType::Hash,
@@ -459,7 +459,7 @@ pub fn to_stream_prost_body(
                 .with_id(state.gen_table_id_wrapped());
             let right_table = infer_right_internal_table_catalog(&me.right.0)
                 .with_id(state.gen_table_id_wrapped());
-            ProstNode::DynamicFilter(DynamicFilterNode {
+            PbNodeBody::DynamicFilter(DynamicFilterNode {
                 left_key: me.left_index as u32,
                 condition,
                 left_table: Some(left_table.to_internal_table_prost()),
@@ -482,7 +482,7 @@ pub fn to_stream_prost_body(
 
             // TODO: add a separate delta join node in proto, or move fragmenter to frontend so that
             // we don't need an intermediate representation.
-            ProstNode::DeltaIndexJoin(DeltaIndexJoinNode {
+            PbNodeBody::DeltaIndexJoin(DeltaIndexJoinNode {
                 join_type: me.core.join_type as i32,
                 left_key: me
                     .eq_join_predicate
@@ -530,7 +530,7 @@ pub fn to_stream_prost_body(
             use pb::expand_node::Subset;
 
             let me = &me.core;
-            ProstNode::Expand(ExpandNode {
+            PbNodeBody::Expand(ExpandNode {
                 column_subsets: me
                     .column_subsets
                     .iter()
@@ -543,7 +543,7 @@ pub fn to_stream_prost_body(
         }
         Node::Filter(me) => {
             let me = &me.core;
-            ProstNode::Filter(FilterNode {
+            PbNodeBody::Filter(FilterNode {
                 search_condition: Some(ExprImpl::from(me.predicate.clone()).to_expr_proto()),
             })
         }
@@ -552,7 +552,7 @@ pub fn to_stream_prost_body(
             let agg_states = me.core.infer_stream_agg_state(base, None);
             let distinct_dedup_tables = me.core.infer_distinct_dedup_tables(base, None);
 
-            ProstNode::GlobalSimpleAgg(SimpleAggNode {
+            PbNodeBody::GlobalSimpleAgg(SimpleAggNode {
                 agg_calls: me
                     .core
                     .agg_calls
@@ -596,14 +596,14 @@ pub fn to_stream_prost_body(
                 order_by: me.core.order.to_protobuf(),
             };
 
-            ProstNode::GroupTopN(group_topn_node)
+            PbNodeBody::GroupTopN(group_topn_node)
         }
         Node::HashAgg(me) => {
             let result_table = me.core.infer_result_table(base, me.vnode_col_idx);
             let agg_states = me.core.infer_stream_agg_state(base, me.vnode_col_idx);
             let distinct_dedup_tables = me.core.infer_distinct_dedup_tables(base, me.vnode_col_idx);
 
-            ProstNode::HashAgg(HashAggNode {
+            PbNodeBody::HashAgg(HashAggNode {
                 group_key: me.core.group_key.iter().map(|&idx| idx as u32).collect(),
                 agg_calls: me
                     .core
@@ -645,7 +645,7 @@ pub fn to_stream_prost_body(
                 .map(|x| x.to_expr_proto())
                 .collect();
             let me = &me.core;
-            ProstNode::HopWindow(HopWindowNode {
+            PbNodeBody::HopWindow(HopWindowNode {
                 time_col: me.time_col.index() as _,
                 window_slide: Some(me.window_slide.into()),
                 window_size: Some(me.window_size.into()),
@@ -656,7 +656,7 @@ pub fn to_stream_prost_body(
         }
         Node::LocalSimpleAgg(me) => {
             let me = &me.core;
-            ProstNode::LocalSimpleAgg(SimpleAggNode {
+            PbNodeBody::LocalSimpleAgg(SimpleAggNode {
                 agg_calls: me.agg_calls.iter().map(PlanAggCall::to_protobuf).collect(),
                 row_count_index: u32::MAX, // this is not used
                 distribution_key: base
@@ -672,13 +672,12 @@ pub fn to_stream_prost_body(
             })
         }
         Node::Materialize(me) => {
-            ProstNode::Materialize(MaterializeNode {
+            PbNodeBody::Materialize(MaterializeNode {
                 // We don't need table id for materialize node in frontend. The id will be generated
                 // on meta catalog service.
                 table_id: 0,
                 column_orders: me.table.pk().iter().map(ColumnOrder::to_protobuf).collect(),
                 table: Some(me.table.to_internal_table_prost()),
-                handle_pk_conflict_behavior: 0,
             })
         }
         Node::ProjectSet(me) => {
@@ -688,9 +687,9 @@ pub fn to_stream_prost_body(
                 .iter()
                 .map(ExprImpl::to_project_set_select_item_proto)
                 .collect();
-            ProstNode::ProjectSet(ProjectSetNode { select_list })
+            PbNodeBody::ProjectSet(ProjectSetNode { select_list })
         }
-        Node::Project(me) => ProstNode::Project(ProjectNode {
+        Node::Project(me) => PbNodeBody::Project(ProjectNode {
             select_list: me.core.exprs.iter().map(|x| x.to_expr_proto()).collect(),
             watermark_input_key: me
                 .watermark_derivations
@@ -703,7 +702,7 @@ pub fn to_stream_prost_body(
                 .map(|(_, y)| *y as u32)
                 .collect(),
         }),
-        Node::Sink(me) => ProstNode::Sink(SinkNode {
+        Node::Sink(me) => PbNodeBody::Sink(SinkNode {
             sink_desc: Some(me.sink_desc.to_proto()),
         }),
         Node::Source(me) => {
@@ -722,7 +721,7 @@ pub fn to_stream_prost_body(
                 pk_column_ids: me.pk_col_ids.iter().map(Into::into).collect(),
                 properties: me.properties.clone().into_iter().collect(),
             });
-            ProstNode::Source(SourceNode { source_inner })
+            PbNodeBody::Source(SourceNode { source_inner })
         }
         Node::TopN(me) => {
             let me = &me.core;
@@ -740,9 +739,9 @@ pub fn to_stream_prost_body(
             // TODO: support with ties for append only TopN
             // <https://github.com/risingwavelabs/risingwave/issues/5642>
             if me.input.0.append_only && !me.with_ties {
-                ProstNode::AppendOnlyTopN(topn_node)
+                PbNodeBody::AppendOnlyTopN(topn_node)
             } else {
-                ProstNode::TopN(topn_node)
+                PbNodeBody::TopN(topn_node)
             }
         }
     }
diff --git a/src/frontend/src/optimizer/plan_node/stream_dml.rs b/src/frontend/src/optimizer/plan_node/stream_dml.rs
index 1d8d5300ad8a3..1d0a62056aae6 100644
--- a/src/frontend/src/optimizer/plan_node/stream_dml.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_dml.rs
@@ -16,7 +16,7 @@ use std::fmt;
 
 use fixedbitset::FixedBitSet;
 use risingwave_common::catalog::{ColumnDesc, INITIAL_TABLE_VERSION_ID};
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 
 use super::{ExprRewritable, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
 use crate::stream_fragmenter::BuildFragmentGraphState;
@@ -78,10 +78,10 @@ impl PlanTreeNodeUnary for StreamDml {
 impl_plan_tree_node_for_unary! {StreamDml}
 
 impl StreamNode for StreamDml {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
 
-        ProstStreamNode::Dml(DmlNode {
+        PbNodeBody::Dml(DmlNode {
             table_id: 0,                                // Meta will fill this table id.
             table_version_id: INITIAL_TABLE_VERSION_ID, // Meta will fill this version id.
             column_descs: self.column_descs.iter().map(Into::into).collect(),
diff --git a/src/frontend/src/optimizer/plan_node/stream_dynamic_filter.rs b/src/frontend/src/optimizer/plan_node/stream_dynamic_filter.rs
index f947604b3d1d9..894a9190b9a70 100644
--- a/src/frontend/src/optimizer/plan_node/stream_dynamic_filter.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_dynamic_filter.rs
@@ -44,7 +44,7 @@ impl StreamDynamicFilter {
             let mut watermark_columns = FixedBitSet::with_capacity(left.schema().len());
             if right.watermark_columns()[0] {
                 match comparator {
-                    ExprType::GreaterThan | ExprType::GreaterThanOrEqual => {
+                    ExprType::Equal | ExprType::GreaterThan | ExprType::GreaterThanOrEqual => {
                         watermark_columns.set(left_index, true)
                     }
                     _ => {}
diff --git a/src/frontend/src/optimizer/plan_node/stream_expand.rs b/src/frontend/src/optimizer/plan_node/stream_expand.rs
index 853e5800bcd90..bc70d8d3b2b86 100644
--- a/src/frontend/src/optimizer/plan_node/stream_expand.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_expand.rs
@@ -16,7 +16,7 @@ use std::fmt;
 
 use fixedbitset::FixedBitSet;
 use risingwave_pb::stream_plan::expand_node::Subset;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 use risingwave_pb::stream_plan::ExpandNode;
 
 use super::{ExprRewritable, LogicalExpand, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -86,8 +86,8 @@ impl PlanTreeNodeUnary for StreamExpand {
 impl_plan_tree_node_for_unary! { StreamExpand }
 
 impl StreamNode for StreamExpand {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
-        ProstStreamNode::Expand(ExpandNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
+        PbNodeBody::Expand(ExpandNode {
             column_subsets: self
                 .column_subsets()
                 .iter()
diff --git a/src/frontend/src/optimizer/plan_node/stream_filter.rs b/src/frontend/src/optimizer/plan_node/stream_filter.rs
index 964a9cb9f5060..23ecfea0d4cbb 100644
--- a/src/frontend/src/optimizer/plan_node/stream_filter.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_filter.rs
@@ -14,7 +14,7 @@
 
 use std::fmt;
 
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 use risingwave_pb::stream_plan::FilterNode;
 
 use super::{ExprRewritable, LogicalFilter, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -73,8 +73,8 @@ impl PlanTreeNodeUnary for StreamFilter {
 impl_plan_tree_node_for_unary! { StreamFilter }
 
 impl StreamNode for StreamFilter {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
-        ProstStreamNode::Filter(FilterNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
+        PbNodeBody::Filter(FilterNode {
             search_condition: Some(ExprImpl::from(self.predicate().clone()).to_expr_proto()),
         })
     }
diff --git a/src/frontend/src/optimizer/plan_node/stream_global_simple_agg.rs b/src/frontend/src/optimizer/plan_node/stream_global_simple_agg.rs
index b31e714141e6e..9d4a2bddbd9d9 100644
--- a/src/frontend/src/optimizer/plan_node/stream_global_simple_agg.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_global_simple_agg.rs
@@ -16,7 +16,7 @@ use std::fmt;
 
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 
 use super::generic::PlanAggCall;
 use super::{ExprRewritable, LogicalAgg, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -101,13 +101,13 @@ impl PlanTreeNodeUnary for StreamGlobalSimpleAgg {
 impl_plan_tree_node_for_unary! { StreamGlobalSimpleAgg }
 
 impl StreamNode for StreamGlobalSimpleAgg {
-    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
         let result_table = self.logical.infer_result_table(None);
         let agg_states = self.logical.infer_stream_agg_state(None);
         let distinct_dedup_tables = self.logical.infer_distinct_dedup_tables(None);
 
-        ProstStreamNode::GlobalSimpleAgg(SimpleAggNode {
+        PbNodeBody::GlobalSimpleAgg(SimpleAggNode {
             agg_calls: self
                 .agg_calls()
                 .iter()
diff --git a/src/frontend/src/optimizer/plan_node/stream_group_topn.rs b/src/frontend/src/optimizer/plan_node/stream_group_topn.rs
index 522200ef49d53..0735993b1fc54 100644
--- a/src/frontend/src/optimizer/plan_node/stream_group_topn.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_group_topn.rs
@@ -17,7 +17,7 @@ use std::fmt;
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
 use risingwave_common::catalog::FieldDisplay;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 
 use super::{ExprRewritable, LogicalTopN, PlanBase, PlanTreeNodeUnary, StreamNode};
 use crate::optimizer::property::{Order, OrderDisplay};
@@ -90,7 +90,7 @@ impl StreamGroupTopN {
 }
 
 impl StreamNode for StreamGroupTopN {
-    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
         let table = self
             .logical
@@ -106,9 +106,9 @@ impl StreamNode for StreamGroupTopN {
             order_by: self.topn_order().to_protobuf(),
         };
         if self.input().append_only() {
-            ProstStreamNode::AppendOnlyGroupTopN(group_topn_node)
+            PbNodeBody::AppendOnlyGroupTopN(group_topn_node)
         } else {
-            ProstStreamNode::GroupTopN(group_topn_node)
+            PbNodeBody::GroupTopN(group_topn_node)
         }
     }
 }
diff --git a/src/frontend/src/optimizer/plan_node/stream_hash_agg.rs b/src/frontend/src/optimizer/plan_node/stream_hash_agg.rs
index 5f679432a855d..e736448863142 100644
--- a/src/frontend/src/optimizer/plan_node/stream_hash_agg.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_hash_agg.rs
@@ -17,7 +17,7 @@ use std::fmt;
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
 use risingwave_common::catalog::FieldDisplay;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 
 use super::generic::PlanAggCall;
 use super::{ExprRewritable, LogicalAgg, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -138,13 +138,13 @@ impl PlanTreeNodeUnary for StreamHashAgg {
 impl_plan_tree_node_for_unary! { StreamHashAgg }
 
 impl StreamNode for StreamHashAgg {
-    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
         let result_table = self.logical.infer_result_table(self.vnode_col_idx);
         let agg_states = self.logical.infer_stream_agg_state(self.vnode_col_idx);
         let distinct_dedup_tables = self.logical.infer_distinct_dedup_tables(self.vnode_col_idx);
 
-        ProstStreamNode::HashAgg(HashAggNode {
+        PbNodeBody::HashAgg(HashAggNode {
             group_key: self.group_key().iter().map(|idx| *idx as u32).collect(),
             agg_calls: self
                 .agg_calls()
diff --git a/src/frontend/src/optimizer/plan_node/stream_hash_join.rs b/src/frontend/src/optimizer/plan_node/stream_hash_join.rs
index 95395325fd19b..6253e5a878174 100644
--- a/src/frontend/src/optimizer/plan_node/stream_hash_join.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_hash_join.rs
@@ -20,12 +20,12 @@ use risingwave_common::catalog::{FieldDisplay, Schema};
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_pb::plan_common::JoinType;
 use risingwave_pb::stream_plan::stream_node::NodeBody;
-use risingwave_pb::stream_plan::HashJoinNode;
+use risingwave_pb::stream_plan::{DeltaExpression, HashJoinNode, PbInequalityPair};
 
 use super::{
     ExprRewritable, LogicalJoin, PlanBase, PlanRef, PlanTreeNodeBinary, StreamDeltaJoin, StreamNode,
 };
-use crate::expr::{Expr, ExprRewriter};
+use crate::expr::{Expr, ExprDisplay, ExprRewriter, InequalityInputPair};
 use crate::optimizer::plan_node::generic::GenericPlanRef;
 use crate::optimizer::plan_node::utils::IndicesDisplay;
 use crate::optimizer::plan_node::{EqJoinPredicate, EqJoinPredicateDisplay};
@@ -45,9 +45,22 @@ pub struct StreamHashJoin {
     /// non-equal parts to facilitate execution later
     eq_join_predicate: EqJoinPredicate,
 
+    /// `(do_state_cleaning, InequalityInputPair {key_required_larger, key_required_smaller,
+    /// delta_expression})`. View struct `InequalityInputPair` for details.
+    inequality_pairs: Vec<(bool, InequalityInputPair)>,
+
     /// Whether can optimize for append-only stream.
     /// It is true if input of both side is append-only
     is_append_only: bool,
+
+    /// The conjunction index of the inequality which is used to clean left state table in
+    /// `HashJoinExecutor`. If any equal condition is able to clean state table, this field
+    /// will always be `None`.
+    clean_left_state_conjunction_idx: Option<usize>,
+    /// The conjunction index of the inequality which is used to clean right state table in
+    /// `HashJoinExecutor`. If any equal condition is able to clean state table, this field
+    /// will always be `None`.
+    clean_right_state_conjunction_idx: Option<usize>,
 }
 
 impl StreamHashJoin {
@@ -65,17 +78,101 @@ impl StreamHashJoin {
             &logical,
         );
 
+        let mut inequality_pairs = vec![];
+        let mut clean_left_state_conjunction_idx = None;
+        let mut clean_right_state_conjunction_idx = None;
+
         let watermark_columns = {
             let l2i = logical.l2i_col_mapping();
             let r2i = logical.r2i_col_mapping();
 
+            let mut equal_condition_clean_state = false;
             let mut watermark_columns = FixedBitSet::with_capacity(logical.internal_column_num());
             for (left_key, right_key) in eq_join_predicate.eq_indexes() {
                 if logical.left().watermark_columns().contains(left_key)
                     && logical.right().watermark_columns().contains(right_key)
                 {
-                    watermark_columns.insert(l2i.map(left_key));
-                    watermark_columns.insert(r2i.map(right_key));
+                    equal_condition_clean_state = true;
+                    if let Some(internal) = l2i.try_map(left_key) {
+                        watermark_columns.insert(internal);
+                    }
+                    if let Some(internal) = r2i.try_map(right_key) {
+                        watermark_columns.insert(internal);
+                    }
+                }
+            }
+            let (left_cols_num, original_inequality_pairs) = eq_join_predicate.inequality_pairs();
+            for (
+                conjunction_idx,
+                InequalityInputPair {
+                    key_required_larger,
+                    key_required_smaller,
+                    delta_expression,
+                },
+            ) in original_inequality_pairs
+            {
+                let both_upstream_has_watermark = if key_required_larger < key_required_smaller {
+                    logical
+                        .left()
+                        .watermark_columns()
+                        .contains(key_required_larger)
+                        && logical
+                            .right()
+                            .watermark_columns()
+                            .contains(key_required_smaller - left_cols_num)
+                } else {
+                    logical
+                        .left()
+                        .watermark_columns()
+                        .contains(key_required_smaller)
+                        && logical
+                            .right()
+                            .watermark_columns()
+                            .contains(key_required_larger - left_cols_num)
+                };
+                if !both_upstream_has_watermark {
+                    continue;
+                }
+
+                let (internal, do_state_cleaning) = if key_required_larger < key_required_smaller {
+                    (
+                        l2i.try_map(key_required_larger),
+                        if !equal_condition_clean_state
+                            && clean_left_state_conjunction_idx.is_none()
+                        {
+                            clean_left_state_conjunction_idx = Some(conjunction_idx);
+                            true
+                        } else {
+                            false
+                        },
+                    )
+                } else {
+                    (
+                        r2i.try_map(key_required_larger - left_cols_num),
+                        if !equal_condition_clean_state
+                            && clean_right_state_conjunction_idx.is_none()
+                        {
+                            clean_right_state_conjunction_idx = Some(conjunction_idx);
+                            true
+                        } else {
+                            false
+                        },
+                    )
+                };
+                let mut is_valuable_inequality = do_state_cleaning;
+                if let Some(internal) = internal && !watermark_columns.contains(internal) {
+                    watermark_columns.insert(internal);
+                    is_valuable_inequality = true;
+                }
+                if is_valuable_inequality {
+                    inequality_pairs.push((
+                        do_state_cleaning,
+                        InequalityInputPair {
+                            key_required_larger,
+                            key_required_smaller,
+                            delta_expression,
+                        },
+                    ));
                 }
             }
             logical.i2o_col_mapping().rewrite_bitset(&watermark_columns)
@@ -96,7 +193,10 @@ impl StreamHashJoin {
             base,
             logical,
             eq_join_predicate,
+            inequality_pairs,
             is_append_only: append_only,
+            clean_left_state_conjunction_idx,
+            clean_right_state_conjunction_idx,
         }
     }
 
@@ -180,6 +280,10 @@ impl fmt::Display for StreamHashJoin {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut builder = if self.is_append_only {
             f.debug_struct("StreamAppendOnlyHashJoin")
+        } else if self.clean_left_state_conjunction_idx.is_some()
+            && self.clean_right_state_conjunction_idx.is_some()
+        {
+            f.debug_struct("StreamIntervalJoin")
         } else {
             f.debug_struct("StreamHashJoin")
         };
@@ -198,6 +302,25 @@ impl fmt::Display for StreamHashJoin {
             },
         );
 
+        if let Some(conjunction_idx) = self.clean_left_state_conjunction_idx {
+            builder.field(
+                "conditions_to_clean_left_state_table",
+                &ExprDisplay {
+                    expr: &self.eq_join_predicate().other_cond().conjunctions[conjunction_idx],
+                    input_schema: &concat_schema,
+                },
+            );
+        }
+        if let Some(conjunction_idx) = self.clean_right_state_conjunction_idx {
+            builder.field(
+                "conditions_to_clean_right_state_table",
+                &ExprDisplay {
+                    expr: &self.eq_join_predicate().other_cond().conjunctions[conjunction_idx],
+                    input_schema: &concat_schema,
+                },
+            );
+        }
+
         let watermark_columns = &self.base.watermark_columns;
         if self.base.watermark_columns.count_ones(..) > 0 {
             let schema = self.schema();
@@ -307,6 +430,32 @@ impl StreamNode for StreamHashJoin {
                 .other_cond()
                 .as_expr_unless_true()
                 .map(|x| x.to_expr_proto()),
+            inequality_pairs: self
+                .inequality_pairs
+                .iter()
+                .map(
+                    |(
+                        do_state_clean,
+                        InequalityInputPair {
+                            key_required_larger,
+                            key_required_smaller,
+                            delta_expression,
+                        },
+                    )| {
+                        PbInequalityPair {
+                            key_required_larger: *key_required_larger as u32,
+                            key_required_smaller: *key_required_smaller as u32,
+                            clean_state: *do_state_clean,
+                            delta_expression: delta_expression.as_ref().map(
+                                |(delta_type, delta)| DeltaExpression {
+                                    delta_type: *delta_type as i32,
+                                    delta: Some(delta.to_expr_proto()),
+                                },
+                            ),
+                        }
+                    },
+                )
+                .collect_vec(),
             left_table: Some(left_table.to_internal_table_prost()),
             right_table: Some(right_table.to_internal_table_prost()),
             left_degree_table: Some(left_degree_table.to_internal_table_prost()),
diff --git a/src/frontend/src/optimizer/plan_node/stream_hop_window.rs b/src/frontend/src/optimizer/plan_node/stream_hop_window.rs
index 73b455a54b754..221ed3e678d6e 100644
--- a/src/frontend/src/optimizer/plan_node/stream_hop_window.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_hop_window.rs
@@ -17,7 +17,7 @@ use std::fmt;
 use itertools::Itertools;
 use risingwave_common::catalog::FieldDisplay;
 use risingwave_common::util::column_index_mapping::ColIndexMapping;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 use risingwave_pb::stream_plan::HopWindowNode;
 
 use super::{ExprRewritable, LogicalHopWindow, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -118,8 +118,8 @@ impl PlanTreeNodeUnary for StreamHopWindow {
 impl_plan_tree_node_for_unary! {StreamHopWindow}
 
 impl StreamNode for StreamHopWindow {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
-        ProstStreamNode::HopWindow(HopWindowNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
+        PbNodeBody::HopWindow(HopWindowNode {
             time_col: self.logical.core.time_col.index() as _,
             window_slide: Some(self.logical.core.window_slide.into()),
             window_size: Some(self.logical.core.window_size.into()),
diff --git a/src/frontend/src/optimizer/plan_node/stream_local_simple_agg.rs b/src/frontend/src/optimizer/plan_node/stream_local_simple_agg.rs
index 21d95483d546d..32e2bdf8c19d6 100644
--- a/src/frontend/src/optimizer/plan_node/stream_local_simple_agg.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_local_simple_agg.rs
@@ -16,7 +16,7 @@ use std::fmt;
 
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 
 use super::generic::PlanAggCall;
 use super::{ExprRewritable, LogicalAgg, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -89,9 +89,9 @@ impl PlanTreeNodeUnary for StreamLocalSimpleAgg {
 impl_plan_tree_node_for_unary! { StreamLocalSimpleAgg }
 
 impl StreamNode for StreamLocalSimpleAgg {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
-        ProstStreamNode::LocalSimpleAgg(SimpleAggNode {
+        PbNodeBody::LocalSimpleAgg(SimpleAggNode {
             agg_calls: self
                 .agg_calls()
                 .iter()
diff --git a/src/frontend/src/optimizer/plan_node/stream_materialize.rs b/src/frontend/src/optimizer/plan_node/stream_materialize.rs
index 87809258e5e26..78ecc49ed1a41 100644
--- a/src/frontend/src/optimizer/plan_node/stream_materialize.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_materialize.rs
@@ -21,7 +21,7 @@ use risingwave_common::catalog::{ColumnCatalog, ConflictBehavior, TableId};
 use risingwave_common::error::Result;
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_common::util::sort_util::ColumnOrder;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 
 use super::derive::derive_columns;
 use super::{reorganize_elements_id, ExprRewritable, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -171,12 +171,6 @@ impl StreamMaterialize {
 
         let (pk, stream_key) = derive_pk(input, user_order_by, &columns);
         let read_prefix_len_hint = stream_key.len();
-
-        let conflict_behavior_type = match conflict_behavior {
-            ConflictBehavior::NoCheck => 0,
-            ConflictBehavior::OverWrite => 1,
-            ConflictBehavior::IgnoreConflict => 2,
-        };
         Ok(TableCatalog {
             id: TableId::placeholder(),
             associated_source_id: None,
@@ -195,7 +189,7 @@ impl StreamMaterialize {
             row_id_index,
             value_indices,
             definition,
-            conflict_behavior_type,
+            conflict_behavior,
             read_prefix_len_hint,
             version,
             watermark_columns,
@@ -224,13 +218,13 @@ impl fmt::Display for StreamMaterialize {
             .map(|c| c.name_with_hidden())
             .join(", ");
 
-        let pk_column_names = table
+        let stream_key = table
             .stream_key
             .iter()
-            .map(|&pk| &table.columns[pk].column_desc.name)
+            .map(|&k| &table.columns[k].column_desc.name)
             .join(", ");
 
-        let order_descs = table
+        let pk_columns = table
             .pk
             .iter()
             .map(|o| table.columns()[o.column_index].column_desc.name.clone())
@@ -239,20 +233,11 @@ impl fmt::Display for StreamMaterialize {
         let mut builder = f.debug_struct("StreamMaterialize");
         builder
             .field("columns", &format_args!("[{}]", column_names))
-            .field("pk_columns", &format_args!("[{}]", pk_column_names));
-
-        if pk_column_names != order_descs {
-            builder.field("order_descs", &format_args!("[{}]", order_descs));
-        }
-
-        let pk_conflict_behavior;
-        if self.table.conflict_behavior_type() == 0 {
-            pk_conflict_behavior = "no check";
-        } else if self.table.conflict_behavior_type() == 1 {
-            pk_conflict_behavior = "overwrite";
-        } else {
-            pk_conflict_behavior = "ignore conflict";
-        }
+            .field("stream_key", &format_args!("[{}]", stream_key))
+            .field("pk_columns", &format_args!("[{}]", pk_columns));
+
+        let pk_conflict_behavior = self.table.conflict_behavior().debug_to_string();
+
         builder.field("pk_conflict", &pk_conflict_behavior);
 
         let watermark_columns = &self.base.watermark_columns;
@@ -296,11 +281,10 @@ impl PlanTreeNodeUnary for StreamMaterialize {
 impl_plan_tree_node_for_unary! { StreamMaterialize }
 
 impl StreamNode for StreamMaterialize {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
 
-        let handle_pk_conflict_behavior = self.table.conflict_behavior_type();
-        ProstStreamNode::Materialize(MaterializeNode {
+        PbNodeBody::Materialize(MaterializeNode {
             // We don't need table id for materialize node in frontend. The id will be generated on
             // meta catalog service.
             table_id: 0,
@@ -311,7 +295,6 @@ impl StreamNode for StreamMaterialize {
                 .map(ColumnOrder::to_protobuf)
                 .collect(),
             table: Some(self.table().to_internal_table_prost()),
-            handle_pk_conflict_behavior,
         })
     }
 }
diff --git a/src/frontend/src/optimizer/plan_node/stream_project.rs b/src/frontend/src/optimizer/plan_node/stream_project.rs
index 5fe185cad7420..c79f3614a1273 100644
--- a/src/frontend/src/optimizer/plan_node/stream_project.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_project.rs
@@ -17,7 +17,7 @@ use std::fmt;
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
 use risingwave_common::catalog::FieldDisplay;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 use risingwave_pb::stream_plan::ProjectNode;
 
 use super::{ExprRewritable, LogicalProject, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -113,8 +113,8 @@ impl PlanTreeNodeUnary for StreamProject {
 impl_plan_tree_node_for_unary! {StreamProject}
 
 impl StreamNode for StreamProject {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
-        ProstStreamNode::Project(ProjectNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
+        PbNodeBody::Project(ProjectNode {
             select_list: self
                 .logical
                 .exprs()
diff --git a/src/frontend/src/optimizer/plan_node/stream_project_set.rs b/src/frontend/src/optimizer/plan_node/stream_project_set.rs
index 24ed8a833db4c..6f0a5ee5de7e8 100644
--- a/src/frontend/src/optimizer/plan_node/stream_project_set.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_project_set.rs
@@ -16,7 +16,7 @@ use std::fmt;
 
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 use risingwave_pb::stream_plan::ProjectSetNode;
 
 use super::{ExprRewritable, LogicalProjectSet, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -84,8 +84,8 @@ impl PlanTreeNodeUnary for StreamProjectSet {
 impl_plan_tree_node_for_unary! { StreamProjectSet }
 
 impl StreamNode for StreamProjectSet {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
-        ProstStreamNode::ProjectSet(ProjectSetNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
+        PbNodeBody::ProjectSet(ProjectSetNode {
             select_list: self
                 .logical
                 .select_list()
diff --git a/src/frontend/src/optimizer/plan_node/stream_row_id_gen.rs b/src/frontend/src/optimizer/plan_node/stream_row_id_gen.rs
index fe2c59da603eb..c703428a94d66 100644
--- a/src/frontend/src/optimizer/plan_node/stream_row_id_gen.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_row_id_gen.rs
@@ -14,9 +14,11 @@
 
 use std::fmt;
 
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 
 use super::{ExprRewritable, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
+use crate::optimizer::plan_node::stream::StreamPlanRef;
+use crate::optimizer::property::Distribution;
 use crate::stream_fragmenter::BuildFragmentGraphState;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -28,12 +30,19 @@ pub struct StreamRowIdGen {
 
 impl StreamRowIdGen {
     pub fn new(input: PlanRef, row_id_index: usize) -> Self {
+        let distribution = if input.append_only() {
+            // remove exchange for append only source
+            Distribution::HashShard(vec![row_id_index])
+        } else {
+            input.distribution().clone()
+        };
+
         let base = PlanBase::new_stream(
             input.ctx(),
             input.schema().clone(),
             input.logical_pk().to_vec(),
             input.functional_dependency().clone(),
-            input.distribution().clone(),
+            distribution,
             input.append_only(),
             input.watermark_columns().clone(),
         );
@@ -68,10 +77,10 @@ impl PlanTreeNodeUnary for StreamRowIdGen {
 impl_plan_tree_node_for_unary! {StreamRowIdGen}
 
 impl StreamNode for StreamRowIdGen {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
 
-        ProstStreamNode::RowIdGen(RowIdGenNode {
+        PbNodeBody::RowIdGen(RowIdGenNode {
             row_id_index: self.row_id_index as _,
         })
     }
diff --git a/src/frontend/src/optimizer/plan_node/stream_share.rs b/src/frontend/src/optimizer/plan_node/stream_share.rs
index 486694334f0e2..e89bfc6010a66 100644
--- a/src/frontend/src/optimizer/plan_node/stream_share.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_share.rs
@@ -15,10 +15,8 @@
 use std::fmt;
 
 use itertools::Itertools;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
-use risingwave_pb::stream_plan::{
-    DispatchStrategy, DispatcherType, ExchangeNode, StreamNode as ProstStreamPlan,
-};
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
+use risingwave_pb::stream_plan::{DispatchStrategy, DispatcherType, ExchangeNode, PbStreamNode};
 
 use super::{ExprRewritable, PlanRef, PlanTreeNodeUnary, StreamNode};
 use crate::optimizer::plan_node::{LogicalShare, PlanBase, PlanTreeNode};
@@ -77,13 +75,13 @@ impl StreamShare {
 impl_plan_tree_node_for_unary! { StreamShare }
 
 impl StreamNode for StreamShare {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
         unreachable!("stream scan cannot be converted into a prost body -- call `adhoc_to_stream_prost` instead.")
     }
 }
 
 impl StreamShare {
-    pub fn adhoc_to_stream_prost(&self, state: &mut BuildFragmentGraphState) -> ProstStreamPlan {
+    pub fn adhoc_to_stream_prost(&self, state: &mut BuildFragmentGraphState) -> PbStreamNode {
         let operator_id = self.base.id.0 as u32;
         let output_indices = (0..self.schema().len() as u32).collect_vec();
 
@@ -122,7 +120,7 @@ impl StreamShare {
                     }
                 };
 
-                let node_body = Some(ProstStreamNode::Exchange(ExchangeNode {
+                let node_body = Some(PbNodeBody::Exchange(ExchangeNode {
                     strategy: Some(dispatch_strategy),
                 }));
                 let input = self
@@ -131,7 +129,7 @@ impl StreamShare {
                     .map(|plan| plan.to_stream_prost(state))
                     .collect();
 
-                let stream_node = ProstStreamPlan {
+                let stream_node = PbStreamNode {
                     input,
                     identity: format!("{}", self),
                     node_body,
diff --git a/src/frontend/src/optimizer/plan_node/stream_sink.rs b/src/frontend/src/optimizer/plan_node/stream_sink.rs
index 7cc27bbae614c..8139991de51c0 100644
--- a/src/frontend/src/optimizer/plan_node/stream_sink.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_sink.rs
@@ -23,9 +23,10 @@ use risingwave_common::error::{ErrorCode, Result};
 use risingwave_connector::sink::catalog::desc::SinkDesc;
 use risingwave_connector::sink::catalog::{SinkId, SinkType};
 use risingwave_connector::sink::{
-    SINK_FORMAT_APPEND_ONLY, SINK_FORMAT_OPTION, SINK_USER_FORCE_APPEND_ONLY_OPTION,
+    SINK_TYPE_APPEND_ONLY, SINK_TYPE_DEBEZIUM, SINK_TYPE_OPTION, SINK_TYPE_UPSERT,
+    SINK_USER_FORCE_APPEND_ONLY_OPTION,
 };
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 use tracing::info;
 
 use super::derive::{derive_columns, derive_pk};
@@ -112,26 +113,21 @@ impl StreamSink {
         definition: String,
         properties: WithOptions,
     ) -> Result<SinkDesc> {
+        const DOWNSTREAM_PK_KEY: &str = "primary_key";
+
         let distribution_key = input.distribution().dist_column_indices().to_vec();
         let sink_type = Self::derive_sink_type(input.append_only(), &properties)?;
-        let (pk, stream_key) = derive_pk(input, user_order_by, &columns);
-
-        // TODO(Yuanxin): Remove this constraint.
-        if sink_type == SinkType::Upsert && pk.is_empty() {
-            return Err(ErrorCode::SinkError(Box::new(Error::new(
-                ErrorKind::InvalidInput,
-                "No primary key for the upsert sink. Please include the primary key explicitly in sink definition or make the sink append-only.",
-            )))
-            .into());
-        }
+        let (pk, _) = derive_pk(input, user_order_by, &columns);
+
+        let downstream_pk = Self::parse_downstream_pk(&columns, properties.get(DOWNSTREAM_PK_KEY))?;
 
         Ok(SinkDesc {
             id: SinkId::placeholder(),
             name,
             definition,
             columns,
-            pk,
-            stream_key,
+            plan_pk: pk,
+            downstream_pk,
             distribution_key,
             properties: properties.into_inner(),
             sink_type,
@@ -139,9 +135,28 @@ impl StreamSink {
     }
 
     fn derive_sink_type(input_append_only: bool, properties: &WithOptions) -> Result<SinkType> {
+        if let Some(sink_type) = properties.get(SINK_TYPE_OPTION) {
+            if sink_type != SINK_TYPE_APPEND_ONLY
+                && sink_type != SINK_TYPE_DEBEZIUM
+                && sink_type != SINK_TYPE_UPSERT
+            {
+                return Err(ErrorCode::SinkError(Box::new(Error::new(
+                    ErrorKind::InvalidInput,
+                    format!(
+                        "`{}` must be {}, {}, or {}",
+                        SINK_TYPE_OPTION,
+                        SINK_TYPE_APPEND_ONLY,
+                        SINK_TYPE_DEBEZIUM,
+                        SINK_TYPE_UPSERT
+                    ),
+                )))
+                .into());
+            }
+        }
+
         let frontend_derived_append_only = input_append_only;
         let user_defined_append_only =
-            properties.value_eq_ignore_case(SINK_FORMAT_OPTION, SINK_FORMAT_APPEND_ONLY);
+            properties.value_eq_ignore_case(SINK_TYPE_OPTION, SINK_TYPE_APPEND_ONLY);
         let user_force_append_only =
             properties.value_eq_ignore_case(SINK_USER_FORCE_APPEND_ONLY_OPTION, "true");
 
@@ -163,12 +178,55 @@ impl StreamSink {
             (_, false, true) => {
                 Err(ErrorCode::SinkError(Box::new(Error::new(
                     ErrorKind::InvalidInput,
-                    "Cannot force the sink to be append-only without \"format='append_only'\"in WITH options.",
+                    "Cannot force the sink to be append-only without \"type='append-only'\"in WITH options.",
                 )))
                 .into())
             }
         }
     }
+
+    /// Extract user-defined downstream pk columns from with options. Return the indices of the pk
+    /// columns.
+    ///
+    /// The format of `downstream_pk_str` should be 'col1,col2,...' (delimited by `,`) in order to
+    /// get parsed.
+    fn parse_downstream_pk(
+        columns: &[ColumnCatalog],
+        downstream_pk_str: Option<&String>,
+    ) -> Result<Vec<usize>> {
+        match downstream_pk_str {
+            Some(downstream_pk_str) => {
+                // If the user defines the downstream primary key, we find out their indices.
+                let downstream_pk = downstream_pk_str.split(',').collect_vec();
+                let mut downstream_pk_indices = Vec::with_capacity(downstream_pk.len());
+                for key in downstream_pk {
+                    let trimmed_key = key.trim();
+                    if trimmed_key.is_empty() {
+                        continue;
+                    }
+                    match columns
+                        .iter()
+                        .position(|col| col.column_desc.name == trimmed_key)
+                    {
+                        Some(index) => downstream_pk_indices.push(index),
+                        None => {
+                            return Err(ErrorCode::SinkError(Box::new(Error::new(
+                                ErrorKind::InvalidInput,
+                                format!("Sink primary key column not found: {}. Please use ',' as the delimiter for different primary key columns.", trimmed_key),
+                            )))
+                            .into());
+                        }
+                    }
+                }
+                Ok(downstream_pk_indices)
+            }
+            None => {
+                // The user doesn't define the downstream primary key and we simply return an empty
+                // vector.
+                Ok(Vec::new())
+            }
+        }
+    }
 }
 
 impl PlanTreeNodeUnary for StreamSink {
@@ -210,7 +268,7 @@ impl fmt::Display for StreamSink {
                 &IndicesDisplay {
                     indices: &self
                         .sink_desc
-                        .pk
+                        .plan_pk
                         .iter()
                         .map(|k| k.column_index)
                         .collect_vec(),
@@ -224,10 +282,10 @@ impl fmt::Display for StreamSink {
 }
 
 impl StreamNode for StreamSink {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
 
-        ProstStreamNode::Sink(SinkNode {
+        PbNodeBody::Sink(SinkNode {
             sink_desc: Some(self.sink_desc.to_proto()),
         })
     }
diff --git a/src/frontend/src/optimizer/plan_node/stream_source.rs b/src/frontend/src/optimizer/plan_node/stream_source.rs
index b09cd99d8f48a..de298c2a1b3e7 100644
--- a/src/frontend/src/optimizer/plan_node/stream_source.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_source.rs
@@ -16,8 +16,8 @@ use std::fmt;
 
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
-use risingwave_pb::stream_plan::{SourceNode, StreamSource as ProstStreamSource};
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
+use risingwave_pb::stream_plan::{PbStreamSource, SourceNode};
 
 use super::{ExprRewritable, LogicalSource, PlanBase, StreamNode};
 use crate::optimizer::property::Distribution;
@@ -80,9 +80,9 @@ impl fmt::Display for StreamSource {
 }
 
 impl StreamNode for StreamSource {
-    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> PbNodeBody {
         let source_catalog = self.logical.source_catalog();
-        let source_inner = source_catalog.map(|source_catalog| ProstStreamSource {
+        let source_inner = source_catalog.map(|source_catalog| PbStreamSource {
             source_id: source_catalog.id,
             source_name: source_catalog.name.clone(),
             state_table: Some(
@@ -105,7 +105,7 @@ impl StreamNode for StreamSource {
                 .collect_vec(),
             properties: source_catalog.properties.clone().into_iter().collect(),
         });
-        ProstStreamNode::Source(SourceNode { source_inner })
+        PbNodeBody::Source(SourceNode { source_inner })
     }
 }
 
diff --git a/src/frontend/src/optimizer/plan_node/stream_table_scan.rs b/src/frontend/src/optimizer/plan_node/stream_table_scan.rs
index c9ec715dceebf..303e87c7fef64 100644
--- a/src/frontend/src/optimizer/plan_node/stream_table_scan.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_table_scan.rs
@@ -18,8 +18,8 @@ use std::rc::Rc;
 
 use itertools::Itertools;
 use risingwave_common::catalog::{Field, TableDesc};
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
-use risingwave_pb::stream_plan::{ChainType, StreamNode as ProstStreamPlan};
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
+use risingwave_pb::stream_plan::{ChainType, PbStreamNode};
 
 use super::{ExprRewritable, LogicalScan, PlanBase, PlanNodeId, PlanRef, StreamNode};
 use crate::catalog::ColumnId;
@@ -149,13 +149,13 @@ impl fmt::Display for StreamTableScan {
 }
 
 impl StreamNode for StreamTableScan {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
         unreachable!("stream scan cannot be converted into a prost body -- call `adhoc_to_stream_prost` instead.")
     }
 }
 
 impl StreamTableScan {
-    pub fn adhoc_to_stream_prost(&self) -> ProstStreamPlan {
+    pub fn adhoc_to_stream_prost(&self) -> PbStreamNode {
         use risingwave_pb::stream_plan::*;
 
         let stream_key = self.base.logical_pk.iter().map(|x| *x as u32).collect_vec();
@@ -205,19 +205,19 @@ impl StreamTableScan {
             column_ids: upstream_column_ids.clone(),
         };
 
-        ProstStreamPlan {
+        PbStreamNode {
             fields: self.schema().to_prost(),
             input: vec![
                 // The merge node body will be filled by the `ActorBuilder` on the meta service.
-                ProstStreamPlan {
-                    node_body: Some(ProstStreamNode::Merge(Default::default())),
+                PbStreamNode {
+                    node_body: Some(PbNodeBody::Merge(Default::default())),
                     identity: "Upstream".into(),
                     fields: upstream_schema.clone(),
                     stream_key: vec![], // not used
                     ..Default::default()
                 },
-                ProstStreamPlan {
-                    node_body: Some(ProstStreamNode::BatchPlan(batch_plan_node)),
+                PbStreamNode {
+                    node_body: Some(PbNodeBody::BatchPlan(batch_plan_node)),
                     operator_id: self.batch_plan_id.0 as u64,
                     identity: "BatchPlanNode".into(),
                     fields: upstream_schema,
@@ -226,7 +226,7 @@ impl StreamTableScan {
                     append_only: true,
                 },
             ],
-            node_body: Some(ProstStreamNode::Chain(ChainNode {
+            node_body: Some(PbNodeBody::Chain(ChainNode {
                 table_id: self.logical.table_desc().table_id.table_id,
                 chain_type: self.chain_type as i32,
                 // The column indices need to be forwarded to the downstream
diff --git a/src/frontend/src/optimizer/plan_node/stream_temporal_join.rs b/src/frontend/src/optimizer/plan_node/stream_temporal_join.rs
index 0561bcc887141..f98f9809b85f5 100644
--- a/src/frontend/src/optimizer/plan_node/stream_temporal_join.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_temporal_join.rs
@@ -208,7 +208,7 @@ impl StreamNode for StreamTemporalJoin {
             table_desc: Some(scan.logical().table_desc().to_protobuf()),
             table_output_indices: scan
                 .logical()
-                .output_column_indices()
+                .output_col_idx()
                 .iter()
                 .map(|&i| i as _)
                 .collect(),
diff --git a/src/frontend/src/optimizer/plan_node/stream_topn.rs b/src/frontend/src/optimizer/plan_node/stream_topn.rs
index 5445249b3f611..4c474afe3f563 100644
--- a/src/frontend/src/optimizer/plan_node/stream_topn.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_topn.rs
@@ -15,7 +15,7 @@
 use std::fmt;
 
 use fixedbitset::FixedBitSet;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 
 use super::{ExprRewritable, LogicalTopN, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
 use crate::optimizer::property::{Distribution, Order};
@@ -93,7 +93,7 @@ impl PlanTreeNodeUnary for StreamTopN {
 impl_plan_tree_node_for_unary! { StreamTopN }
 
 impl StreamNode for StreamTopN {
-    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
         let topn_node = TopNNode {
             limit: self.limit(),
@@ -108,9 +108,9 @@ impl StreamNode for StreamTopN {
             order_by: self.topn_order().to_protobuf(),
         };
         if self.input().append_only() {
-            ProstStreamNode::AppendOnlyTopN(topn_node)
+            PbNodeBody::AppendOnlyTopN(topn_node)
         } else {
-            ProstStreamNode::TopN(topn_node)
+            PbNodeBody::TopN(topn_node)
         }
     }
 }
diff --git a/src/frontend/src/optimizer/plan_node/stream_union.rs b/src/frontend/src/optimizer/plan_node/stream_union.rs
index 067e0c4ea87f2..e103dc5988bab 100644
--- a/src/frontend/src/optimizer/plan_node/stream_union.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_union.rs
@@ -18,7 +18,7 @@ use std::ops::BitAnd;
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
 use risingwave_common::catalog::FieldDisplay;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 use risingwave_pb::stream_plan::UnionNode;
 
 use super::{ExprRewritable, PlanRef};
@@ -105,8 +105,8 @@ impl PlanTreeNode for StreamUnion {
 }
 
 impl StreamNode for StreamUnion {
-    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> ProstStreamNode {
-        ProstStreamNode::Union(UnionNode {})
+    fn to_stream_prost_body(&self, _state: &mut BuildFragmentGraphState) -> PbNodeBody {
+        PbNodeBody::Union(UnionNode {})
     }
 }
 
diff --git a/src/frontend/src/optimizer/plan_node/stream_watermark_filter.rs b/src/frontend/src/optimizer/plan_node/stream_watermark_filter.rs
index 45ef145bfd4fb..73cce1d689aa3 100644
--- a/src/frontend/src/optimizer/plan_node/stream_watermark_filter.rs
+++ b/src/frontend/src/optimizer/plan_node/stream_watermark_filter.rs
@@ -22,7 +22,7 @@ use risingwave_common::error::RwError;
 use risingwave_common::types::DataType;
 use risingwave_common::util::sort_util::OrderType;
 use risingwave_pb::catalog::WatermarkDesc;
-use risingwave_pb::stream_plan::stream_node::NodeBody as ProstStreamNode;
+use risingwave_pb::stream_plan::stream_node::PbNodeBody;
 
 use super::utils::TableCatalogBuilder;
 use super::{ExprRewritable, PlanBase, PlanRef, PlanTreeNodeUnary, StreamNode};
@@ -141,7 +141,7 @@ pub fn infer_internal_table_catalog(watermark_type: DataType) -> TableCatalog {
 }
 
 impl StreamNode for StreamWatermarkFilter {
-    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> ProstStreamNode {
+    fn to_stream_prost_body(&self, state: &mut BuildFragmentGraphState) -> PbNodeBody {
         use risingwave_pb::stream_plan::*;
 
         // TODO(yuhao): allow multiple watermark on source.
@@ -150,7 +150,7 @@ impl StreamNode for StreamWatermarkFilter {
 
         let table = infer_internal_table_catalog(watermark_type);
 
-        ProstStreamNode::WatermarkFilter(WatermarkFilterNode {
+        PbNodeBody::WatermarkFilter(WatermarkFilterNode {
             watermark_descs: self.watermark_descs.clone(),
             tables: vec![table
                 .with_id(state.gen_table_id_wrapped())
diff --git a/src/frontend/src/optimizer/plan_node/to_prost.rs b/src/frontend/src/optimizer/plan_node/to_prost.rs
index eb08c91a5e1f4..c2b7cad2de0ee 100644
--- a/src/frontend/src/optimizer/plan_node/to_prost.rs
+++ b/src/frontend/src/optimizer/plan_node/to_prost.rs
@@ -21,9 +21,9 @@ use crate::{
     for_all_plan_nodes, for_batch_plan_nodes, for_logical_plan_nodes, for_stream_plan_nodes,
 };
 
-pub trait ToProst: ToBatchProst + StreamNode {}
+pub trait ToPb: ToBatchPb + StreamNode {}
 
-pub trait ToBatchProst {
+pub trait ToBatchPb {
     fn to_batch_prost_body(&self) -> pb_batch_node::NodeBody {
         unimplemented!()
     }
@@ -38,20 +38,20 @@ pub trait StreamNode {
     }
 }
 
-/// impl `ToProst` nodes which have impl `ToBatchProst` and `ToStreamProst`.
+/// impl `ToPb` nodes which have impl `ToBatchPb` and `ToStreamPb`.
 macro_rules! impl_to_prost {
     ($( { $convention:ident, $name:ident }),*) => {
         paste!{
-            $(impl ToProst for [<$convention $name>] { })*
+            $(impl ToPb for [<$convention $name>] { })*
         }
     }
 }
 for_all_plan_nodes! { impl_to_prost }
-/// impl a panic `ToBatchProst` for logical and stream node.
+/// impl a panic `ToBatchPb` for logical and stream node.
 macro_rules! ban_to_batch_prost {
     ($( { $convention:ident, $name:ident }),*) => {
         paste!{
-            $(impl ToBatchProst for [<$convention $name>] {
+            $(impl ToBatchPb for [<$convention $name>] {
                 fn to_batch_prost_body(&self) -> pb_batch_node::NodeBody {
                     panic!("convert into distributed is only allowed on batch plan")
                 }
@@ -61,7 +61,7 @@ macro_rules! ban_to_batch_prost {
 }
 for_logical_plan_nodes! { ban_to_batch_prost }
 for_stream_plan_nodes! { ban_to_batch_prost }
-/// impl a panic `ToStreamProst` for logical and batch node.
+/// impl a panic `ToStreamPb` for logical and batch node.
 macro_rules! ban_to_stream_prost {
     ($( { $convention:ident, $name:ident }),*) => {
         paste!{
diff --git a/src/frontend/src/optimizer/plan_node/utils.rs b/src/frontend/src/optimizer/plan_node/utils.rs
index 240e0e3d39564..c4bfef8f8513c 100644
--- a/src/frontend/src/optimizer/plan_node/utils.rs
+++ b/src/frontend/src/optimizer/plan_node/utils.rs
@@ -17,7 +17,7 @@ use std::{fmt, vec};
 
 use fixedbitset::FixedBitSet;
 use itertools::Itertools;
-use risingwave_common::catalog::{ColumnCatalog, ColumnDesc, Field, Schema};
+use risingwave_common::catalog::{ColumnCatalog, ColumnDesc, ConflictBehavior, Field, Schema};
 use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
 
 use crate::catalog::table_catalog::TableType;
@@ -146,7 +146,7 @@ impl TableCatalogBuilder {
                 .value_indices
                 .unwrap_or_else(|| (0..self.columns.len()).collect_vec()),
             definition: "".into(),
-            conflict_behavior_type: 0,
+            conflict_behavior: ConflictBehavior::NoCheck,
             read_prefix_len_hint,
             version: None, // the internal table is not versioned and can't be schema changed
             watermark_columns,
diff --git a/src/frontend/src/optimizer/plan_visitor/max_one_row_visitor.rs b/src/frontend/src/optimizer/plan_visitor/max_one_row_visitor.rs
index 54bdfeefbdd27..96e999b8fc2a8 100644
--- a/src/frontend/src/optimizer/plan_visitor/max_one_row_visitor.rs
+++ b/src/frontend/src/optimizer/plan_visitor/max_one_row_visitor.rs
@@ -14,6 +14,7 @@
 
 use std::collections::HashSet;
 
+use crate::catalog::system_catalog::pg_catalog::PG_NAMESPACE_TABLE_NAME;
 use crate::optimizer::plan_node::{
     LogicalAgg, LogicalApply, LogicalExpand, LogicalFilter, LogicalHopWindow, LogicalLimit,
     LogicalNow, LogicalProject, LogicalProjectSet, LogicalScan, LogicalTopN, LogicalUnion,
@@ -65,8 +66,22 @@ impl PlanVisitor<bool> for MaxOneRowVisitor {
                 eq_set.insert(input_ref.index);
             }
         }
-        eq_set.is_superset(&plan.input().logical_pk().iter().copied().collect())
-            || self.visit(plan.input())
+        let input = plan.input();
+        eq_set.is_superset(&input.logical_pk().iter().copied().collect())
+            || {
+                // We don't have UNIQUE key now. So we hack here to support some complex queries on
+                // system tables.
+                if let Some(scan) = input.as_logical_scan() && scan.is_sys_table() && scan.table_name() == PG_NAMESPACE_TABLE_NAME {
+                    let nspname = scan.output_col_idx().iter().find(|i| scan.table_desc().columns[**i].name == "nspname").unwrap();
+                    let unique_key = [
+                        *nspname
+                    ];
+                    eq_set.is_superset(&unique_key.into_iter().collect())
+                } else {
+                    false
+                }
+            }
+            || self.visit(input)
     }
 
     fn visit_logical_union(&mut self, _plan: &LogicalUnion) -> bool {
diff --git a/src/frontend/src/optimizer/plan_visitor/mod.rs b/src/frontend/src/optimizer/plan_visitor/mod.rs
index ff715322a4860..5e59035e4fb30 100644
--- a/src/frontend/src/optimizer/plan_visitor/mod.rs
+++ b/src/frontend/src/optimizer/plan_visitor/mod.rs
@@ -29,6 +29,8 @@ mod execution_mode_decider;
 pub use execution_mode_decider::*;
 mod temporal_join_validator;
 pub use temporal_join_validator::*;
+mod sys_table_visitor;
+pub use sys_table_visitor::*;
 
 use crate::for_all_plan_nodes;
 use crate::optimizer::plan_node::*;
diff --git a/src/frontend/src/optimizer/plan_visitor/plan_correlated_id_finder.rs b/src/frontend/src/optimizer/plan_visitor/plan_correlated_id_finder.rs
index 3929da18900dc..5ed18cccedd79 100644
--- a/src/frontend/src/optimizer/plan_visitor/plan_correlated_id_finder.rs
+++ b/src/frontend/src/optimizer/plan_visitor/plan_correlated_id_finder.rs
@@ -15,7 +15,9 @@
 use std::collections::HashSet;
 
 use crate::expr::{CorrelatedId, CorrelatedInputRef, ExprVisitor};
-use crate::optimizer::plan_node::{LogicalFilter, LogicalJoin, LogicalProject, PlanTreeNode};
+use crate::optimizer::plan_node::{
+    LogicalAgg, LogicalFilter, LogicalJoin, LogicalProject, PlanTreeNode,
+};
 use crate::optimizer::plan_visitor::PlanVisitor;
 use crate::PlanRef;
 
@@ -37,8 +39,8 @@ impl PlanCorrelatedIdFinder {
 }
 
 impl PlanVisitor<()> for PlanCorrelatedIdFinder {
-    /// `correlated_input_ref` can only appear in `LogicalProject`, `LogicalFilter` and
-    /// `LogicalJoin` now.
+    /// `correlated_input_ref` can only appear in `LogicalProject`, `LogicalFilter`,
+    /// `LogicalJoin` or the `filter` clause of `PlanAggCall` of `LogicalAgg` now.
 
     fn merge(_: (), _: ()) {}
 
@@ -71,6 +73,18 @@ impl PlanVisitor<()> for PlanCorrelatedIdFinder {
             .into_iter()
             .for_each(|input| self.visit(input));
     }
+
+    fn visit_logical_agg(&mut self, plan: &LogicalAgg) {
+        let mut finder = ExprCorrelatedIdFinder::default();
+        plan.agg_calls()
+            .iter()
+            .for_each(|agg_call| agg_call.filter.visit_expr(&mut finder));
+        self.correlated_id_set.extend(finder.correlated_id_set);
+
+        plan.inputs()
+            .into_iter()
+            .for_each(|input| self.visit(input));
+    }
 }
 
 #[derive(Default)]
diff --git a/src/frontend/src/optimizer/plan_visitor/sys_table_visitor.rs b/src/frontend/src/optimizer/plan_visitor/sys_table_visitor.rs
new file mode 100644
index 0000000000000..f4f4331b32513
--- /dev/null
+++ b/src/frontend/src/optimizer/plan_visitor/sys_table_visitor.rs
@@ -0,0 +1,45 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 crate::optimizer::plan_node::{BatchSeqScan, LogicalScan, StreamTableScan};
+use crate::optimizer::plan_visitor::PlanVisitor;
+use crate::PlanRef;
+
+#[derive(Debug, Clone, Default)]
+pub struct SysTableVisitor {}
+
+impl SysTableVisitor {
+    pub fn has_sys_table(plan: PlanRef) -> bool {
+        let mut visitor = SysTableVisitor {};
+        visitor.visit(plan)
+    }
+}
+
+impl PlanVisitor<bool> for SysTableVisitor {
+    fn merge(a: bool, b: bool) -> bool {
+        a | b
+    }
+
+    fn visit_batch_seq_scan(&mut self, batch_seq_scan: &BatchSeqScan) -> bool {
+        batch_seq_scan.logical().is_sys_table()
+    }
+
+    fn visit_logical_scan(&mut self, logical_scan: &LogicalScan) -> bool {
+        logical_scan.is_sys_table()
+    }
+
+    fn visit_stream_table_scan(&mut self, stream_table_scan: &StreamTableScan) -> bool {
+        stream_table_scan.logical().is_sys_table()
+    }
+}
diff --git a/src/frontend/src/optimizer/property/distribution.rs b/src/frontend/src/optimizer/property/distribution.rs
index 1281a70bd1119..a870167fd569f 100644
--- a/src/frontend/src/optimizer/property/distribution.rs
+++ b/src/frontend/src/optimizer/property/distribution.rs
@@ -52,7 +52,7 @@ use risingwave_common::catalog::{FieldDisplay, Schema, TableId};
 use risingwave_common::error::Result;
 use risingwave_common::hash::{ParallelUnitId, ParallelUnitMapping};
 use risingwave_pb::batch_plan::exchange_info::{
-    ConsistentHashInfo, Distribution as DistributionProst, DistributionMode, HashInfo,
+    ConsistentHashInfo, Distribution as DistributionPb, DistributionMode, HashInfo,
 };
 use risingwave_pb::batch_plan::ExchangeInfo;
 
@@ -131,7 +131,7 @@ impl Distribution {
                         !key.is_empty(),
                         "hash key should not be empty, use `Single` instead"
                     );
-                    Some(DistributionProst::HashInfo(HashInfo {
+                    Some(DistributionPb::HashInfo(HashInfo {
                         output_count,
                         key: key.iter().map(|num| *num as u32).collect(),
                     }))
@@ -155,7 +155,7 @@ impl Distribution {
                         .map(|(i, pu)| (pu, i as u32))
                         .collect();
 
-                    Some(DistributionProst::ConsistentHashInfo(ConsistentHashInfo {
+                    Some(DistributionPb::ConsistentHashInfo(ConsistentHashInfo {
                         vmap: vnode_mapping.iter().map(|x| pu2id_map[&x]).collect_vec(),
                         key: key.iter().map(|num| *num as u32).collect(),
                     }))
diff --git a/src/frontend/src/optimizer/rule/always_false_filter_rule.rs b/src/frontend/src/optimizer/rule/always_false_filter_rule.rs
new file mode 100644
index 0000000000000..69316a273ec23
--- /dev/null
+++ b/src/frontend/src/optimizer/rule/always_false_filter_rule.rs
@@ -0,0 +1,58 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 risingwave_common::types::ScalarImpl;
+
+use super::Rule;
+use crate::optimizer::plan_node::{LogicalFilter, LogicalValues};
+use crate::PlanRef;
+
+pub struct AlwaysFalseFilterRule;
+
+impl Rule for AlwaysFalseFilterRule {
+    fn apply(&self, plan: PlanRef) -> Option<PlanRef> {
+        let filter: &LogicalFilter = plan.as_logical_filter()?;
+        let always_false = filter
+            .predicate()
+            .conjunctions
+            .iter()
+            .filter_map(|e| {
+                if e.is_const() {
+                    if let Ok(v) = e.eval_row_const() {
+                        Some(v)
+                    } else {
+                        None
+                    }
+                } else {
+                    None
+                }
+            })
+            .any(|s| s.unwrap_or(ScalarImpl::Bool(true)) == ScalarImpl::Bool(false));
+        if always_false {
+            Some(LogicalValues::create(
+                vec![],
+                filter.schema().clone(),
+                filter.ctx(),
+            ))
+        } else {
+            None
+        }
+    }
+}
+
+impl AlwaysFalseFilterRule {
+    pub fn create() -> Box<dyn Rule> {
+        Box::new(AlwaysFalseFilterRule)
+    }
+}
diff --git a/src/frontend/src/optimizer/rule/apply_agg_transpose_rule.rs b/src/frontend/src/optimizer/rule/apply_agg_transpose_rule.rs
index f966ef824d715..04839b4b25b88 100644
--- a/src/frontend/src/optimizer/rule/apply_agg_transpose_rule.rs
+++ b/src/frontend/src/optimizer/rule/apply_agg_transpose_rule.rs
@@ -16,11 +16,11 @@ use risingwave_common::types::DataType;
 use risingwave_expr::expr::AggKind;
 use risingwave_pb::plan_common::JoinType;
 
-use super::{BoxedRule, Rule};
+use super::{ApplyOffsetRewriter, BoxedRule, Rule};
 use crate::expr::{ExprImpl, ExprType, FunctionCall, InputRef};
 use crate::optimizer::plan_node::{LogicalAgg, LogicalApply, LogicalFilter, LogicalProject};
 use crate::optimizer::PlanRef;
-use crate::utils::{ColIndexMapping, Condition};
+use crate::utils::Condition;
 
 /// Transpose `LogicalApply` and `LogicalAgg`.
 ///
@@ -53,7 +53,6 @@ impl Rule for ApplyAggTransposeRule {
         let agg: &LogicalAgg = right.as_logical_agg()?;
         let (mut agg_calls, agg_group_key, agg_input) = agg.clone().decompose();
         let is_scalar_agg = agg_group_key.is_empty();
-        let agg_input_len = agg_input.schema().len();
         let apply_left_len = left.schema().len();
 
         if !is_scalar_agg && max_one_row {
@@ -102,7 +101,7 @@ impl Rule for ApplyAggTransposeRule {
                 JoinType::LeftOuter,
                 Condition::true_cond(),
                 correlated_id,
-                correlated_indices,
+                correlated_indices.clone(),
                 false,
             )
             .translate_apply(left, eq_predicates)
@@ -113,7 +112,7 @@ impl Rule for ApplyAggTransposeRule {
                 JoinType::Inner,
                 Condition::true_cond(),
                 correlated_id,
-                correlated_indices,
+                correlated_indices.clone(),
                 false,
             )
             .into()
@@ -122,7 +121,8 @@ impl Rule for ApplyAggTransposeRule {
         let group_agg = {
             // shift index of agg_calls' `InputRef` with `apply_left_len`.
             let offset = apply_left_len as isize;
-            let mut shift_index = ColIndexMapping::with_shift_offset(agg_input_len, offset);
+            let mut rewriter =
+                ApplyOffsetRewriter::new(apply_left_len, &correlated_indices, correlated_id);
             agg_calls.iter_mut().for_each(|agg_call| {
                 agg_call.inputs.iter_mut().for_each(|input_ref| {
                     input_ref.shift_with_offset(offset);
@@ -131,7 +131,7 @@ impl Rule for ApplyAggTransposeRule {
                     .order_by
                     .iter_mut()
                     .for_each(|o| o.shift_with_offset(offset));
-                agg_call.filter = agg_call.filter.clone().rewrite_expr(&mut shift_index);
+                agg_call.filter = agg_call.filter.clone().rewrite_expr(&mut rewriter);
             });
             if is_scalar_agg {
                 // convert count(*) to count(1).
diff --git a/src/frontend/src/optimizer/rule/apply_filter_transpose_rule.rs b/src/frontend/src/optimizer/rule/apply_filter_transpose_rule.rs
index 006d8a19346c7..6293775ef9c33 100644
--- a/src/frontend/src/optimizer/rule/apply_filter_transpose_rule.rs
+++ b/src/frontend/src/optimizer/rule/apply_filter_transpose_rule.rs
@@ -15,11 +15,11 @@
 use itertools::{Either, Itertools};
 use risingwave_pb::plan_common::JoinType;
 
-use super::{BoxedRule, Rule};
-use crate::expr::{CorrelatedId, CorrelatedInputRef, Expr, ExprImpl, ExprRewriter, InputRef};
+use super::{ApplyOffsetRewriter, BoxedRule, Rule};
+use crate::expr::ExprRewriter;
 use crate::optimizer::plan_node::{LogicalApply, LogicalFilter, PlanTreeNodeUnary};
 use crate::optimizer::PlanRef;
-use crate::utils::{ColIndexMapping, Condition};
+use crate::utils::Condition;
 
 /// Transpose `LogicalApply` and `LogicalFilter`.
 ///
@@ -57,19 +57,8 @@ impl Rule for ApplyFilterTransposeRule {
         let filter = right.as_logical_filter()?;
         let input = filter.input();
 
-        let mut rewriter = Rewriter {
-            offset: left.schema().len(),
-            index_mapping: ColIndexMapping::new(
-                correlated_indices
-                    .clone()
-                    .into_iter()
-                    .map(Some)
-                    .collect_vec(),
-            )
-            .inverse(),
-            has_correlated_input_ref: false,
-            correlated_id,
-        };
+        let mut rewriter =
+            ApplyOffsetRewriter::new(left.schema().len(), &correlated_indices, correlated_id);
         // Split predicates in LogicalFilter into correlated expressions and uncorrelated
         // expressions.
         let (cor_exprs, uncor_exprs) =
@@ -79,8 +68,8 @@ impl Rule for ApplyFilterTransposeRule {
                 .into_iter()
                 .partition_map(|expr| {
                     let expr = rewriter.rewrite_expr(expr);
-                    if rewriter.has_correlated_input_ref {
-                        rewriter.has_correlated_input_ref = false;
+                    if rewriter.has_correlated_input_ref() {
+                        rewriter.reset_state();
                         Either::Left(expr)
                     } else {
                         Either::Right(expr)
@@ -115,33 +104,3 @@ impl ApplyFilterTransposeRule {
         Box::new(ApplyFilterTransposeRule {})
     }
 }
-
-/// Convert `CorrelatedInputRef` to `InputRef` and shift `InputRef` with offset.
-struct Rewriter {
-    offset: usize,
-    index_mapping: ColIndexMapping,
-    has_correlated_input_ref: bool,
-    correlated_id: CorrelatedId,
-}
-impl ExprRewriter for Rewriter {
-    fn rewrite_correlated_input_ref(
-        &mut self,
-        correlated_input_ref: CorrelatedInputRef,
-    ) -> ExprImpl {
-        let found = correlated_input_ref.correlated_id() == self.correlated_id;
-        self.has_correlated_input_ref |= found;
-        if found {
-            InputRef::new(
-                self.index_mapping.map(correlated_input_ref.index()),
-                correlated_input_ref.return_type(),
-            )
-            .into()
-        } else {
-            correlated_input_ref.into()
-        }
-    }
-
-    fn rewrite_input_ref(&mut self, input_ref: InputRef) -> ExprImpl {
-        InputRef::new(input_ref.index() + self.offset, input_ref.return_type()).into()
-    }
-}
diff --git a/src/frontend/src/optimizer/rule/apply_offset_rewriter.rs b/src/frontend/src/optimizer/rule/apply_offset_rewriter.rs
new file mode 100644
index 0000000000000..c2e1f240a5046
--- /dev/null
+++ b/src/frontend/src/optimizer/rule/apply_offset_rewriter.rs
@@ -0,0 +1,71 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 itertools::Itertools;
+
+use crate::expr::{CorrelatedId, CorrelatedInputRef, Expr, ExprImpl, ExprRewriter, InputRef};
+use crate::utils::ColIndexMapping;
+
+/// Convert `CorrelatedInputRef` to `InputRef` and shift `InputRef` with offset.
+pub struct ApplyOffsetRewriter {
+    offset: usize,
+    index_mapping: ColIndexMapping,
+    has_correlated_input_ref: bool,
+    correlated_id: CorrelatedId,
+}
+
+impl ExprRewriter for ApplyOffsetRewriter {
+    fn rewrite_correlated_input_ref(
+        &mut self,
+        correlated_input_ref: CorrelatedInputRef,
+    ) -> ExprImpl {
+        let found = correlated_input_ref.correlated_id() == self.correlated_id;
+        self.has_correlated_input_ref |= found;
+        if found {
+            InputRef::new(
+                self.index_mapping.map(correlated_input_ref.index()),
+                correlated_input_ref.return_type(),
+            )
+            .into()
+        } else {
+            correlated_input_ref.into()
+        }
+    }
+
+    fn rewrite_input_ref(&mut self, input_ref: InputRef) -> ExprImpl {
+        InputRef::new(input_ref.index() + self.offset, input_ref.return_type()).into()
+    }
+}
+
+impl ApplyOffsetRewriter {
+    pub fn new(offset: usize, correlated_indices: &[usize], correlated_id: CorrelatedId) -> Self {
+        Self {
+            offset,
+            index_mapping: ColIndexMapping::new(
+                correlated_indices.iter().copied().map(Some).collect_vec(),
+            )
+            .inverse(),
+            has_correlated_input_ref: false,
+            correlated_id,
+        }
+    }
+
+    pub fn has_correlated_input_ref(&self) -> bool {
+        self.has_correlated_input_ref
+    }
+
+    pub fn reset_state(&mut self) {
+        self.has_correlated_input_ref = false;
+    }
+}
diff --git a/src/frontend/src/optimizer/rule/apply_project_transpose_rule.rs b/src/frontend/src/optimizer/rule/apply_project_transpose_rule.rs
index a5a158f3f2e01..46f06cc5ac703 100644
--- a/src/frontend/src/optimizer/rule/apply_project_transpose_rule.rs
+++ b/src/frontend/src/optimizer/rule/apply_project_transpose_rule.rs
@@ -15,11 +15,10 @@
 use itertools::Itertools;
 use risingwave_pb::plan_common::JoinType;
 
-use super::{BoxedRule, Rule};
-use crate::expr::{CorrelatedId, CorrelatedInputRef, Expr, ExprImpl, ExprRewriter, InputRef};
+use super::{ApplyOffsetRewriter, BoxedRule, Rule};
+use crate::expr::{ExprImpl, ExprRewriter, InputRef};
 use crate::optimizer::plan_node::{LogicalApply, LogicalProject};
 use crate::optimizer::PlanRef;
-use crate::utils::ColIndexMapping;
 
 /// Transpose `LogicalApply` and `LogicalProject`.
 ///
@@ -64,18 +63,8 @@ impl Rule for ApplyProjectTransposeRule {
         let (proj_exprs, proj_input) = project.clone().decompose();
 
         // replace correlated_input_ref in project exprs
-        let mut rewriter = Rewriter {
-            offset: left.schema().len(),
-            index_mapping: ColIndexMapping::new(
-                correlated_indices
-                    .clone()
-                    .into_iter()
-                    .map(Some)
-                    .collect_vec(),
-            )
-            .inverse(),
-            correlated_id,
-        };
+        let mut rewriter =
+            ApplyOffsetRewriter::new(left.schema().len(), &correlated_indices, correlated_id);
 
         let new_proj_exprs: Vec<ExprImpl> = proj_exprs
             .into_iter()
@@ -124,30 +113,3 @@ impl ExprRewriter for ApplyOnConditionRewriter {
         }
     }
 }
-
-/// Convert `CorrelatedInputRef` to `InputRef` and shift `InputRef` with offset.
-struct Rewriter {
-    offset: usize,
-    index_mapping: ColIndexMapping,
-    correlated_id: CorrelatedId,
-}
-impl ExprRewriter for Rewriter {
-    fn rewrite_correlated_input_ref(
-        &mut self,
-        correlated_input_ref: CorrelatedInputRef,
-    ) -> ExprImpl {
-        if correlated_input_ref.correlated_id() == self.correlated_id {
-            InputRef::new(
-                self.index_mapping.map(correlated_input_ref.index()),
-                correlated_input_ref.return_type(),
-            )
-            .into()
-        } else {
-            correlated_input_ref.into()
-        }
-    }
-
-    fn rewrite_input_ref(&mut self, input_ref: InputRef) -> ExprImpl {
-        InputRef::new(input_ref.index() + self.offset, input_ref.return_type()).into()
-    }
-}
diff --git a/src/frontend/src/optimizer/rule/index_selection_rule.rs b/src/frontend/src/optimizer/rule/index_selection_rule.rs
index a140c5f3c921a..86abc9c24766d 100644
--- a/src/frontend/src/optimizer/rule/index_selection_rule.rs
+++ b/src/frontend/src/optimizer/rule/index_selection_rule.rs
@@ -54,9 +54,7 @@ use std::rc::Rc;
 use itertools::Itertools;
 use risingwave_common::array::serial_array::Serial;
 use risingwave_common::catalog::Schema;
-use risingwave_common::types::{
-    DataType, Decimal, IntervalUnit, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper,
-};
+use risingwave_common::types::{DataType, Date, Decimal, Interval, Time, Timestamp};
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_pb::plan_common::JoinType;
 
@@ -709,11 +707,11 @@ impl<'a> TableScanIoEstimator<'a> {
             DataType::Float32 => size_of::<f32>(),
             DataType::Float64 => size_of::<f64>(),
             DataType::Decimal => size_of::<Decimal>(),
-            DataType::Date => size_of::<NaiveDateWrapper>(),
-            DataType::Time => size_of::<NaiveTimeWrapper>(),
-            DataType::Timestamp => size_of::<NaiveDateTimeWrapper>(),
+            DataType::Date => size_of::<Date>(),
+            DataType::Time => size_of::<Time>(),
+            DataType::Timestamp => size_of::<Timestamp>(),
             DataType::Timestamptz => size_of::<i64>(),
-            DataType::Interval => size_of::<IntervalUnit>(),
+            DataType::Interval => size_of::<Interval>(),
             DataType::Varchar => 20,
             DataType::Bytea => 20,
             DataType::Jsonb => 20,
diff --git a/src/frontend/src/optimizer/rule/reorder_multijoin_rule.rs b/src/frontend/src/optimizer/rule/left_deep_tree_join_ordering_rule.rs
similarity index 95%
rename from src/frontend/src/optimizer/rule/reorder_multijoin_rule.rs
rename to src/frontend/src/optimizer/rule/left_deep_tree_join_ordering_rule.rs
index cdda30f46a7e8..a4e5d3db1d5c4 100644
--- a/src/frontend/src/optimizer/rule/reorder_multijoin_rule.rs
+++ b/src/frontend/src/optimizer/rule/left_deep_tree_join_ordering_rule.rs
@@ -17,9 +17,9 @@ use super::Rule;
 use crate::optimizer::rule::BoxedRule;
 
 /// Reorders a multi join into a left deep join via the heuristic ordering
-pub struct ReorderMultiJoinRule {}
+pub struct LeftDeepTreeJoinOrderingRule {}
 
-impl Rule for ReorderMultiJoinRule {
+impl Rule for LeftDeepTreeJoinOrderingRule {
     fn apply(&self, plan: PlanRef) -> Option<PlanRef> {
         let join = plan.as_logical_multi_join()?;
         // check if join is inner and can be merged into multijoin
@@ -29,9 +29,9 @@ impl Rule for ReorderMultiJoinRule {
     }
 }
 
-impl ReorderMultiJoinRule {
+impl LeftDeepTreeJoinOrderingRule {
     pub fn create() -> BoxedRule {
-        Box::new(ReorderMultiJoinRule {})
+        Box::new(LeftDeepTreeJoinOrderingRule {})
     }
 }
 
diff --git a/src/frontend/src/optimizer/rule/mod.rs b/src/frontend/src/optimizer/rule/mod.rs
index 78c0fc15f93bc..39014a35c9e93 100644
--- a/src/frontend/src/optimizer/rule/mod.rs
+++ b/src/frontend/src/optimizer/rule/mod.rs
@@ -39,8 +39,8 @@ mod pull_up_correlated_predicate_rule;
 pub use pull_up_correlated_predicate_rule::*;
 mod index_delta_join_rule;
 pub use index_delta_join_rule::*;
-mod reorder_multijoin_rule;
-pub use reorder_multijoin_rule::*;
+mod left_deep_tree_join_ordering_rule;
+pub use left_deep_tree_join_ordering_rule::*;
 mod apply_agg_transpose_rule;
 pub use apply_agg_transpose_rule::*;
 mod apply_filter_transpose_rule;
@@ -84,7 +84,9 @@ pub use apply_share_eliminate_rule::*;
 mod top_n_on_index_rule;
 pub use top_n_on_index_rule::*;
 mod stream;
+pub use stream::bushy_tree_join_ordering_rule::*;
 pub use stream::filter_with_now_to_join_rule::*;
+pub use stream::stream_project_merge_rule::*;
 mod trivial_project_to_values_rule;
 pub use trivial_project_to_values_rule::*;
 mod union_input_values_merge_rule;
@@ -95,6 +97,11 @@ mod avoid_exchange_share_rule;
 pub use avoid_exchange_share_rule::*;
 mod min_max_on_index_rule;
 pub use min_max_on_index_rule::*;
+mod always_false_filter_rule;
+pub use always_false_filter_rule::*;
+
+mod apply_offset_rewriter;
+use apply_offset_rewriter::ApplyOffsetRewriter;
 
 #[macro_export]
 macro_rules! for_all_rules {
@@ -115,7 +122,7 @@ macro_rules! for_all_rules {
             , { ProjectJoinMergeRule }
             , { ProjectMergeRule }
             , { PullUpCorrelatedPredicateRule }
-            , { ReorderMultiJoinRule }
+            , { LeftDeepTreeJoinOrderingRule }
             , { TranslateApplyRule }
             , { PushCalculationOfJoinRule }
             , { IndexSelectionRule }
@@ -133,6 +140,9 @@ macro_rules! for_all_rules {
             , { RewriteLikeExprRule }
             , { AvoidExchangeShareRule }
             , { MinMaxOnIndexRule }
+            , { AlwaysFalseFilterRule }
+            , { BushyTreeJoinOrderingRule }
+            , { StreamProjectMergeRule }
         }
     };
 }
diff --git a/src/frontend/src/optimizer/rule/push_calculation_of_join_rule.rs b/src/frontend/src/optimizer/rule/push_calculation_of_join_rule.rs
index 7042d26a953d9..d858b56336ecd 100644
--- a/src/frontend/src/optimizer/rule/push_calculation_of_join_rule.rs
+++ b/src/frontend/src/optimizer/rule/push_calculation_of_join_rule.rs
@@ -165,7 +165,7 @@ impl PushCalculationOfJoinRule {
             if expr.count_nows() > 0 {
                 continue;
             }
-            let (ty, left, right) = func.clone().decompose_as_binary();
+            let (mut ty, left, right) = func.clone().decompose_as_binary();
             // we just cast the return types of inputs of binary predicates for `HashJoin` and
             // `DynamicFilter`.
             let left_input_bits = left.collect_input_refs(left_col_num + right_col_num);
@@ -177,6 +177,7 @@ impl PushCalculationOfJoinRule {
             } else if left_input_bits.is_subset(&right_bit_map)
                 && right_input_bits.is_subset(&left_bit_map)
             {
+                ty = ExprImpl::reverse_comparison(ty);
                 (right, left)
             } else {
                 continue;
diff --git a/src/frontend/src/optimizer/rule/stream/bushy_tree_join_ordering_rule.rs b/src/frontend/src/optimizer/rule/stream/bushy_tree_join_ordering_rule.rs
new file mode 100644
index 0000000000000..cdb9516d44cf7
--- /dev/null
+++ b/src/frontend/src/optimizer/rule/stream/bushy_tree_join_ordering_rule.rs
@@ -0,0 +1,39 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 super::super::super::plan_node::*;
+use super::super::Rule;
+use crate::optimizer::rule::BoxedRule;
+
+/// Reorders a multi join into a left deep join via the heuristic ordering
+pub struct BushyTreeJoinOrderingRule {}
+
+impl Rule for BushyTreeJoinOrderingRule {
+    fn apply(&self, plan: PlanRef) -> Option<PlanRef> {
+        let join = plan.as_logical_multi_join()?;
+        match join.as_bushy_tree_join() {
+            Ok(plan) => Some(plan),
+            Err(e) => {
+                eprintln!("{}", e);
+                None
+            }
+        }
+    }
+}
+
+impl BushyTreeJoinOrderingRule {
+    pub fn create() -> BoxedRule {
+        Box::new(BushyTreeJoinOrderingRule {})
+    }
+}
diff --git a/src/frontend/src/optimizer/rule/stream/mod.rs b/src/frontend/src/optimizer/rule/stream/mod.rs
index 39cf0c8d1185f..9054131250df9 100644
--- a/src/frontend/src/optimizer/rule/stream/mod.rs
+++ b/src/frontend/src/optimizer/rule/stream/mod.rs
@@ -12,4 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub(crate) mod bushy_tree_join_ordering_rule;
 pub(crate) mod filter_with_now_to_join_rule;
+pub(crate) mod stream_project_merge_rule;
diff --git a/src/frontend/src/optimizer/rule/stream/stream_project_merge_rule.rs b/src/frontend/src/optimizer/rule/stream/stream_project_merge_rule.rs
new file mode 100644
index 0000000000000..ff55dbcf58a67
--- /dev/null
+++ b/src/frontend/src/optimizer/rule/stream/stream_project_merge_rule.rs
@@ -0,0 +1,46 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 crate::expr::ExprRewriter;
+use crate::optimizer::plan_node::{LogicalProject, PlanTreeNodeUnary, StreamProject};
+use crate::optimizer::{BoxedRule, PlanRef, Rule};
+use crate::utils::Substitute;
+
+/// Merge contiguous [`StreamProject`] nodes.
+pub struct StreamProjectMergeRule {}
+impl Rule for StreamProjectMergeRule {
+    fn apply(&self, plan: PlanRef) -> Option<PlanRef> {
+        let outer_project = plan.as_stream_project()?;
+        let input = outer_project.input();
+        let inner_project = input.as_stream_project()?;
+
+        let mut subst = Substitute {
+            mapping: inner_project.exprs().clone(),
+        };
+        let exprs = outer_project
+            .exprs()
+            .iter()
+            .cloned()
+            .map(|expr| subst.rewrite_expr(expr))
+            .collect();
+        let logical_project = LogicalProject::new(inner_project.input(), exprs);
+        Some(StreamProject::new(logical_project).into())
+    }
+}
+
+impl StreamProjectMergeRule {
+    pub fn create() -> BoxedRule {
+        Box::new(StreamProjectMergeRule {})
+    }
+}
diff --git a/src/frontend/src/planner/relation.rs b/src/frontend/src/planner/relation.rs
index 2a6b56a80159d..df442536b4a8c 100644
--- a/src/frontend/src/planner/relation.rs
+++ b/src/frontend/src/planner/relation.rs
@@ -16,7 +16,7 @@ use std::rc::Rc;
 
 use itertools::Itertools;
 use risingwave_common::error::{ErrorCode, Result};
-use risingwave_common::types::{DataType, IntervalUnit, ScalarImpl};
+use risingwave_common::types::{DataType, Interval, ScalarImpl};
 
 use crate::binder::{
     BoundBaseTable, BoundJoin, BoundShare, BoundSource, BoundSystemTable, BoundWatermark,
@@ -86,7 +86,7 @@ impl Planner {
         let pk_col_ids = source.catalog.pk_col_ids.clone();
         let row_id_index = source.catalog.row_id_index;
         let gen_row_id = source.catalog.append_only;
-        Ok(LogicalSource::new(
+        LogicalSource::create(
             Some(Rc::new(source.catalog)),
             column_descs,
             pk_col_ids,
@@ -95,7 +95,6 @@ impl Planner {
             false,
             self.ctx(),
         )
-        .into())
     }
 
     pub(super) fn plan_join(&mut self, join: BoundJoin) -> Result<PlanRef> {
@@ -276,7 +275,7 @@ impl Planner {
                 Some(ScalarImpl::Interval(window_offset)) => window_offset,
                 _ => return Err(ErrorCode::BindError(ERROR_WINDOW_SIZE_ARG.to_string()).into()),
             },
-            (None, None) => IntervalUnit::from_month_day_usec(0, 0, 0),
+            (None, None) => Interval::from_month_day_usec(0, 0, 0),
             _ => return Err(ErrorCode::BindError(ERROR_WINDOW_SIZE_ARG.to_string()).into()),
         };
 
diff --git a/src/frontend/src/planner/select.rs b/src/frontend/src/planner/select.rs
index 235cdf0a19c87..8cfd0dde1b39c 100644
--- a/src/frontend/src/planner/select.rs
+++ b/src/frontend/src/planner/select.rs
@@ -77,7 +77,7 @@ impl Planner {
                     }
                     None => {
                         return Err(ErrorCode::InvalidInputSyntax(
-                            "the SELECT DISTINCT ON expressions must match the leftmost SELECT DISTINCT ON expressions"
+                            "the SELECT DISTINCT ON expressions must match the leftmost ORDER BY expressions"
                                 .into(),
                         )
                         .into());
diff --git a/src/frontend/src/scheduler/distributed/query.rs b/src/frontend/src/scheduler/distributed/query.rs
index e4aa85c08a7eb..7ca2572506a50 100644
--- a/src/frontend/src/scheduler/distributed/query.rs
+++ b/src/frontend/src/scheduler/distributed/query.rs
@@ -24,7 +24,7 @@ use petgraph::dot::{Config, Dot};
 use petgraph::Graph;
 use pgwire::pg_server::SessionId;
 use risingwave_common::array::DataChunk;
-use risingwave_pb::batch_plan::{TaskId as TaskIdProst, TaskOutputId as TaskOutputIdProst};
+use risingwave_pb::batch_plan::{TaskId as TaskIdPb, TaskOutputId as TaskOutputIdPb};
 use risingwave_pb::common::HostAddress;
 use risingwave_rpc_client::ComputeClientPoolRef;
 use tokio::sync::mpsc::{channel, Receiver, Sender};
@@ -359,13 +359,13 @@ impl QueryRunner {
     /// of shutdown sender so that shutdown receiver won't be triggered.
     fn send_root_stage_info(&mut self, chunk_rx: Receiver<SchedulerResult<DataChunk>>) {
         let root_task_output_id = {
-            let root_task_id_prost = TaskIdProst {
+            let root_task_id_prost = TaskIdPb {
                 query_id: self.query.query_id.clone().id,
                 stage_id: self.query.root_stage_id(),
                 task_id: ROOT_TASK_ID,
             };
 
-            TaskOutputIdProst {
+            TaskOutputIdPb {
                 task_id: Some(root_task_id_prost),
                 output_id: ROOT_TASK_OUTPUT_ID,
             }
@@ -519,29 +519,11 @@ pub(crate) mod tests {
                 stream_key: vec![],
                 pk: vec![],
                 columns: vec![
-                    ColumnDesc {
-                        data_type: DataType::Int32,
-                        column_id: 0.into(),
-                        name: "a".to_string(),
-                        type_name: String::new(),
-                        field_descs: vec![],
-                    },
-                    ColumnDesc {
-                        data_type: DataType::Float64,
-                        column_id: 1.into(),
-                        name: "b".to_string(),
-                        type_name: String::new(),
-                        field_descs: vec![],
-                    },
-                    ColumnDesc {
-                        data_type: DataType::Int64,
-                        column_id: 2.into(),
-                        name: "_row_id".to_string(),
-                        type_name: String::new(),
-                        field_descs: vec![],
-                    },
+                    ColumnDesc::new_atomic(DataType::Int32, "a", 0),
+                    ColumnDesc::new_atomic(DataType::Float64, "b", 1),
+                    ColumnDesc::new_atomic(DataType::Int64, "c", 2),
                 ],
-                distribution_key: vec![2],
+                distribution_key: vec![],
                 append_only: false,
                 retention_seconds: TABLE_OPTION_DUMMY_RETENTION_SECOND,
                 value_indices: vec![0, 1, 2],
@@ -610,6 +592,7 @@ pub(crate) mod tests {
                     ),
                 ],
                 2,
+                2,
             ),
         )
         .into();
diff --git a/src/frontend/src/scheduler/distributed/stage.rs b/src/frontend/src/scheduler/distributed/stage.rs
index 2fcc892bb1a4f..5f2dcc49ade31 100644
--- a/src/frontend/src/scheduler/distributed/stage.rs
+++ b/src/frontend/src/scheduler/distributed/stage.rs
@@ -38,10 +38,10 @@ use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::plan_node::NodeBody::{Delete, Insert, Update};
 use risingwave_pb::batch_plan::{
     DistributedLookupJoinNode, ExchangeNode, ExchangeSource, MergeSortExchangeNode, PlanFragment,
-    PlanNode as PlanNodeProst, PlanNode, TaskId as TaskIdProst, TaskOutputId,
+    PlanNode as PlanNodePb, PlanNode, TaskId as TaskIdPb, TaskOutputId,
 };
 use risingwave_pb::common::{BatchQueryEpoch, HostAddress, WorkerNode};
-use risingwave_pb::task_service::{AbortTaskRequest, TaskInfoResponse};
+use risingwave_pb::task_service::{CancelTaskRequest, TaskInfoResponse};
 use risingwave_rpc_client::ComputeClientPoolRef;
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender};
@@ -283,7 +283,7 @@ impl StageExecution {
             .iter()
             .map(|(task_id, status_holder)| {
                 let task_output_id = TaskOutputId {
-                    task_id: Some(TaskIdProst {
+                    task_id: Some(TaskIdPb {
                         query_id: self.stage.query_id.id.clone(),
                         stage_id: self.stage.id,
                         task_id: *task_id,
@@ -345,7 +345,7 @@ impl StageRunner {
                 .zip_eq_fast(workers.into_iter())
                 .enumerate()
             {
-                let task_id = TaskIdProst {
+                let task_id = TaskIdPb {
                     query_id: self.stage.query_id.id.clone(),
                     stage_id: self.stage.id,
                     task_id: i as u32,
@@ -356,7 +356,7 @@ impl StageRunner {
             }
         } else if let Some(source_info) = self.stage.source_info.as_ref() {
             for (id, split) in source_info.split_info().unwrap().iter().enumerate() {
-                let task_id = TaskIdProst {
+                let task_id = TaskIdPb {
                     query_id: self.stage.query_id.id.clone(),
                     stage_id: self.stage.id,
                     task_id: id as u32,
@@ -368,7 +368,7 @@ impl StageRunner {
         }
         else {
             for id in 0..self.stage.parallelism.unwrap() {
-                let task_id = TaskIdProst {
+                let task_id = TaskIdPb {
                     query_id: self.stage.query_id.id.clone(),
                     stage_id: self.stage.id,
                     task_id: id,
@@ -397,9 +397,9 @@ impl StageRunner {
         while let Some(status_res_inner) = all_streams.next().await {
             match status_res_inner {
                 Ok(status) => {
-                    use risingwave_pb::task_service::task_info_response::TaskStatus as TaskStatusProst;
-                    match TaskStatusProst::from_i32(status.task_status).unwrap() {
-                        TaskStatusProst::Running => {
+                    use risingwave_pb::task_service::task_info_response::TaskStatus as TaskStatusPb;
+                    match TaskStatusPb::from_i32(status.task_status).unwrap() {
+                        TaskStatusPb::Running => {
                             running_task_cnt += 1;
                             // The task running count should always less or equal than the
                             // registered tasks number.
@@ -415,7 +415,7 @@ impl StageRunner {
                             }
                         }
 
-                        TaskStatusProst::Finished => {
+                        TaskStatusPb::Finished => {
                             finished_task_cnt += 1;
                             assert!(finished_task_cnt <= self.tasks.keys().len());
                             assert!(running_task_cnt >= finished_task_cnt);
@@ -427,7 +427,7 @@ impl StageRunner {
                                 break;
                             }
                         }
-                        TaskStatusProst::Aborted => {
+                        TaskStatusPb::Aborted => {
                             // Currently, the only reason that we receive an abort status is that
                             // the task's memory usage is too high so
                             // it's aborted.
@@ -446,7 +446,7 @@ impl StageRunner {
                             sent_signal_to_next = true;
                             break;
                         }
-                        TaskStatusProst::Failed => {
+                        TaskStatusPb::Failed => {
                             // Task failed, we should fail whole query
                             error!(
                                 "Task {:?} failed, reason: {:?}",
@@ -536,7 +536,7 @@ impl StageRunner {
             self.stage.id,
             self.tasks.len()
         );
-        self.abort_all_scheduled_tasks().await?;
+        self.cancel_all_scheducancled_tasks().await?;
 
         tracing::trace!(
             "Stage runner [{:?}-{:?}] existed. ",
@@ -761,7 +761,7 @@ impl StageRunner {
     /// Abort all registered tasks. Note that here we do not care which part of tasks has already
     /// failed or completed, cuz the abort task will not fail if the task has already die.
     /// See PR (#4560).
-    async fn abort_all_scheduled_tasks(&self) -> SchedulerResult<()> {
+    async fn cancel_all_scheducancled_tasks(&self) -> SchedulerResult<()> {
         // Set state to failed.
         // {
         //     let mut state = self.state.write().await;
@@ -789,7 +789,7 @@ impl StageRunner {
             let task_id = *task;
             spawn(async move {
                 if let Err(e) = client
-                    .abort(AbortTaskRequest {
+                    .cancel(CancelTaskRequest {
                         task_id: Some(risingwave_pb::batch_plan::TaskId {
                             query_id: query_id.clone(),
                             stage_id,
@@ -810,7 +810,7 @@ impl StageRunner {
 
     async fn schedule_task(
         &self,
-        task_id: TaskIdProst,
+        task_id: TaskIdPb,
         plan_fragment: PlanFragment,
         worker: Option<WorkerNode>,
     ) -> SchedulerResult<Fuse<Streaming<TaskInfoResponse>>> {
@@ -864,7 +864,7 @@ impl StageRunner {
         task_id: TaskId,
         partition: Option<PartitionInfo>,
         identity_id: Rc<RefCell<u64>>,
-    ) -> PlanNodeProst {
+    ) -> PlanNodePb {
         // Generate identity
         let identity = {
             let identity_type = execution_plan_node.plan_node_type;
@@ -886,7 +886,7 @@ impl StageRunner {
                 let exchange_sources = child_stage.all_exchange_sources_for(task_id);
 
                 match &execution_plan_node.node {
-                    NodeBody::Exchange(_exchange_node) => PlanNodeProst {
+                    NodeBody::Exchange(_exchange_node) => PlanNodePb {
                         children: vec![],
                         identity,
                         node_body: Some(NodeBody::Exchange(ExchangeNode {
@@ -894,7 +894,7 @@ impl StageRunner {
                             input_schema: execution_plan_node.schema.clone(),
                         })),
                     },
-                    NodeBody::MergeSortExchange(sort_merge_exchange_node) => PlanNodeProst {
+                    NodeBody::MergeSortExchange(sort_merge_exchange_node) => PlanNodePb {
                         children: vec![],
                         identity,
                         node_body: Some(NodeBody::MergeSortExchange(MergeSortExchangeNode {
@@ -919,7 +919,7 @@ impl StageRunner {
                     .expect("PartitionInfo should be TablePartitionInfo");
                 scan_node.vnode_bitmap = Some(partition.vnode_bitmap);
                 scan_node.scan_ranges = partition.scan_ranges;
-                PlanNodeProst {
+                PlanNodePb {
                     children: vec![],
                     identity,
                     node_body: Some(NodeBody::RowSeqScan(scan_node)),
@@ -935,7 +935,7 @@ impl StageRunner {
                     .into_source()
                     .expect("PartitionInfo should be SourcePartitionInfo");
                 source_node.split = partition.encode_to_bytes().into();
-                PlanNodeProst {
+                PlanNodePb {
                     children: vec![],
                     identity,
                     node_body: Some(NodeBody::Source(source_node)),
@@ -950,7 +950,7 @@ impl StageRunner {
                     })
                     .collect();
 
-                PlanNodeProst {
+                PlanNodePb {
                     children,
                     identity,
                     node_body: Some(execution_plan_node.node.clone()),
diff --git a/src/frontend/src/scheduler/local.rs b/src/frontend/src/scheduler/local.rs
index 2e165e2c047c0..148de9c23ce95 100644
--- a/src/frontend/src/scheduler/local.rs
+++ b/src/frontend/src/scheduler/local.rs
@@ -35,8 +35,8 @@ use risingwave_pb::batch_plan::exchange_info::DistributionMode;
 use risingwave_pb::batch_plan::exchange_source::LocalExecutePlan::Plan;
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::{
-    ExchangeInfo, ExchangeSource, LocalExecutePlan, PlanFragment, PlanNode as PlanNodeProst,
-    TaskId as ProstTaskId, TaskOutputId,
+    ExchangeInfo, ExchangeSource, LocalExecutePlan, PbTaskId, PlanFragment, PlanNode as PlanNodePb,
+    TaskOutputId,
 };
 use risingwave_pb::common::WorkerNode;
 use tokio::sync::mpsc;
@@ -203,7 +203,7 @@ impl LocalQueryExecution {
         execution_plan_node: &ExecutionPlanNode,
         second_stages: &mut Option<HashMap<StageId, QueryStageRef>>,
         partition: Option<PartitionInfo>,
-    ) -> SchedulerResult<PlanNodeProst> {
+    ) -> SchedulerResult<PlanNodePb> {
         match execution_plan_node.plan_node_type {
             PlanNodeType::BatchExchange => {
                 let exchange_source_stage_id = execution_plan_node
@@ -258,7 +258,7 @@ impl LocalQueryExecution {
                         };
                         let exchange_source = ExchangeSource {
                             task_output_id: Some(TaskOutputId {
-                                task_id: Some(ProstTaskId {
+                                task_id: Some(PbTaskId {
                                     task_id: idx as u32,
                                     stage_id: exchange_source_stage_id,
                                     query_id: self.query.query_id.id.clone(),
@@ -292,7 +292,7 @@ impl LocalQueryExecution {
                         let worker_node = self.front_env.worker_node_manager().next_random()?;
                         let exchange_source = ExchangeSource {
                             task_output_id: Some(TaskOutputId {
-                                task_id: Some(ProstTaskId {
+                                task_id: Some(PbTaskId {
                                     task_id: id as u32,
                                     stage_id: exchange_source_stage_id,
                                     query_id: self.query.query_id.id.clone(),
@@ -328,7 +328,7 @@ impl LocalQueryExecution {
                         .map(|(idx, worker_node)| {
                             let exchange_source = ExchangeSource {
                                 task_output_id: Some(TaskOutputId {
-                                    task_id: Some(ProstTaskId {
+                                    task_id: Some(PbTaskId {
                                         task_id: idx as u32,
                                         stage_id: exchange_source_stage_id,
                                         query_id: self.query.query_id.id.clone(),
@@ -343,7 +343,7 @@ impl LocalQueryExecution {
                         .collect();
                 }
 
-                Ok(PlanNodeProst {
+                Ok(PlanNodePb {
                     /// Since all the rest plan is embedded into the exchange node,
                     /// there is no children any more.
                     children: vec![],
@@ -367,7 +367,7 @@ impl LocalQueryExecution {
                     _ => unreachable!(),
                 }
 
-                Ok(PlanNodeProst {
+                Ok(PlanNodePb {
                     children: vec![],
                     // TODO: Generate meaningful identify
                     identity: Uuid::new_v4().to_string(),
@@ -388,7 +388,7 @@ impl LocalQueryExecution {
                     _ => unreachable!(),
                 }
 
-                Ok(PlanNodeProst {
+                Ok(PlanNodePb {
                     children: vec![],
                     // TODO: Generate meaningful identify
                     identity: Uuid::new_v4().to_string(),
@@ -429,7 +429,7 @@ impl LocalQueryExecution {
                     partition,
                 )?;
 
-                Ok(PlanNodeProst {
+                Ok(PlanNodePb {
                     children: vec![left_child],
                     identity: Uuid::new_v4().to_string(),
                     node_body: Some(node_body),
@@ -440,9 +440,9 @@ impl LocalQueryExecution {
                     .children
                     .iter()
                     .map(|e| self.convert_plan_node(e, second_stages, partition.clone()))
-                    .collect::<SchedulerResult<Vec<PlanNodeProst>>>()?;
+                    .collect::<SchedulerResult<Vec<PlanNodePb>>>()?;
 
-                Ok(PlanNodeProst {
+                Ok(PlanNodePb {
                     children,
                     // TODO: Generate meaningful identify
                     identity: Uuid::new_v4().to_string(),
diff --git a/src/frontend/src/scheduler/plan_fragmenter.rs b/src/frontend/src/scheduler/plan_fragmenter.rs
index cb3ef5a02610b..f36cad5a35c80 100644
--- a/src/frontend/src/scheduler/plan_fragmenter.rs
+++ b/src/frontend/src/scheduler/plan_fragmenter.rs
@@ -31,7 +31,7 @@ use risingwave_connector::source::{ConnectorProperties, SplitEnumeratorImpl, Spl
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 use risingwave_pb::batch_plan::{ExchangeInfo, ScanRange as ScanRangeProto};
 use risingwave_pb::common::Buffer;
-use risingwave_pb::plan_common::Field as FieldProst;
+use risingwave_pb::plan_common::Field as FieldPb;
 use serde::ser::SerializeStruct;
 use serde::Serialize;
 use uuid::Uuid;
@@ -70,7 +70,7 @@ pub struct ExecutionPlanNode {
     pub plan_node_id: PlanNodeId,
     pub plan_node_type: PlanNodeType,
     pub node: NodeBody,
-    pub schema: Vec<FieldProst>,
+    pub schema: Vec<FieldPb>,
 
     pub children: Vec<Arc<ExecutionPlanNode>>,
 
diff --git a/src/frontend/src/session.rs b/src/frontend/src/session.rs
index 8a8357b46235e..e00d8f9b0b69a 100644
--- a/src/frontend/src/session.rs
+++ b/src/frontend/src/session.rs
@@ -35,6 +35,8 @@ use risingwave_common::error::{Result, RwError};
 use risingwave_common::monitor::process_linux::monitor_process;
 use risingwave_common::session_config::ConfigMap;
 use risingwave_common::system_param::local_manager::LocalSystemParamsManager;
+use risingwave_common::telemetry::manager::TelemetryManager;
+use risingwave_common::telemetry::telemetry_env_enabled;
 use risingwave_common::types::DataType;
 use risingwave_common::util::addr::HostAddr;
 use risingwave_common::util::stream_cancel::{stream_tripwire, Trigger, Tripwire};
@@ -73,6 +75,7 @@ use crate::scheduler::SchedulerError::QueryCancelError;
 use crate::scheduler::{
     DistributedQueryMetrics, HummockSnapshotManager, HummockSnapshotManagerRef, QueryManager,
 };
+use crate::telemetry::FrontendTelemetryCreator;
 use crate::user::user_authentication::md5_hash_with_salt;
 use crate::user::user_manager::UserInfoManager;
 use crate::user::user_service::{UserInfoReader, UserInfoWriter, UserInfoWriterImpl};
@@ -157,9 +160,7 @@ impl FrontendEnv {
         }
     }
 
-    pub async fn init(
-        opts: FrontendOpts,
-    ) -> Result<(Self, JoinHandle<()>, JoinHandle<()>, Sender<()>)> {
+    pub async fn init(opts: FrontendOpts) -> Result<(Self, Vec<JoinHandle<()>>, Vec<Sender<()>>)> {
         let config = load_config(&opts.config_path, Some(opts.override_opts));
         info!("Starting frontend node");
         info!("> config: {:?}", config);
@@ -197,6 +198,8 @@ impl FrontendEnv {
             Duration::from_secs(config.server.max_heartbeat_interval_secs as u64),
             vec![],
         );
+        let mut join_handles = vec![heartbeat_join_handle];
+        let mut shutdown_senders = vec![heartbeat_shutdown_sender];
 
         let (catalog_updated_tx, catalog_updated_rx) = watch::channel(0);
         let catalog = Arc::new(RwLock::new(Catalog::default()));
@@ -233,7 +236,10 @@ impl FrontendEnv {
             user_info_updated_rx,
         ));
 
-        let system_params_manager = Arc::new(LocalSystemParamsManager::new(system_params_reader));
+        let telemetry_enabled = system_params_reader.telemetry_enabled();
+
+        let system_params_manager =
+            Arc::new(LocalSystemParamsManager::new(system_params_reader.clone()));
         let frontend_observer_node = FrontendObserverNode::new(
             worker_node_manager.clone(),
             catalog,
@@ -241,12 +247,13 @@ impl FrontendEnv {
             user_info_manager,
             user_info_updated_tx,
             hummock_snapshot_manager.clone(),
-            system_params_manager,
+            system_params_manager.clone(),
         );
         let observer_manager =
             ObserverManager::new_with_meta_client(meta_client.clone(), frontend_observer_node)
                 .await;
         let observer_join_handle = observer_manager.start().await;
+        join_handles.push(observer_join_handle);
 
         meta_client.activate(&frontend_address).await?;
 
@@ -261,6 +268,28 @@ impl FrontendEnv {
 
         let health_srv = HealthServiceImpl::new();
         let host = opts.health_check_listener_addr.clone();
+
+        let telemetry_manager = TelemetryManager::new(
+            system_params_manager.watch_params(),
+            Arc::new(meta_client.clone()),
+            Arc::new(FrontendTelemetryCreator::new()),
+        );
+
+        // if the toml config file or env variable disables telemetry, do not watch system params
+        // change because if any of configs disable telemetry, we should never start it
+        if config.server.telemetry_enabled && telemetry_env_enabled() {
+            if telemetry_enabled {
+                telemetry_manager.start_telemetry_reporting();
+            }
+            let (telemetry_join_handle, telemetry_shutdown_sender) =
+                telemetry_manager.watch_params_change();
+
+            join_handles.push(telemetry_join_handle);
+            shutdown_senders.push(telemetry_shutdown_sender);
+        } else {
+            tracing::info!("Telemetry didn't start due to config");
+        }
+
         tokio::spawn(async move {
             tonic::transport::Server::builder()
                 .add_service(HealthServer::new(health_srv))
@@ -294,9 +323,8 @@ impl FrontendEnv {
                 source_metrics,
                 creating_streaming_job_tracker,
             },
-            observer_join_handle,
-            heartbeat_join_handle,
-            heartbeat_shutdown_sender,
+            join_handles,
+            shutdown_senders,
         ))
     }
 
@@ -545,9 +573,8 @@ impl SessionImpl {
 
 pub struct SessionManagerImpl {
     env: FrontendEnv,
-    _observer_join_handle: JoinHandle<()>,
-    _heartbeat_join_handle: JoinHandle<()>,
-    _heartbeat_shutdown_sender: Sender<()>,
+    _join_handles: Vec<JoinHandle<()>>,
+    _shutdown_senders: Vec<Sender<()>>,
     number: AtomicI32,
 }
 
@@ -669,13 +696,11 @@ impl SessionManager<PgResponseStream> for SessionManagerImpl {
 
 impl SessionManagerImpl {
     pub async fn new(opts: FrontendOpts) -> Result<Self> {
-        let (env, join_handle, heartbeat_join_handle, heartbeat_shutdown_sender) =
-            FrontendEnv::init(opts).await?;
+        let (env, join_handles, shutdown_senders) = FrontendEnv::init(opts).await?;
         Ok(Self {
             env,
-            _observer_join_handle: join_handle,
-            _heartbeat_join_handle: heartbeat_join_handle,
-            _heartbeat_shutdown_sender: heartbeat_shutdown_sender,
+            _join_handles: join_handles,
+            _shutdown_senders: shutdown_senders,
             number: AtomicI32::new(0),
         })
     }
diff --git a/src/frontend/src/stream_fragmenter/rewrite/delta_join.rs b/src/frontend/src/stream_fragmenter/rewrite/delta_join.rs
index 1450b373baa24..4574805b09563 100644
--- a/src/frontend/src/stream_fragmenter/rewrite/delta_join.rs
+++ b/src/frontend/src/stream_fragmenter/rewrite/delta_join.rs
@@ -16,7 +16,7 @@ use std::rc::Rc;
 
 use itertools::Itertools;
 use risingwave_common::error::Result;
-use risingwave_pb::plan_common::Field as ProstField;
+use risingwave_pb::plan_common::PbField;
 use risingwave_pb::stream_plan::lookup_node::ArrangementTableId;
 use risingwave_pb::stream_plan::stream_node::NodeBody;
 use risingwave_pb::stream_plan::{
@@ -89,7 +89,7 @@ fn dispatch_consistent_hash_shuffle(
 fn build_lookup_for_delta_join(
     state: &mut BuildFragmentGraphState,
     (exchange_node_arrangement, exchange_node_stream): (&StreamNode, &StreamNode),
-    (output_fields, output_stream_key): (Vec<ProstField>, Vec<u32>),
+    (output_fields, output_stream_key): (Vec<PbField>, Vec<u32>),
     lookup_node: LookupNode,
 ) -> StreamNode {
     StreamNode {
diff --git a/src/frontend/src/telemetry.rs b/src/frontend/src/telemetry.rs
new file mode 100644
index 0000000000000..b69747df523fe
--- /dev/null
+++ b/src/frontend/src/telemetry.rs
@@ -0,0 +1,91 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 risingwave_common::telemetry::report::TelemetryReportCreator;
+use risingwave_common::telemetry::{
+    current_timestamp, SystemData, TelemetryNodeType, TelemetryReport, TelemetryReportBase,
+};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy)]
+pub(crate) struct FrontendTelemetryCreator {}
+
+impl FrontendTelemetryCreator {
+    pub(crate) fn new() -> Self {
+        Self {}
+    }
+}
+
+impl TelemetryReportCreator for FrontendTelemetryCreator {
+    fn create_report(
+        &self,
+        tracking_id: String,
+        session_id: String,
+        up_time: u64,
+    ) -> anyhow::Result<FrontendTelemetryReport> {
+        Ok(FrontendTelemetryReport::new(
+            tracking_id,
+            session_id,
+            up_time,
+        ))
+    }
+
+    fn report_type(&self) -> &str {
+        "frontend"
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+pub(crate) struct FrontendTelemetryReport {
+    #[serde(flatten)]
+    base: TelemetryReportBase,
+}
+
+impl TelemetryReport for FrontendTelemetryReport {
+    fn to_json(&self) -> anyhow::Result<String> {
+        let json = serde_json::to_string(self)?;
+        Ok(json)
+    }
+}
+
+impl FrontendTelemetryReport {
+    pub(crate) fn new(tracking_id: String, session_id: String, up_time: u64) -> Self {
+        Self {
+            base: TelemetryReportBase {
+                tracking_id,
+                session_id,
+                system_data: SystemData::new(),
+                up_time,
+                time_stamp: current_timestamp(),
+                node_type: TelemetryNodeType::Frontend,
+            },
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_new() {
+        let report =
+            FrontendTelemetryReport::new("tracking_id".to_owned(), "session_id".to_owned(), 0);
+
+        assert_eq!(report.base.tracking_id, "tracking_id");
+        assert_eq!(report.base.session_id, "session_id");
+        assert_eq!(report.base.up_time, 0);
+        assert_eq!(report.base.node_type, TelemetryNodeType::Frontend);
+    }
+}
diff --git a/src/frontend/src/test_utils.rs b/src/frontend/src/test_utils.rs
index 26153d6cef66e..f0693eb315e97 100644
--- a/src/frontend/src/test_utils.rs
+++ b/src/frontend/src/test_utils.rs
@@ -32,9 +32,7 @@ use risingwave_common::util::column_index_mapping::ColIndexMapping;
 use risingwave_pb::backup_service::MetaSnapshotMetadata;
 use risingwave_pb::catalog::table::OptionalAssociatedSourceId;
 use risingwave_pb::catalog::{
-    Database as ProstDatabase, Function as ProstFunction, Index as ProstIndex,
-    Schema as ProstSchema, Sink as ProstSink, Source as ProstSource, Table as ProstTable,
-    View as ProstView,
+    PbDatabase, PbFunction, PbIndex, PbSchema, PbSink, PbSource, PbTable, PbView,
 };
 use risingwave_pb::ddl_service::DdlProgress;
 use risingwave_pb::hummock::HummockSnapshot;
@@ -75,15 +73,15 @@ impl SessionManager<PgResponseStream> for LocalFrontend {
     }
 
     fn cancel_queries_in_session(&self, _session_id: SessionId) {
-        todo!()
+        unreachable!()
     }
 
     fn cancel_creating_jobs_in_session(&self, _session_id: SessionId) {
-        todo!()
+        unreachable!()
     }
 
     fn end_session(&self, _session: &Self::Session) {
-        todo!()
+        unreachable!()
     }
 }
 
@@ -195,7 +193,7 @@ pub struct MockCatalogWriter {
 impl CatalogWriter for MockCatalogWriter {
     async fn create_database(&self, db_name: &str, owner: UserId) -> Result<()> {
         let database_id = self.gen_id();
-        self.catalog.write().create_database(&ProstDatabase {
+        self.catalog.write().create_database(&PbDatabase {
             name: db_name.to_string(),
             id: database_id,
             owner,
@@ -214,7 +212,7 @@ impl CatalogWriter for MockCatalogWriter {
         owner: UserId,
     ) -> Result<()> {
         let id = self.gen_id();
-        self.catalog.write().create_schema(&ProstSchema {
+        self.catalog.write().create_schema(&PbSchema {
             id,
             name: schema_name.to_string(),
             database_id: db_id,
@@ -226,7 +224,7 @@ impl CatalogWriter for MockCatalogWriter {
 
     async fn create_materialized_view(
         &self,
-        mut table: ProstTable,
+        mut table: PbTable,
         _graph: StreamFragmentGraph,
     ) -> Result<()> {
         table.id = self.gen_id();
@@ -235,7 +233,7 @@ impl CatalogWriter for MockCatalogWriter {
         Ok(())
     }
 
-    async fn create_view(&self, mut view: ProstView) -> Result<()> {
+    async fn create_view(&self, mut view: PbView) -> Result<()> {
         view.id = self.gen_id();
         self.catalog.write().create_view(&view);
         self.add_table_or_source_id(view.id, view.schema_id, view.database_id);
@@ -244,8 +242,8 @@ impl CatalogWriter for MockCatalogWriter {
 
     async fn create_table(
         &self,
-        source: Option<ProstSource>,
-        mut table: ProstTable,
+        source: Option<PbSource>,
+        mut table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<()> {
         if let Some(source) = source {
@@ -259,7 +257,7 @@ impl CatalogWriter for MockCatalogWriter {
 
     async fn replace_table(
         &self,
-        table: ProstTable,
+        table: PbTable,
         _graph: StreamFragmentGraph,
         _mapping: ColIndexMapping,
     ) -> Result<()> {
@@ -267,18 +265,18 @@ impl CatalogWriter for MockCatalogWriter {
         Ok(())
     }
 
-    async fn create_source(&self, source: ProstSource) -> Result<()> {
+    async fn create_source(&self, source: PbSource) -> Result<()> {
         self.create_source_inner(source).map(|_| ())
     }
 
-    async fn create_sink(&self, sink: ProstSink, graph: StreamFragmentGraph) -> Result<()> {
+    async fn create_sink(&self, sink: PbSink, graph: StreamFragmentGraph) -> Result<()> {
         self.create_sink_inner(sink, graph)
     }
 
     async fn create_index(
         &self,
-        mut index: ProstIndex,
-        mut index_table: ProstTable,
+        mut index: PbIndex,
+        mut index_table: PbTable,
         _graph: StreamFragmentGraph,
     ) -> Result<()> {
         index_table.id = self.gen_id();
@@ -295,8 +293,8 @@ impl CatalogWriter for MockCatalogWriter {
         Ok(())
     }
 
-    async fn create_function(&self, _function: ProstFunction) -> Result<()> {
-        todo!()
+    async fn create_function(&self, _function: PbFunction) -> Result<()> {
+        unreachable!()
     }
 
     async fn drop_table(&self, source_id: Option<u32>, table_id: TableId) -> Result<()> {
@@ -323,7 +321,7 @@ impl CatalogWriter for MockCatalogWriter {
     }
 
     async fn drop_view(&self, _view_id: u32) -> Result<()> {
-        todo!()
+        unreachable!()
     }
 
     async fn drop_materialized_view(&self, table_id: TableId) -> Result<()> {
@@ -385,7 +383,7 @@ impl CatalogWriter for MockCatalogWriter {
     }
 
     async fn drop_function(&self, _function_id: FunctionId) -> Result<()> {
-        todo!()
+        unreachable!()
     }
 
     async fn drop_database(&self, database_id: u32) -> Result<()> {
@@ -398,22 +396,45 @@ impl CatalogWriter for MockCatalogWriter {
         self.catalog.write().drop_schema(database_id, schema_id);
         Ok(())
     }
+
+    async fn alter_table_name(&self, table_id: u32, table_name: &str) -> Result<()> {
+        self.catalog
+            .write()
+            .alter_table_name_by_id(&table_id.into(), table_name);
+        Ok(())
+    }
+
+    async fn alter_view_name(&self, _view_id: u32, _view_name: &str) -> Result<()> {
+        unreachable!()
+    }
+
+    async fn alter_index_name(&self, _index_id: u32, _index_name: &str) -> Result<()> {
+        unreachable!()
+    }
+
+    async fn alter_sink_name(&self, _sink_id: u32, _sink_name: &str) -> Result<()> {
+        unreachable!()
+    }
+
+    async fn alter_source_name(&self, _source_id: u32, _source_name: &str) -> Result<()> {
+        unreachable!()
+    }
 }
 
 impl MockCatalogWriter {
     pub fn new(catalog: Arc<RwLock<Catalog>>) -> Self {
-        catalog.write().create_database(&ProstDatabase {
+        catalog.write().create_database(&PbDatabase {
             id: 0,
             name: DEFAULT_DATABASE_NAME.to_string(),
             owner: DEFAULT_SUPER_USER_ID,
         });
-        catalog.write().create_schema(&ProstSchema {
+        catalog.write().create_schema(&PbSchema {
             id: 1,
             name: DEFAULT_SCHEMA_NAME.to_string(),
             database_id: 0,
             owner: DEFAULT_SUPER_USER_ID,
         });
-        catalog.write().create_schema(&ProstSchema {
+        catalog.write().create_schema(&PbSchema {
             id: 2,
             name: PG_CATALOG_SCHEMA_NAME.to_string(),
             database_id: 0,
@@ -493,14 +514,14 @@ impl MockCatalogWriter {
             .unwrap()
     }
 
-    fn create_source_inner(&self, mut source: ProstSource) -> Result<u32> {
+    fn create_source_inner(&self, mut source: PbSource) -> Result<u32> {
         source.id = self.gen_id();
         self.catalog.write().create_source(&source);
         self.add_table_or_source_id(source.id, source.schema_id, source.database_id);
         Ok(source.id)
     }
 
-    fn create_sink_inner(&self, mut sink: ProstSink, _graph: StreamFragmentGraph) -> Result<()> {
+    fn create_sink_inner(&self, mut sink: PbSink, _graph: StreamFragmentGraph) -> Result<()> {
         sink.id = self.gen_id();
         self.catalog.write().create_sink(&sink);
         self.add_table_or_sink_id(sink.id, sink.schema_id, sink.database_id);
diff --git a/src/frontend/src/user/user_privilege.rs b/src/frontend/src/user/user_privilege.rs
index 14ade81f0b0d8..69d9138f2b6ec 100644
--- a/src/frontend/src/user/user_privilege.rs
+++ b/src/frontend/src/user/user_privilege.rs
@@ -15,10 +15,8 @@
 use itertools::Itertools;
 use risingwave_common::catalog::DEFAULT_SUPER_USER_ID;
 use risingwave_common::error::{ErrorCode, Result};
-use risingwave_pb::user::grant_privilege::{
-    Action as ProstAction, ActionWithGrantOption, Object as ProstObject,
-};
-use risingwave_pb::user::GrantPrivilege as ProstPrivilege;
+use risingwave_pb::user::grant_privilege::{ActionWithGrantOption, PbAction, PbObject};
+use risingwave_pb::user::PbGrantPrivilege;
 use risingwave_sqlparser::ast::{Action, GrantObjects, Privileges};
 
 // TODO: add user_privilege mod under user manager and move check and expand logic there, and bitmap
@@ -90,31 +88,31 @@ pub fn available_privilege_actions(objects: &GrantObjects) -> Result<Vec<Action>
 }
 
 #[inline(always)]
-pub fn get_prost_action(action: &Action) -> ProstAction {
+pub fn get_prost_action(action: &Action) -> PbAction {
     match action {
-        Action::Select { .. } => ProstAction::Select,
-        Action::Insert { .. } => ProstAction::Insert,
-        Action::Update { .. } => ProstAction::Update,
-        Action::Delete { .. } => ProstAction::Delete,
-        Action::Connect => ProstAction::Connect,
-        Action::Create => ProstAction::Create,
+        Action::Select { .. } => PbAction::Select,
+        Action::Insert { .. } => PbAction::Insert,
+        Action::Update { .. } => PbAction::Update,
+        Action::Delete { .. } => PbAction::Delete,
+        Action::Connect => PbAction::Connect,
+        Action::Create => PbAction::Create,
         _ => unreachable!(),
     }
 }
 
-pub fn available_prost_privilege(object: ProstObject) -> ProstPrivilege {
+pub fn available_prost_privilege(object: PbObject) -> PbGrantPrivilege {
     let actions = match object {
-        ProstObject::DatabaseId(_) => AVAILABLE_ACTION_ON_DATABASE.to_vec(),
-        ProstObject::SchemaId(_) => AVAILABLE_ACTION_ON_SCHEMA.to_vec(),
-        ProstObject::SourceId(_) | ProstObject::AllSourcesSchemaId { .. } => {
+        PbObject::DatabaseId(_) => AVAILABLE_ACTION_ON_DATABASE.to_vec(),
+        PbObject::SchemaId(_) => AVAILABLE_ACTION_ON_SCHEMA.to_vec(),
+        PbObject::SourceId(_) | PbObject::AllSourcesSchemaId { .. } => {
             AVAILABLE_ACTION_ON_SOURCE.to_vec()
         }
-        ProstObject::TableId(_) | ProstObject::AllTablesSchemaId { .. } => {
+        PbObject::TableId(_) | PbObject::AllTablesSchemaId { .. } => {
             AVAILABLE_ACTION_ON_MVIEW.to_vec()
         }
-        ProstObject::ViewId(_) => AVAILABLE_ACTION_ON_VIEW.to_vec(),
-        ProstObject::SinkId(_) => AVAILABLE_ACTION_ON_SINK.to_vec(),
-        ProstObject::FunctionId(_) => AVAILABLE_ACTION_ON_FUNCTION.to_vec(),
+        PbObject::ViewId(_) => AVAILABLE_ACTION_ON_VIEW.to_vec(),
+        PbObject::SinkId(_) => AVAILABLE_ACTION_ON_SINK.to_vec(),
+        PbObject::FunctionId(_) => AVAILABLE_ACTION_ON_FUNCTION.to_vec(),
     };
     let actions = actions
         .iter()
@@ -124,7 +122,7 @@ pub fn available_prost_privilege(object: ProstObject) -> ProstPrivilege {
             granted_by: DEFAULT_SUPER_USER_ID,
         })
         .collect_vec();
-    ProstPrivilege {
+    PbGrantPrivilege {
         action_with_opts: actions,
         object: Some(object),
     }
diff --git a/src/frontend/src/utils/condition.rs b/src/frontend/src/utils/condition.rs
index 7731076c4a903..902e072d62c39 100644
--- a/src/frontend/src/utils/condition.rs
+++ b/src/frontend/src/utils/condition.rs
@@ -28,7 +28,7 @@ use risingwave_common::util::scan_range::{is_full_range, ScanRange};
 use crate::expr::{
     factorization_expr, fold_boolean_constant, push_down_not, to_conjunctions,
     try_get_bool_constant, ExprDisplay, ExprImpl, ExprMutator, ExprRewriter, ExprType, ExprVisitor,
-    FunctionCall, InputRef,
+    FunctionCall, InequalityInputPair, InputRef,
 };
 use crate::utils::condition::cast_compare::{ResultForCmp, ResultForEq};
 
@@ -241,6 +241,35 @@ impl Condition {
         )
     }
 
+    /// For [`EqJoinPredicate`], extract inequality conditions which connect left columns and right
+    /// columns from other conditions.
+    ///
+    /// The inequality conditions are transformed into `(left_col_id, right_col_id, offset)` pairs.
+    ///
+    /// [`EqJoinPredicate`]: crate::optimizer::plan_node::EqJoinPredicate
+    pub(crate) fn extract_inequality_keys(
+        &self,
+        left_col_num: usize,
+        right_col_num: usize,
+    ) -> Vec<(usize, InequalityInputPair)> {
+        let left_bit_map = FixedBitSet::from_iter(0..left_col_num);
+        let right_bit_map = FixedBitSet::from_iter(left_col_num..left_col_num + right_col_num);
+
+        self.conjunctions
+            .iter()
+            .enumerate()
+            .filter_map(|(conjunction_idx, expr)| {
+                let input_bits = expr.collect_input_refs(left_col_num + right_col_num);
+                if input_bits.is_disjoint(&left_bit_map) || input_bits.is_disjoint(&right_bit_map) {
+                    None
+                } else {
+                    expr.as_input_comparison_cond()
+                        .map(|inequality_pair| (conjunction_idx, inequality_pair))
+                }
+            })
+            .collect_vec()
+    }
+
     /// Split the condition expressions into 2 groups: those referencing `columns` and others which
     /// are disjoint with columns.
     #[must_use]
diff --git a/src/frontend/src/utils/rewrite_index.rs b/src/frontend/src/utils/rewrite_index.rs
index 2107cb55d5219..74b4bf3986f73 100644
--- a/src/frontend/src/utils/rewrite_index.rs
+++ b/src/frontend/src/utils/rewrite_index.rs
@@ -16,7 +16,13 @@ use super::ColIndexMapping;
 use crate::expr::{ExprImpl, ExprRewriter, InputRef};
 
 pub struct IndexRewriter {
-    pub mapping: ColIndexMapping,
+    mapping: ColIndexMapping,
+}
+
+impl IndexRewriter {
+    pub fn new(mapping: ColIndexMapping) -> Self {
+        Self { mapping }
+    }
 }
 
 impl ExprRewriter for IndexRewriter {
diff --git a/src/frontend/src/utils/stream_graph_formatter.rs b/src/frontend/src/utils/stream_graph_formatter.rs
index b99d4f1c6a8f9..76c2d73936a8e 100644
--- a/src/frontend/src/utils/stream_graph_formatter.rs
+++ b/src/frontend/src/utils/stream_graph_formatter.rs
@@ -12,25 +12,30 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::cmp::max;
 use std::collections::{BTreeMap, HashMap};
 
 use itertools::Itertools;
-use risingwave_common::error::{ErrorCode, Result};
+use pretty_xmlish::{Pretty, PrettyConfig};
 use risingwave_pb::catalog::Table;
 use risingwave_pb::stream_plan::agg_call_state::{MaterializedInputState, TableState};
-use risingwave_pb::stream_plan::stream_fragment_graph::{StreamFragment, StreamFragmentEdge};
+use risingwave_pb::stream_plan::stream_fragment_graph::StreamFragmentEdge;
 use risingwave_pb::stream_plan::{
     agg_call_state, stream_node, DispatcherType, StreamFragmentGraph, StreamNode,
 };
 
 use crate::TableCatalog;
 
-pub fn explain_stream_graph(graph: &StreamFragmentGraph, is_verbose: bool) -> Result<String> {
-    let mut output = String::new();
-    StreamGraphFormatter::new(is_verbose)
-        .explain_graph(graph, &mut output)
-        .map_err(|e| ErrorCode::InternalError(format!("failed to explain stream graph: {}", e)))?;
-    Ok(output)
+/// ice: in the future, we may allow configurable width, boundaries, etc.
+pub fn explain_stream_graph(graph: &StreamFragmentGraph, is_verbose: bool) -> String {
+    let mut output = String::with_capacity(2048);
+    let mut config = PrettyConfig {
+        need_boundaries: false,
+        width: 80,
+        ..Default::default()
+    };
+    StreamGraphFormatter::new(is_verbose).explain_graph(graph, &mut config, &mut output);
+    output
 }
 
 /// A formatter to display the final stream plan graph, used for `explain (distsql) create
@@ -51,6 +56,10 @@ impl StreamGraphFormatter {
         }
     }
 
+    fn pretty_add_table<'a>(&mut self, tb: &Table) -> Pretty<'a> {
+        Pretty::debug(&self.add_table(tb))
+    }
+
     /// collect the table catalog and return the table id
     fn add_table(&mut self, tb: &Table) -> u32 {
         self.tables.insert(tb.id, tb.clone());
@@ -60,67 +69,72 @@ impl StreamGraphFormatter {
     fn explain_graph(
         &mut self,
         graph: &StreamFragmentGraph,
-        f: &mut impl std::fmt::Write,
-    ) -> std::fmt::Result {
+        config: &mut PrettyConfig,
+        output: &mut String,
+    ) {
         self.edges.clear();
         for edge in &graph.edges {
             self.edges.insert(edge.link_id, edge.clone());
         }
-
+        let mut max_width = 80;
         for (_, fragment) in graph.fragments.iter().sorted_by_key(|(id, _)| **id) {
-            self.explain_fragment(fragment, f)?;
+            output.push_str("Fragment ");
+            output.push_str(&fragment.get_fragment_id().to_string());
+            output.push('\n');
+            let width = config.unicode(output, &self.explain_node(fragment.node.as_ref().unwrap()));
+            max_width = max(width, max_width);
+            config.width = max_width;
+            output.push_str("\n\n");
         }
-        let tbs = self.tables.clone();
-        for tb in tbs.values() {
-            self.explain_table(tb, f)?;
+        for tb in self.tables.values() {
+            let width = config.unicode(output, &self.explain_table(tb));
+            max_width = max(width, max_width);
+            config.width = max_width;
+            output.push_str("\n\n");
         }
-        Ok(())
     }
 
-    fn explain_table(&mut self, tb: &Table, f: &mut impl std::fmt::Write) -> std::fmt::Result {
+    fn explain_table<'a>(&self, tb: &Table) -> Pretty<'a> {
         let tb = TableCatalog::from(tb.clone());
-        writeln!(
-            f,
-            " Table {} {{ columns: [{}], primary key: {:?}, value indices: {:?}, distribution key: {:?}, read pk prefix len hint: {:?}{} }}",
-            tb.id,
-            tb.columns
-                .iter()
-                .map(|c| {
-                    if self.verbose {
-                        format!("{}:{}", c.name(), c.data_type())
-                    } else {
-                        c.name().to_string()
-                    }
-                })
-                .join(", "),
-            tb.pk,
-            tb.value_indices,
-            tb.distribution_key,
-            tb.read_prefix_len_hint,
-            if let Some(vnode_col_idx) = tb.vnode_col_index {
-                format!(", vnode column idx: {}", vnode_col_idx)
-            } else {
-                "".to_string()
-            }
-        )
-    }
-
-    fn explain_fragment(
-        &mut self,
-        fragment: &StreamFragment,
-        f: &mut impl std::fmt::Write,
-    ) -> std::fmt::Result {
-        writeln!(f, "Fragment {}", fragment.get_fragment_id())?;
-        self.explain_node(1, fragment.node.as_ref().unwrap(), f)?;
-        writeln!(f)
+        let columns = tb
+            .columns
+            .iter()
+            .map(|c| {
+                let s = if self.verbose {
+                    format!("{}: {}", c.name(), c.data_type())
+                } else {
+                    c.name().to_string()
+                };
+                Pretty::Text(s.into())
+            })
+            .collect();
+        let columns = Pretty::Array(columns);
+        let name = format!("Table {}", tb.id);
+        let mut fields = Vec::with_capacity(5);
+        fields.push(("columns", columns));
+        fields.push((
+            "primary key",
+            Pretty::Array(tb.pk.iter().map(Pretty::debug).collect()),
+        ));
+        fields.push((
+            "value indices",
+            Pretty::Array(tb.value_indices.iter().map(Pretty::debug).collect()),
+        ));
+        fields.push((
+            "distribution key",
+            Pretty::Array(tb.distribution_key.iter().map(Pretty::debug).collect()),
+        ));
+        fields.push((
+            "read pk prefix len hint",
+            Pretty::debug(&tb.read_prefix_len_hint),
+        ));
+        if let Some(vnode_col_idx) = tb.vnode_col_index {
+            fields.push(("vnode column idx", Pretty::debug(&vnode_col_idx)));
+        }
+        Pretty::childless_record(name, fields)
     }
 
-    fn explain_node(
-        &mut self,
-        level: usize,
-        node: &StreamNode,
-        f: &mut impl std::fmt::Write,
-    ) -> std::fmt::Result {
+    fn explain_node<'a>(&mut self, node: &StreamNode) -> Pretty<'a> {
         let one_line_explain = match node.get_node_body().unwrap() {
             stream_node::NodeBody::Exchange(_) => {
                 let edge = self.edges.get(&node.operator_id).unwrap();
@@ -141,143 +155,171 @@ impl StreamGraphFormatter {
             _ => node.identity.clone(),
         };
 
-        writeln!(f, "{}{}", " ".repeat(level * 2), one_line_explain)?;
-        let explain_table_oneline = match node.get_node_body().unwrap() {
-            stream_node::NodeBody::Source(node) => node.source_inner.as_ref().map(|source| {
-                format!(
-                    "source state table: {}",
-                    self.add_table(source.get_state_table().unwrap())
-                )
-            }),
-            stream_node::NodeBody::Materialize(node) => Some(format!(
-                "materialized table: {}",
-                self.add_table(node.get_table().unwrap())
+        let mut fields = Vec::with_capacity(7);
+        match node.get_node_body().unwrap() {
+            stream_node::NodeBody::Source(node) if let Some(source) = &node.source_inner => {
+                fields.push((
+                    "source state table",
+                    self.pretty_add_table(source.get_state_table().unwrap()),
+                ));
+            }
+            stream_node::NodeBody::Materialize(node) => fields.push((
+                "materialized table",
+                self.pretty_add_table(node.get_table().unwrap()),
             )),
             stream_node::NodeBody::GlobalSimpleAgg(inner) => {
-                let in_fields = &node.get_input()[0].fields;
-                Some(format!(
-                    "result table: {}, state tables: [{}], distinct tables: [{}]",
-                    self.add_table(inner.get_result_table().unwrap()),
-                    inner
-                        .agg_call_states
-                        .iter()
-                        .filter_map(|state| match state.get_inner().unwrap() {
-                            agg_call_state::Inner::ResultValueState(_) => None,
-                            agg_call_state::Inner::TableState(TableState { table })
-                            | agg_call_state::Inner::MaterializedInputState(
-                                MaterializedInputState { table, .. },
-                            ) => Some(self.add_table(table.as_ref().unwrap())),
-                        })
-                        .join(", "),
-                    inner
-                        .get_distinct_dedup_tables()
-                        .iter()
-                        .sorted_by_key(|(i, _)| *i)
-                        .map(|(i, table)| format!(
-                            "(distinct key: {}, table id: {})",
-                            in_fields[*i as usize].name,
-                            self.add_table(table)
-                        ))
-                        .join(", "),
-                ))
+                fields.push((
+                    "result table",
+                    self.pretty_add_table(inner.get_result_table().unwrap()),
+                ));
+                fields.push(("state tables", self.call_states(&inner.agg_call_states)));
+                fields.push(("distinct tables", self.distinct_tables(node, inner.get_distinct_dedup_tables())));
             }
             stream_node::NodeBody::HashAgg(inner) => {
-                let in_fields = &node.get_input()[0].fields;
-                Some(format!(
-                    "result table: {}, state tables: [{}], distinct tables: [{}]",
-                    self.add_table(inner.get_result_table().unwrap()),
-                    inner
-                        .agg_call_states
-                        .iter()
-                        .filter_map(|state| match state.get_inner().unwrap() {
-                            agg_call_state::Inner::ResultValueState(_) => None,
-                            agg_call_state::Inner::TableState(TableState { table })
-                            | agg_call_state::Inner::MaterializedInputState(
-                                MaterializedInputState { table, .. },
-                            ) => Some(self.add_table(table.as_ref().unwrap())),
-                        })
-                        .join(", "),
-                    inner
-                        .get_distinct_dedup_tables()
-                        .iter()
-                        .sorted_by_key(|(i, _)| *i)
-                        .map(|(i, table)| format!(
-                            "(distinct key: {}, table id: {})",
-                            in_fields[*i as usize].name,
-                            self.add_table(table)
-                        ))
-                        .join(", "),
-                ))
+                fields.push((
+                    "result table",
+                    self.pretty_add_table(inner.get_result_table().unwrap()),
+                ));
+                fields.push(("state tables", self.call_states(&inner.agg_call_states)));
+                fields.push(("distinct tables", self.distinct_tables(node, inner.get_distinct_dedup_tables())));
+            },
+            stream_node::NodeBody::HashJoin(node) => {
+                fields.push((
+                    "left table",
+                    self.pretty_add_table(node.get_left_table().unwrap()),
+                ));
+                fields.push((
+                    "right table",
+                    self.pretty_add_table(node.get_right_table().unwrap()),
+                ));
+                if let Some(tb) = &node.left_degree_table {
+                    fields.push((
+                        "left degree table",
+                        self.pretty_add_table(tb),
+                    ));
+                }
+                if let Some(tb) = &node.right_degree_table {
+                    fields.push((
+                        "right degree table",
+                        self.pretty_add_table(tb),
+                    ));
+                }
             }
-            stream_node::NodeBody::HashJoin(node) => Some(format!(
-                "left table: {}, right table {},{}{}",
-                self.add_table(node.get_left_table().unwrap()),
-                self.add_table(node.get_right_table().unwrap()),
-                match &node.left_degree_table {
-                    Some(tb) => format!(" left degree table: {},", self.add_table(tb)),
-                    None => "".to_string(),
-                },
-                match &node.right_degree_table {
-                    Some(tb) => format!(" right degree table: {},", self.add_table(tb)),
-                    None => "".to_string(),
-                },
-            )),
-            stream_node::NodeBody::TopN(node) => Some(format!(
-                "state table: {}",
-                self.add_table(node.get_table().unwrap())
-            )),
-            stream_node::NodeBody::AppendOnlyTopN(node) => Some(format!(
-                "state table: {}",
-                self.add_table(node.get_table().unwrap())
-            )),
-            stream_node::NodeBody::Arrange(node) => Some(format!(
-                "arrange table: {}",
-                self.add_table(node.get_table().unwrap())
-            )),
-            stream_node::NodeBody::DynamicFilter(node) => Some(format!(
-                "left table: {}, right table {}",
-                self.add_table(node.get_left_table().unwrap()),
-                self.add_table(node.get_right_table().unwrap()),
-            )),
-            stream_node::NodeBody::GroupTopN(node) => Some(format!(
-                "state table: {}",
-                self.add_table(node.get_table().unwrap())
-            )),
-            stream_node::NodeBody::AppendOnlyGroupTopN(node) => Some(format!(
-                "state table: {}",
-                self.add_table(node.get_table().unwrap())
-            )),
-            stream_node::NodeBody::Now(node) => Some(format!(
-                "state table: {}",
-                self.add_table(node.get_state_table().unwrap())
-            )),
-            _ => None,
+            stream_node::NodeBody::TopN(node) =>{
+                fields.push((
+                    "state table",
+                    self.pretty_add_table(node.get_table().unwrap()),
+                ));
+            }
+            stream_node::NodeBody::AppendOnlyTopN(node) => {
+                fields.push((
+                    "state table",
+                    self.pretty_add_table(node.get_table().unwrap()),
+                ));
+            }
+            stream_node::NodeBody::Arrange(node) => {
+                fields.push((
+                    "arrange table",
+                    self.pretty_add_table(node.get_table().unwrap()),
+                ));
+            }
+            stream_node::NodeBody::DynamicFilter(node) => {
+                fields.push((
+                    "left table",
+                    self.pretty_add_table(node.get_left_table().unwrap()),
+                ));
+                fields.push((
+                    "right table",
+                    self.pretty_add_table(node.get_right_table().unwrap()),
+                ));
+            }
+            stream_node::NodeBody::GroupTopN(node) => {
+                let table = self.pretty_add_table(node.get_table().unwrap());
+                fields.push((
+                    "state table",
+                    table,
+                ));
+            }
+            stream_node::NodeBody::AppendOnlyGroupTopN(node) => {
+                fields.push((
+                    "state table",
+                    self.pretty_add_table(node.get_table().unwrap()),
+                ));
+            }
+            stream_node::NodeBody::Now(node) => {
+                fields.push((
+                    "state table",
+                    self.pretty_add_table(node.get_state_table().unwrap()),
+                ));
+            }
+            _ => {},
         };
-        if let Some(explain_table_oneline) = explain_table_oneline {
-            writeln!(f, "{}{}", " ".repeat(level * 2 + 4), explain_table_oneline)?;
-        }
 
         if self.verbose {
-            writeln!(
-                f,
-                "{}Output: [{}]",
-                " ".repeat(level * 2 + 4),
-                node.fields.iter().map(|f| f.get_name()).join(", ")
-            )?;
-            writeln!(
-                f,
-                "{}Stream key: [{}], {}",
-                " ".repeat(level * 2 + 4),
-                node.stream_key
-                    .iter()
-                    .map(|i| node.fields[*i as usize].get_name())
-                    .join(", "),
-                if node.append_only { "AppendOnly" } else { "" }
-            )?;
-        }
-        for input in &node.input {
-            self.explain_node(level + 1, input, f)?;
+            fields.push((
+                "output",
+                Pretty::Array(
+                    node.fields
+                        .iter()
+                        .map(|f| Pretty::display(f.get_name()))
+                        .collect(),
+                ),
+            ));
+            fields.push((
+                "stream key",
+                Pretty::Array(
+                    node.stream_key
+                        .iter()
+                        .map(|i| Pretty::display(node.fields[*i as usize].get_name()))
+                        .collect(),
+                ),
+            ));
         }
-        Ok(())
+        let children = node
+            .input
+            .iter()
+            .map(|input| self.explain_node(input))
+            .collect();
+        Pretty::simple_record(one_line_explain, fields, children)
+    }
+
+    fn call_states<'a>(
+        &mut self,
+        agg_call_states: &[risingwave_pb::stream_plan::AggCallState],
+    ) -> Pretty<'a> {
+        let vec = agg_call_states
+            .iter()
+            .filter_map(|state| match state.get_inner().unwrap() {
+                agg_call_state::Inner::ResultValueState(_) => None,
+                agg_call_state::Inner::TableState(TableState { table })
+                | agg_call_state::Inner::MaterializedInputState(MaterializedInputState {
+                    table,
+                    ..
+                }) => Some(self.pretty_add_table(table.as_ref().unwrap())),
+            })
+            .collect();
+        Pretty::Array(vec)
+    }
+
+    fn distinct_tables<'a>(
+        &mut self,
+        node: &StreamNode,
+        inner: &HashMap<u32, Table>,
+    ) -> Pretty<'a> {
+        let in_fields = &node.get_input()[0].fields;
+        Pretty::Array(
+            inner
+                .iter()
+                .sorted_by_key(|(i, _)| *i)
+                .map(|(i, table)| {
+                    let fmt = format!(
+                        "(distinct key: {}, table id: {})",
+                        in_fields[*i as usize].name,
+                        self.add_table(table)
+                    );
+                    Pretty::Text(fmt.into())
+                })
+                .collect(),
+        )
     }
 }
diff --git a/src/java_binding/src/bin/data-chunk-payload-generator.rs b/src/java_binding/src/bin/data-chunk-payload-generator.rs
index 4d67b4a6fa6e1..179d1baab4e2d 100644
--- a/src/java_binding/src/bin/data-chunk-payload-generator.rs
+++ b/src/java_binding/src/bin/data-chunk-payload-generator.rs
@@ -17,7 +17,7 @@ use std::io::Write;
 use prost::Message;
 use risingwave_common::array::{Op, StreamChunk};
 use risingwave_common::row::OwnedRow;
-use risingwave_common::types::{DataType, OrderedF32, OrderedF64, ScalarImpl};
+use risingwave_common::types::{DataType, ScalarImpl, F32, F64};
 use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
 
 fn build_row(index: usize) -> OwnedRow {
@@ -25,8 +25,8 @@ fn build_row(index: usize) -> OwnedRow {
     row_value.push(Some(ScalarImpl::Int16(index as i16)));
     row_value.push(Some(ScalarImpl::Int32(index as i32)));
     row_value.push(Some(ScalarImpl::Int64(index as i64)));
-    row_value.push(Some(ScalarImpl::Float32(OrderedF32::from(index as f32))));
-    row_value.push(Some(ScalarImpl::Float64(OrderedF64::from(index as f64))));
+    row_value.push(Some(ScalarImpl::Float32(F32::from(index as f32))));
+    row_value.push(Some(ScalarImpl::Float64(F64::from(index as f64))));
     row_value.push(Some(ScalarImpl::Bool(index % 3 == 0)));
     row_value.push(Some(ScalarImpl::Utf8(
         format!("{}", index).repeat((index % 10) + 1).into(),
diff --git a/src/java_binding/src/hummock_iterator.rs b/src/java_binding/src/hummock_iterator.rs
index 5515d50a48c9b..4f1ef0d47d0ed 100644
--- a/src/java_binding/src/hummock_iterator.rs
+++ b/src/java_binding/src/hummock_iterator.rs
@@ -34,7 +34,7 @@ use risingwave_storage::error::{StorageError, StorageResult};
 use risingwave_storage::hummock::local_version::pinned_version::PinnedVersion;
 use risingwave_storage::hummock::store::state_store::HummockStorageIterator;
 use risingwave_storage::hummock::store::version::HummockVersionReader;
-use risingwave_storage::hummock::{SstableStore, TieredCache};
+use risingwave_storage::hummock::{CachePolicy, SstableStore, TieredCache};
 use risingwave_storage::monitor::HummockStateStoreMetrics;
 use risingwave_storage::store::{ReadOptions, StateStoreReadIterStream, StreamTypeOfIter};
 use tokio::sync::mpsc::unbounded_channel;
@@ -83,6 +83,7 @@ impl HummockJavaBindingIterator {
             read_plan.data_dir,
             1 << 10,
             1 << 10,
+            0,
             TieredCache::none(),
         ));
         let reader =
@@ -107,6 +108,7 @@ impl HummockJavaBindingIterator {
                         table_id: read_plan.table_id.into(),
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::NotFill,
                     },
                     (vec![], vec![], pin_version.clone()),
                 )
diff --git a/src/meta/Cargo.toml b/src/meta/Cargo.toml
index d5a13237e98b7..e1784a35fbe7f 100644
--- a/src/meta/Cargo.toml
+++ b/src/meta/Cargo.toml
@@ -52,6 +52,7 @@ risingwave_hummock_sdk = { path = "../storage/hummock_sdk" }
 risingwave_object_store = { path = "../object_store" }
 risingwave_pb = { path = "../prost" }
 risingwave_rpc_client = { path = "../rpc_client" }
+risingwave_sqlparser = { path = "../sqlparser" }
 scopeguard = "1.1.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/src/meta/src/backup_restore/meta_snapshot_builder.rs b/src/meta/src/backup_restore/meta_snapshot_builder.rs
index 723d3442da828..24a880f3c6dcf 100644
--- a/src/meta/src/backup_restore/meta_snapshot_builder.rs
+++ b/src/meta/src/backup_restore/meta_snapshot_builder.rs
@@ -98,7 +98,6 @@ impl<S: MetaStore> MetaSnapshotBuilder<S> {
         let system_param = SystemParams::get_at_snapshot::<S>(&meta_store_snapshot)
             .await?
             .ok_or_else(|| anyhow!("system params not found in meta store"))?;
-
         self.snapshot.metadata = ClusterMetadata {
             default_cf,
             hummock_version,
diff --git a/src/meta/src/backup_restore/restore.rs b/src/meta/src/backup_restore/restore.rs
index ee9efc1b02feb..1a039bfae3865 100644
--- a/src/meta/src/backup_restore/restore.rs
+++ b/src/meta/src/backup_restore/restore.rs
@@ -266,6 +266,7 @@ mod tests {
             data_directory: Some("data_directory".to_string()),
             backup_storage_url: Some("backup_storage_url".to_string()),
             backup_storage_directory: Some("backup_storage_directory".to_string()),
+            telemetry_enabled: Some(false),
         }
     }
 
diff --git a/src/meta/src/barrier/command.rs b/src/meta/src/barrier/command.rs
index 905ff23e11991..2f21003b0ca05 100644
--- a/src/meta/src/barrier/command.rs
+++ b/src/meta/src/barrier/command.rs
@@ -58,6 +58,9 @@ pub struct Reschedule {
     /// The upstream fragments of this fragment, and the dispatchers that should be updated.
     pub upstream_fragment_dispatcher_ids: Vec<(FragmentId, DispatcherId)>,
     /// New hash mapping of the upstream dispatcher to be updated.
+    ///
+    /// This field exists only when there's upstream fragment and the current fragment is
+    /// hash-sharded.
     pub upstream_dispatcher_mapping: Option<ActorMapping>,
 
     /// The downstream fragments of this fragment.
@@ -274,6 +277,7 @@ where
             }
 
             Command::CreateStreamingJob {
+                table_fragments,
                 dispatchers,
                 init_split_assignment: split_assignment,
                 ..
@@ -289,12 +293,14 @@ where
                         )
                     })
                     .collect();
+                let added_actors = table_fragments.actor_ids();
                 let actor_splits = split_assignment
                     .values()
                     .flat_map(build_actor_connector_splits)
                     .collect();
                 Some(Mutation::Add(AddMutation {
                     actor_dispatchers,
+                    added_actors,
                     actor_splits,
                 }))
             }
@@ -440,7 +446,7 @@ where
                     dropped_actors,
                     actor_splits,
                 });
-                tracing::trace!("update mutation: {mutation:#?}");
+                tracing::debug!("update mutation: {mutation:#?}");
                 Some(mutation)
             }
         };
diff --git a/src/meta/src/barrier/mod.rs b/src/meta/src/barrier/mod.rs
index ce4bf0995481f..93cc2537e6e8f 100644
--- a/src/meta/src/barrier/mod.rs
+++ b/src/meta/src/barrier/mod.rs
@@ -86,6 +86,7 @@ enum BarrierManagerStatus {
 struct Scheduled {
     command: Command,
     notifiers: Vec<Notifier>,
+    send_latency_timer: HistogramTimer,
     /// Choose a different barrier(checkpoint == true) according to it
     checkpoint: bool,
 }
@@ -466,6 +467,13 @@ enum BarrierEpochState {
     Completed(Vec<BarrierCompleteResponse>),
 }
 
+/// The result of barrier completion.
+#[derive(Debug)]
+struct BarrierCompletion {
+    prev_epoch: u64,
+    result: MetaResult<Vec<BarrierCompleteResponse>>,
+}
+
 impl<S> GlobalBarrierManager<S>
 where
     S: MetaStore,
@@ -527,6 +535,7 @@ where
 
     /// Start an infinite loop to take scheduled barriers and send them.
     async fn run(&self, mut shutdown_rx: Receiver<()>) {
+        // Initialize the barrier manager.
         let interval = Duration::from_millis(
             self.env
                 .system_params_manager()
@@ -563,9 +572,9 @@ where
             );
         }
         self.set_status(BarrierManagerStatus::Running).await;
+
         let mut min_interval = tokio::time::interval(interval);
         min_interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
-        let mut barrier_timer: Option<HistogramTimer> = None;
         let (barrier_complete_tx, mut barrier_complete_rx) = tokio::sync::mpsc::unbounded_channel();
         let mut checkpoint_control = CheckpointControl::new(self.metrics.clone());
         let (local_notification_tx, mut local_notification_rx) =
@@ -574,96 +583,99 @@ where
             .notification_manager()
             .insert_local_sender(local_notification_tx)
             .await;
+
+        // Start the event loop.
         loop {
             tokio::select! {
                 biased;
+
                 // Shutdown
                 _ = &mut shutdown_rx => {
                     tracing::info!("Barrier manager is stopped");
-                    return;
+                    break;
                 }
-                // Checkpoint frequency change
+                // Checkpoint frequency changes.
                 notification = local_notification_rx.recv() => {
                     self.handle_local_notification(notification.unwrap());
                 }
-                result = barrier_complete_rx.recv() => {
-                    checkpoint_control.update_barrier_nums_metrics();
-
-                    let (prev_epoch, result) = result.unwrap();
-                    // Received barrier complete responses with an epoch that is not managed by checkpoint control, which
-                    // means a recovery has been triggered. We should ignore it because trying to complete and commit
-                    // the epoch is not necessary and could cause meaningless recovery again.
-                    if !checkpoint_control.contains_epoch(prev_epoch) {
-                        tracing::warn!("received barrier complete response for an unknown epoch: {}", prev_epoch);
-                        continue;
-                    }
-                    self.barrier_complete_and_commit(
-                        prev_epoch,
-                        result,
+                // Barrier completes.
+                completion = barrier_complete_rx.recv() => {
+                    self.handle_barrier_complete(
+                        completion.unwrap(),
                         &mut state,
                         &mut checkpoint_control,
                     )
                     .await;
-                    continue;
                 }
-                // there's barrier scheduled.
-                _ = self.scheduled_barriers.wait_one(), if checkpoint_control.can_inject_barrier(self.in_flight_barrier_nums) => {}
-                // Wait for the minimal interval,
-                _ = min_interval.tick(), if checkpoint_control.can_inject_barrier(self.in_flight_barrier_nums) => {}
-            }
 
-            if let Some(barrier_timer) = barrier_timer {
-                barrier_timer.observe_duration();
+                // There's barrier scheduled.
+                _ = self.scheduled_barriers.wait_one(), if checkpoint_control.can_inject_barrier(self.in_flight_barrier_nums) => {
+                    min_interval.reset(); // Reset the interval as we have a new barrier.
+                    self.handle_new_barrier(&barrier_complete_tx, &mut state, &mut checkpoint_control).await;
+                }
+                // Minimum interval reached.
+                _ = min_interval.tick(), if checkpoint_control.can_inject_barrier(self.in_flight_barrier_nums) => {
+                    self.handle_new_barrier(&barrier_complete_tx, &mut state, &mut checkpoint_control).await;
+                }
             }
-            barrier_timer = Some(self.metrics.barrier_send_latency.start_timer());
-            let Scheduled {
-                command,
-                notifiers,
-                checkpoint,
-            } = self.scheduled_barriers.pop_or_default().await;
-            let info = self
-                .resolve_actor_info(&mut checkpoint_control, &command)
-                .await;
+        }
+    }
 
-            let prev_epoch = state.in_flight_prev_epoch;
-            let new_epoch = prev_epoch.next();
-            state.in_flight_prev_epoch = new_epoch;
-            assert!(
-                new_epoch > prev_epoch,
-                "new{:?},prev{:?}",
-                new_epoch,
-                prev_epoch
-            );
-            state
-                .update_inflight_prev_epoch(self.env.meta_store())
-                .await
-                .unwrap();
+    /// Handle the new barrier from the scheduled queue and inject it.
+    async fn handle_new_barrier(
+        &self,
+        barrier_complete_tx: &UnboundedSender<BarrierCompletion>,
+        state: &mut BarrierManagerState,
+        checkpoint_control: &mut CheckpointControl<S>,
+    ) {
+        assert!(checkpoint_control.can_inject_barrier(self.in_flight_barrier_nums));
 
-            let command_ctx = Arc::new(CommandContext::new(
-                self.fragment_manager.clone(),
-                self.snapshot_manager.clone(),
-                self.env.stream_client_pool_ref(),
-                info,
-                prev_epoch,
-                new_epoch,
-                command,
-                checkpoint,
-                self.source_manager.clone(),
-            ));
-            let mut notifiers = notifiers;
-            notifiers.iter_mut().for_each(Notifier::notify_to_send);
-
-            checkpoint_control.enqueue_command(command_ctx.clone(), notifiers);
-            self.inject_barrier(command_ctx, barrier_complete_tx.clone())
-                .await;
-        }
+        let Scheduled {
+            command,
+            notifiers,
+            send_latency_timer,
+            checkpoint,
+        } = self.scheduled_barriers.pop_or_default().await;
+        let info = self.resolve_actor_info(checkpoint_control, &command).await;
+
+        let prev_epoch = state.in_flight_prev_epoch;
+        let new_epoch = prev_epoch.next();
+        state.in_flight_prev_epoch = new_epoch;
+        assert!(
+            new_epoch > prev_epoch,
+            "new{:?},prev{:?}",
+            new_epoch,
+            prev_epoch
+        );
+        state
+            .update_inflight_prev_epoch(self.env.meta_store())
+            .await
+            .unwrap();
+
+        let command_ctx = Arc::new(CommandContext::new(
+            self.fragment_manager.clone(),
+            self.snapshot_manager.clone(),
+            self.env.stream_client_pool_ref(),
+            info,
+            prev_epoch,
+            new_epoch,
+            command,
+            checkpoint,
+            self.source_manager.clone(),
+        ));
+        let mut notifiers = notifiers;
+        notifiers.iter_mut().for_each(Notifier::notify_to_send);
+        send_latency_timer.observe_duration();
+
+        checkpoint_control.enqueue_command(command_ctx.clone(), notifiers);
+        self.inject_barrier(command_ctx, barrier_complete_tx).await;
     }
 
     /// Inject a barrier to all CNs and spawn a task to collect it
     async fn inject_barrier(
         &self,
         command_context: Arc<CommandContext<S>>,
-        barrier_complete_tx: UnboundedSender<(u64, MetaResult<Vec<BarrierCompleteResponse>>)>,
+        barrier_complete_tx: &UnboundedSender<BarrierCompletion>,
     ) {
         let prev_epoch = command_context.prev_epoch.0;
         let result = self.inject_barrier_inner(command_context.clone()).await;
@@ -674,10 +686,15 @@ where
                     node_need_collect,
                     self.env.stream_client_pool_ref(),
                     command_context,
-                    barrier_complete_tx,
+                    barrier_complete_tx.clone(),
                 ));
             }
-            Err(e) => barrier_complete_tx.send((prev_epoch, Err(e))).unwrap(),
+            Err(e) => {
+                let _ = barrier_complete_tx.send(BarrierCompletion {
+                    prev_epoch,
+                    result: Err(e),
+                });
+            }
         }
     }
 
@@ -742,7 +759,7 @@ where
         node_need_collect: HashMap<WorkerId, bool>,
         client_pool_ref: StreamClientPoolRef,
         command_context: Arc<CommandContext<S>>,
-        barrier_complete_tx: UnboundedSender<(u64, MetaResult<Vec<BarrierCompleteResponse>>)>,
+        barrier_complete_tx: UnboundedSender<BarrierCompletion>,
     ) {
         let prev_epoch = command_context.prev_epoch.0;
         let info = command_context.info.clone();
@@ -771,21 +788,36 @@ where
             }
         });
 
-        let result = try_join_all(collect_futures).await;
+        let result = try_join_all(collect_futures).await.map_err(Into::into);
         let _ = barrier_complete_tx
-            .send((prev_epoch, result.map_err(Into::into)))
+            .send(BarrierCompletion { prev_epoch, result })
             .inspect_err(|err| tracing::warn!("failed to complete barrier: {err}"));
     }
 
     /// Changes the state to `Complete`, and try to commit all epoch that state is `Complete` in
     /// order. If commit is err, all nodes will be handled.
-    async fn barrier_complete_and_commit(
+    async fn handle_barrier_complete(
         &self,
-        prev_epoch: u64,
-        result: MetaResult<Vec<BarrierCompleteResponse>>,
+        completion: BarrierCompletion,
         state: &mut BarrierManagerState,
         checkpoint_control: &mut CheckpointControl<S>,
     ) {
+        checkpoint_control.update_barrier_nums_metrics();
+
+        let BarrierCompletion { prev_epoch, result } = completion;
+
+        // Received barrier complete responses with an epoch that is not managed by checkpoint
+        // control, which means a recovery has been triggered. We should ignore it because
+        // trying to complete and commit the epoch is not necessary and could cause
+        // meaningless recovery again.
+        if !checkpoint_control.contains_epoch(prev_epoch) {
+            tracing::warn!(
+                "received barrier complete response for an unknown epoch: {}",
+                prev_epoch
+            );
+            return;
+        }
+
         if let Err(err) = result {
             // FIXME: If it is a connector source error occurred in the init barrier, we should pass
             // back to frontend
diff --git a/src/meta/src/barrier/progress.rs b/src/meta/src/barrier/progress.rs
index 6a586485bebf2..58bdfcaf18fb0 100644
--- a/src/meta/src/barrier/progress.rs
+++ b/src/meta/src/barrier/progress.rs
@@ -268,7 +268,7 @@ impl<S: MetaStore> CreateMviewProgressTracker<S> {
         None
     }
 
-    /// Update the progress of `actor` according to the Prost struct.
+    /// Update the progress of `actor` according to the Pb struct.
     ///
     /// If all actors in this MV have finished, returns the command.
     pub fn update(
diff --git a/src/meta/src/barrier/recovery.rs b/src/meta/src/barrier/recovery.rs
index 68d56c8e452c4..e42758e138adc 100644
--- a/src/meta/src/barrier/recovery.rs
+++ b/src/meta/src/barrier/recovery.rs
@@ -147,7 +147,9 @@ where
             // get split assignments for all actors
             let source_split_assignments = self.source_manager.list_assignments().await;
             let command = Command::Plain(Some(Mutation::Add(AddMutation {
+                // Actors built during recovery is not treated as newly added actors.
                 actor_dispatchers: Default::default(),
+                added_actors: Default::default(),
                 actor_splits: build_actor_connector_splits(&source_split_assignments),
             })));
 
@@ -183,17 +185,17 @@ where
 
             let (barrier_complete_tx, mut barrier_complete_rx) =
                 tokio::sync::mpsc::unbounded_channel();
-            self.inject_barrier(command_ctx.clone(), barrier_complete_tx)
+            self.inject_barrier(command_ctx.clone(), &barrier_complete_tx)
                 .await;
-            match barrier_complete_rx.recv().await.unwrap() {
-                (_, Ok(response)) => {
+            match barrier_complete_rx.recv().await.unwrap().result {
+                Ok(response) => {
                     if let Err(err) = command_ctx.post_collect().await {
                         error!(err = ?err, "post_collect failed");
                         return Err(err);
                     }
                     Ok((new_epoch, response))
                 }
-                (_, Err(err)) => {
+                Err(err) => {
                     error!(err = ?err, "inject_barrier failed");
                     Err(err)
                 }
diff --git a/src/meta/src/barrier/schedule.rs b/src/meta/src/barrier/schedule.rs
index 4d5e9570319ae..39c6f3f2a7341 100644
--- a/src/meta/src/barrier/schedule.rs
+++ b/src/meta/src/barrier/schedule.rs
@@ -26,6 +26,7 @@ use tokio::sync::{oneshot, watch, RwLock};
 use super::notifier::Notifier;
 use super::{Command, Scheduled};
 use crate::hummock::HummockManagerRef;
+use crate::rpc::metrics::MetaMetrics;
 use crate::storage::MetaStore;
 use crate::MetaResult;
 
@@ -46,6 +47,9 @@ struct Inner {
     force_checkpoint: AtomicBool,
 
     checkpoint_frequency: AtomicUsize,
+
+    /// Used for recording send latency of each barrier.
+    metrics: Arc<MetaMetrics>,
 }
 
 /// The sender side of the barrier scheduling queue.
@@ -63,6 +67,7 @@ impl<S: MetaStore> BarrierScheduler<S> {
     /// from different managers, and executing them in the barrier manager, respectively.
     pub fn new_pair(
         hummock_manager: HummockManagerRef<S>,
+        metrics: Arc<MetaMetrics>,
         checkpoint_frequency: usize,
     ) -> (Self, ScheduledBarriers) {
         tracing::info!(
@@ -75,6 +80,7 @@ impl<S: MetaStore> BarrierScheduler<S> {
             num_uncheckpointed_barrier: AtomicUsize::new(0),
             checkpoint_frequency: AtomicUsize::new(checkpoint_frequency),
             force_checkpoint: AtomicBool::new(false),
+            metrics,
         });
 
         (
@@ -134,6 +140,7 @@ impl<S: MetaStore> BarrierScheduler<S> {
                 queue.push_back(Scheduled {
                     notifiers: new_notifiers,
                     command: Command::barrier(),
+                    send_latency_timer: self.inner.metrics.barrier_send_latency.start_timer(),
                     checkpoint: new_checkpoint,
                 });
                 self.inner.changed_tx.send(()).ok();
@@ -177,6 +184,7 @@ impl<S: MetaStore> BarrierScheduler<S> {
             scheduleds.push(Scheduled {
                 checkpoint: command.need_checkpoint(),
                 command,
+                send_latency_timer: self.inner.metrics.barrier_send_latency.start_timer(),
                 notifiers: once(Notifier {
                     collected: Some(collect_tx),
                     finished: Some(finish_tx),
@@ -254,6 +262,7 @@ impl ScheduledBarriers {
                 // If no command scheduled, create a periodic barrier by default.
                 Scheduled {
                     command: Command::barrier(),
+                    send_latency_timer: self.inner.metrics.barrier_send_latency.start_timer(),
                     notifiers: Default::default(),
                     checkpoint,
                 }
diff --git a/src/meta/src/dashboard/mod.rs b/src/meta/src/dashboard/mod.rs
index 17e3b872913ec..4b7617294af3e 100644
--- a/src/meta/src/dashboard/mod.rs
+++ b/src/meta/src/dashboard/mod.rs
@@ -59,7 +59,7 @@ pub(super) mod handlers {
     use risingwave_pb::catalog::table::TableType;
     use risingwave_pb::catalog::{Sink, Source, Table};
     use risingwave_pb::common::WorkerNode;
-    use risingwave_pb::meta::{ActorLocation, TableFragments as ProstTableFragments};
+    use risingwave_pb::meta::{ActorLocation, PbTableFragments};
     use risingwave_pb::monitor_service::StackTraceResponse;
     use risingwave_pb::stream_plan::StreamActor;
     use serde_json::json;
@@ -203,7 +203,7 @@ pub(super) mod handlers {
 
     pub async fn list_fragments<S: MetaStore>(
         Extension(srv): Extension<Service<S>>,
-    ) -> Result<Json<Vec<ProstTableFragments>>> {
+    ) -> Result<Json<Vec<PbTableFragments>>> {
         use crate::model::MetadataModel;
 
         let table_fragments = TableFragments::list(&*srv.meta_store)
diff --git a/src/meta/src/error.rs b/src/meta/src/error.rs
index 7a3485fb2edee..bba22e5fc7069 100644
--- a/src/meta/src/error.rs
+++ b/src/meta/src/error.rs
@@ -15,7 +15,7 @@
 use std::backtrace::Backtrace;
 use std::sync::Arc;
 
-use risingwave_pb::ProstFieldNotFound;
+use risingwave_pb::PbFieldNotFound;
 use risingwave_rpc_client::error::RpcError;
 
 use crate::hummock::error::Error as HummockError;
@@ -199,8 +199,8 @@ impl From<MetaError> for tonic::Status {
     }
 }
 
-impl From<ProstFieldNotFound> for MetaError {
-    fn from(e: ProstFieldNotFound) -> Self {
+impl From<PbFieldNotFound> for MetaError {
+    fn from(e: PbFieldNotFound) -> Self {
         MetadataModelError::from(e).into()
     }
 }
diff --git a/src/meta/src/hummock/compaction/mod.rs b/src/meta/src/hummock/compaction/mod.rs
index 7852bbef2fe32..bbe35bd159d71 100644
--- a/src/meta/src/hummock/compaction/mod.rs
+++ b/src/meta/src/hummock/compaction/mod.rs
@@ -33,7 +33,9 @@ use risingwave_hummock_sdk::{
 };
 use risingwave_pb::hummock::compaction_config::CompactionMode;
 use risingwave_pb::hummock::hummock_version::Levels;
-use risingwave_pb::hummock::{CompactTask, CompactionConfig, InputLevel, KeyRange, LevelType};
+use risingwave_pb::hummock::{
+    CompactTask, CompactionConfig, GetScaleCompactorResponse, InputLevel, KeyRange, LevelType,
+};
 
 pub use crate::hummock::compaction::level_selector::{
     default_level_selector, DynamicLevelSelector, DynamicLevelSelectorCore, LevelSelector,
@@ -44,6 +46,10 @@ use crate::hummock::level_handler::LevelHandler;
 use crate::hummock::model::CompactionGroup;
 use crate::rpc::metrics::MetaMetrics;
 
+// we assume that every core could compact data with 50MB/s, and when there has been 32GB data
+// waiting to compact, a new compactor-node with 8-core could consume this data with in 2 minutes.
+const COMPACTION_BYTES_PER_CORE: u64 = 4 * 1024 * 1024 * 1024;
+
 pub struct CompactStatus {
     pub(crate) compaction_group_id: CompactionGroupId,
     pub(crate) level_handlers: Vec<LevelHandler>,
@@ -218,6 +224,20 @@ impl CompactStatus {
     pub fn compaction_group_id(&self) -> CompactionGroupId {
         self.compaction_group_id
     }
+
+    pub fn get_compaction_info(
+        &self,
+        levels: &Levels,
+        compaction_config: Arc<CompactionConfig>,
+    ) -> ScaleCompactorInfo {
+        let dynamic_core = DynamicLevelSelectorCore::new(compaction_config);
+        let waiting_compaction_bytes = dynamic_core.compact_pending_bytes_needed(levels);
+        ScaleCompactorInfo {
+            running_cores: 0,
+            total_cores: 0,
+            waiting_compaction_bytes,
+        }
+    }
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -305,6 +325,40 @@ pub trait CompactionPicker {
     ) -> Option<CompactionInput>;
 }
 
+#[derive(Default, Clone, Debug)]
+pub struct ScaleCompactorInfo {
+    pub running_cores: u64,
+    pub total_cores: u64,
+    pub waiting_compaction_bytes: u64,
+}
+
+impl ScaleCompactorInfo {
+    pub fn add(&mut self, other: &ScaleCompactorInfo) {
+        self.running_cores += other.running_cores;
+        self.total_cores += other.total_cores;
+        self.waiting_compaction_bytes += other.waiting_compaction_bytes;
+    }
+
+    pub fn scale_out_cores(&self) -> u64 {
+        let mut scale_cores = self.waiting_compaction_bytes / COMPACTION_BYTES_PER_CORE;
+        if self.running_cores < self.total_cores {
+            scale_cores = scale_cores.saturating_sub(self.total_cores - self.running_cores);
+        }
+        scale_cores
+    }
+}
+
+impl From<ScaleCompactorInfo> for GetScaleCompactorResponse {
+    fn from(info: ScaleCompactorInfo) -> Self {
+        GetScaleCompactorResponse {
+            suggest_cores: info.total_cores,
+            running_cores: info.running_cores,
+            total_cores: info.total_cores,
+            waiting_compaction_bytes: info.waiting_compaction_bytes,
+        }
+    }
+}
+
 pub fn create_compaction_task(
     compaction_config: &CompactionConfig,
     input: CompactionInput,
diff --git a/src/meta/src/hummock/compaction_schedule_policy.rs b/src/meta/src/hummock/compaction_schedule_policy.rs
index 886cd0eabad02..ecb18c8ad683c 100644
--- a/src/meta/src/hummock/compaction_schedule_policy.rs
+++ b/src/meta/src/hummock/compaction_schedule_policy.rs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use std::collections::{BTreeMap, HashMap};
+use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
 use risingwave_hummock_sdk::HummockContextId;
@@ -41,6 +42,7 @@ pub trait CompactionSchedulePolicy: Send + Sync {
         &mut self,
         context_id: HummockContextId,
         max_concurrent_task_number: u64,
+        cpu_core_num: u32,
     ) -> Receiver<MetaResult<SubscribeCompactTasksResponse>>;
 
     /// Make sure the compactor with `context_id` will not be scheduled until it resubscribes.
@@ -77,6 +79,10 @@ pub trait CompactionSchedulePolicy: Send + Sync {
     fn compactor_num(&self) -> usize;
 
     fn max_concurrent_task_num(&self) -> usize;
+
+    fn total_cpu_core_num(&self) -> u32;
+
+    fn total_running_cpu_core_num(&self) -> u32;
 }
 
 // This strategy is retained just for reference, it is not used.
@@ -141,13 +147,19 @@ impl CompactionSchedulePolicy for RoundRobinPolicy {
         &mut self,
         context_id: HummockContextId,
         max_concurrent_task_number: u64,
+        cpu_core_num: u32,
     ) -> Receiver<MetaResult<SubscribeCompactTasksResponse>> {
         let (tx, rx) = tokio::sync::mpsc::channel(STREAM_BUFFER_SIZE);
         self.compactors.retain(|c| *c != context_id);
         self.compactors.push(context_id);
         self.compactor_map.insert(
             context_id,
-            Arc::new(Compactor::new(context_id, tx, max_concurrent_task_number)),
+            Arc::new(Compactor::new(
+                context_id,
+                tx,
+                max_concurrent_task_number,
+                cpu_core_num,
+            )),
         );
         rx
     }
@@ -189,6 +201,17 @@ impl CompactionSchedulePolicy for RoundRobinPolicy {
             .map(|c| c.max_concurrent_task_number() as usize)
             .sum()
     }
+
+    fn total_cpu_core_num(&self) -> u32 {
+        self.compactor_map.values().map(|c| c.total_cpu_core).sum()
+    }
+
+    fn total_running_cpu_core_num(&self) -> u32 {
+        self.compactor_map
+            .values()
+            .map(|c| c.cpu_ratio.load(Ordering::Acquire) * c.total_cpu_core / 100)
+            .sum()
+    }
 }
 
 /// The score must be linear to the input for easy update.
@@ -198,7 +221,6 @@ type Score = i64;
 
 /// Give priority to compactors with the least score. Currently the score is composed only of
 /// pending bytes compaction tasks.
-#[derive(Default)]
 pub struct ScoredPolicy {
     // We use `(score, context_id)` as the key to dedup compactor with the same pending
     // bytes.
@@ -224,6 +246,7 @@ impl ScoredPolicy {
                 .and_modify(|old_score| *old_score += score_delta)
                 .or_insert(score_delta);
         });
+
         Self {
             score_to_compactor: BTreeMap::new(),
             context_id_to_score: compactor_to_score,
@@ -233,7 +256,8 @@ impl ScoredPolicy {
     #[cfg(test)]
     fn for_test() -> Self {
         Self {
-            ..Default::default()
+            score_to_compactor: BTreeMap::default(),
+            context_id_to_score: HashMap::default(),
         }
     }
 
@@ -269,22 +293,37 @@ impl ScoredPolicy {
     }
 }
 
-impl CompactionSchedulePolicy for ScoredPolicy {
-    fn next_idle_compactor(
+impl ScoredPolicy {
+    fn fetch_idle_compactor(
         &self,
         compactor_assigned_task_num: &HashMap<HummockContextId, u64>,
     ) -> Option<Arc<Compactor>> {
         for compactor in self.score_to_compactor.values() {
-            if *compactor_assigned_task_num
+            let running_task = *compactor_assigned_task_num
                 .get(&compactor.context_id())
-                .unwrap_or(&0)
-                < compactor.max_concurrent_task_number()
-            {
-                return Some(compactor.clone());
+                .unwrap_or(&0);
+
+            if running_task >= compactor.max_concurrent_task_number() {
+                continue;
             }
+
+            return Some(compactor.clone());
         }
         None
     }
+}
+
+impl CompactionSchedulePolicy for ScoredPolicy {
+    fn next_idle_compactor(
+        &self,
+        compactor_assigned_task_num: &HashMap<HummockContextId, u64>,
+    ) -> Option<Arc<Compactor>> {
+        if let Some(compactor) = self.fetch_idle_compactor(compactor_assigned_task_num) {
+            return Some(compactor);
+        }
+
+        None
+    }
 
     fn next_compactor(&self) -> Option<Arc<Compactor>> {
         if let Some((_, compactor)) = self.score_to_compactor.first_key_value() {
@@ -298,13 +337,19 @@ impl CompactionSchedulePolicy for ScoredPolicy {
         &mut self,
         context_id: HummockContextId,
         max_concurrent_task_number: u64,
+        cpu_core_num: u32,
     ) -> Receiver<MetaResult<SubscribeCompactTasksResponse>> {
         let (tx, rx) = tokio::sync::mpsc::channel(STREAM_BUFFER_SIZE);
         // If `context_id` already exists, we only need to update the task channel.
         let score = self.context_id_to_score.entry(context_id).or_insert(0);
         self.score_to_compactor.insert(
             (*score, context_id),
-            Arc::new(Compactor::new(context_id, tx, max_concurrent_task_number)),
+            Arc::new(Compactor::new(
+                context_id,
+                tx,
+                max_concurrent_task_number,
+                cpu_core_num,
+            )),
         );
         rx
     }
@@ -360,6 +405,23 @@ impl CompactionSchedulePolicy for ScoredPolicy {
             .map(|c| c.max_concurrent_task_number() as usize)
             .sum()
     }
+
+    fn total_cpu_core_num(&self) -> u32 {
+        self.score_to_compactor
+            .values()
+            .map(|c| c.total_cpu_core)
+            .sum()
+    }
+
+    fn total_running_cpu_core_num(&self) -> u32 {
+        self.score_to_compactor
+            .values()
+            .map(|c| {
+                (c.cpu_ratio.load(Ordering::Acquire) as f64 * c.total_cpu_core as f64 / 100.0)
+                    .ceil() as u32
+            })
+            .sum()
+    }
 }
 
 #[cfg(test)]
@@ -454,10 +516,10 @@ mod tests {
         assert_eq!(policy.compactors.len(), 0);
         assert_eq!(policy.max_concurrent_task_num(), 0);
 
-        let mut receiver = policy.add_compactor(1, 1000);
+        let mut receiver = policy.add_compactor(1, 1000, 1000);
         assert_eq!(policy.compactors.len(), 1);
         assert_eq!(policy.max_concurrent_task_num(), 1000);
-        let _receiver_2 = policy.add_compactor(2, 1000);
+        let _receiver_2 = policy.add_compactor(2, 1000, 1000);
         assert_eq!(policy.compactors.len(), 2);
         assert_eq!(policy.max_concurrent_task_num(), 2000);
         policy.remove_compactor(2);
@@ -509,7 +571,7 @@ mod tests {
         assert!(compactor_manager.next_compactor().is_none());
 
         // Add a compactor.
-        let mut receiver = compactor_manager.add_compactor(context_id, u64::MAX);
+        let mut receiver = compactor_manager.add_compactor(context_id, u64::MAX, 16);
         assert_eq!(compactor_manager.compactors.len(), 1);
         let compactor = compactor_manager.next_compactor().unwrap();
         // No compact task.
@@ -546,7 +608,7 @@ mod tests {
         let mut policy = RoundRobinPolicy::new();
         let mut receivers = vec![];
         for context_id in 0..5 {
-            receivers.push(policy.add_compactor(context_id, u64::MAX));
+            receivers.push(policy.add_compactor(context_id, u64::MAX, 16));
         }
         assert_eq!(policy.compactors.len(), 5);
         let task = dummy_compact_task(0, 1);
@@ -583,7 +645,7 @@ mod tests {
         assert!(policy.next_compactor().is_none());
 
         // Adding existing compactor does not change score.
-        policy.add_compactor(0, u64::MAX);
+        policy.add_compactor(0, u64::MAX, 16);
         assert_eq!(policy.score_to_compactor.len(), 1);
         assert_eq!(policy.context_id_to_score.len(), existing_tasks.len());
         assert_eq!(*policy.context_id_to_score.get(&0).unwrap(), 1);
@@ -596,11 +658,11 @@ mod tests {
         assert_eq!(policy.context_id_to_score.len(), 0);
         assert_eq!(policy.score_to_compactor.len(), 0);
 
-        policy.add_compactor(1, 1000);
+        policy.add_compactor(1, 1000, 1000);
         assert_eq!(policy.context_id_to_score.len(), 1);
         assert_eq!(policy.score_to_compactor.len(), 1);
         assert_eq!(policy.max_concurrent_task_num(), 1000);
-        let _receiver_2 = policy.add_compactor(2, 1000);
+        let _receiver_2 = policy.add_compactor(2, 1000, 1000);
         assert_eq!(policy.context_id_to_score.len(), 2);
         assert_eq!(policy.score_to_compactor.len(), 2);
         assert_eq!(policy.max_concurrent_task_num(), 2000);
@@ -614,7 +676,7 @@ mod tests {
         assert_eq!(policy.context_id_to_score.len(), 1);
         assert_eq!(policy.score_to_compactor.len(), 0);
 
-        let mut receiver = policy.add_compactor(1, 1000);
+        let mut receiver = policy.add_compactor(1, 1000, 1000);
         assert_eq!(policy.context_id_to_score.len(), 1);
         assert_eq!(policy.score_to_compactor.len(), 1);
         assert_eq!(policy.max_concurrent_task_num(), 1000);
@@ -666,7 +728,7 @@ mod tests {
 
         // Add 3 compactors.
         for context_id in 0..3 {
-            policy.add_compactor(context_id, u64::MAX);
+            policy.add_compactor(context_id, u64::MAX, 16);
         }
 
         let task1 = dummy_compact_task(0, 5);
@@ -723,7 +785,7 @@ mod tests {
 
         // Add 2 compactors.
         for context_id in 0..2 {
-            policy.add_compactor(context_id, 2);
+            policy.add_compactor(context_id, 2, 16);
         }
 
         let task1 = dummy_compact_task(0, 1);
diff --git a/src/meta/src/hummock/compaction_scheduler.rs b/src/meta/src/hummock/compaction_scheduler.rs
index 4b01b64130ed6..a4d1812ca9313 100644
--- a/src/meta/src/hummock/compaction_scheduler.rs
+++ b/src/meta/src/hummock/compaction_scheduler.rs
@@ -548,7 +548,7 @@ mod tests {
         let request_channel = Arc::new(CompactionRequestChannel::new(request_tx));
 
         // Add a compactor with invalid context_id.
-        let _receiver = compactor_manager.add_compactor(1234, 1);
+        let _receiver = compactor_manager.add_compactor(1234, 1, 1);
         assert_eq!(compactor_manager.compactor_num(), 1);
 
         // No task
@@ -582,7 +582,7 @@ mod tests {
         assert_eq!(compactor_manager.compactor_num(), 0);
 
         // Add a valid compactor and succeed
-        let _receiver = compactor_manager.add_compactor(context_id, 1);
+        let _receiver = compactor_manager.add_compactor(context_id, 1, 1);
         assert_eq!(compactor_manager.compactor_num(), 1);
         let compactor = hummock_manager.get_idle_compactor().await.unwrap();
         assert_eq!(
@@ -609,7 +609,7 @@ mod tests {
         assert_matches!(hummock_manager.get_idle_compactor().await, None);
 
         // Increase compactor concurrency and succeed
-        let _receiver = compactor_manager.add_compactor(context_id, 10);
+        let _receiver = compactor_manager.add_compactor(context_id, 10, 10);
         assert_eq!(
             hummock_manager.get_assigned_tasks_number(context_id).await,
             1
@@ -653,7 +653,7 @@ mod tests {
         let request_channel = Arc::new(CompactionRequestChannel::new(request_tx));
 
         let _sst_infos = add_ssts(1, hummock_manager.as_ref(), context_id).await;
-        let _receiver = compactor_manager.add_compactor(context_id, 1);
+        let _receiver = compactor_manager.add_compactor(context_id, 1, 1);
 
         // Pick failure
         let fp_get_compact_task = "fp_get_compact_task";
@@ -711,7 +711,7 @@ mod tests {
         // There is no idle compactor, because the compactor is paused after send failure.
         assert_matches!(hummock_manager.get_idle_compactor().await, None);
         assert!(hummock_manager.list_all_tasks_ids().await.is_empty());
-        let _receiver = compactor_manager.add_compactor(context_id, 1);
+        let _receiver = compactor_manager.add_compactor(context_id, 1, 1);
 
         // Assign failed and task cancellation failed.
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
diff --git a/src/meta/src/hummock/compactor_manager.rs b/src/meta/src/hummock/compactor_manager.rs
index 3425f0ae56db5..30e0507c70e5b 100644
--- a/src/meta/src/hummock/compactor_manager.rs
+++ b/src/meta/src/hummock/compactor_manager.rs
@@ -14,7 +14,7 @@
 
 use std::collections::{BTreeMap, HashMap};
 use std::ops::Deref;
-use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::atomic::{AtomicU32, AtomicU64, Ordering};
 use std::sync::Arc;
 use std::time::SystemTime;
 
@@ -25,7 +25,7 @@ use risingwave_hummock_sdk::compact::CompactorRuntimeConfig;
 use risingwave_hummock_sdk::{HummockCompactionTaskId, HummockContextId};
 use risingwave_pb::hummock::subscribe_compact_tasks_response::Task;
 use risingwave_pb::hummock::{
-    CancelCompactTask, CompactTask, CompactTaskAssignment, CompactTaskProgress,
+    CancelCompactTask, CompactTask, CompactTaskAssignment, CompactTaskProgress, CompactorWorkload,
     SubscribeCompactTasksResponse,
 };
 use tokio::sync::mpsc::{Receiver, Sender};
@@ -46,6 +46,9 @@ pub struct Compactor {
     context_id: HummockContextId,
     sender: Sender<MetaResult<SubscribeCompactTasksResponse>>,
     max_concurrent_task_number: AtomicU64,
+    // state
+    pub cpu_ratio: AtomicU32,
+    pub total_cpu_core: u32,
 }
 
 struct TaskHeartbeat {
@@ -60,11 +63,14 @@ impl Compactor {
         context_id: HummockContextId,
         sender: Sender<MetaResult<SubscribeCompactTasksResponse>>,
         max_concurrent_task_number: u64,
+        cpu_core_num: u32,
     ) -> Self {
         Self {
             context_id,
             sender,
             max_concurrent_task_number: AtomicU64::new(max_concurrent_task_number),
+            cpu_ratio: AtomicU32::new(0),
+            total_cpu_core: cpu_core_num,
         }
     }
 
@@ -105,6 +111,10 @@ impl Compactor {
         self.max_concurrent_task_number
             .store(config.max_concurrent_task_number, Ordering::Relaxed);
     }
+
+    pub fn is_busy(&self, limit: u32) -> bool {
+        self.cpu_ratio.load(Ordering::Acquire) > limit
+    }
 }
 
 /// `CompactorManager` maintains compactors which can process compact task.
@@ -198,10 +208,15 @@ impl CompactorManager {
         &self,
         context_id: HummockContextId,
         max_concurrent_task_number: u64,
+        cpu_core_num: u32,
     ) -> Receiver<MetaResult<SubscribeCompactTasksResponse>> {
         let mut policy = self.policy.write();
-        let rx = policy.add_compactor(context_id, max_concurrent_task_number);
-        tracing::info!("Added compactor session {}", context_id);
+        let rx = policy.add_compactor(context_id, max_concurrent_task_number, cpu_core_num);
+        tracing::info!(
+            "Added compactor session {} cpu_core_num {}",
+            context_id,
+            cpu_core_num
+        );
         rx
     }
 
@@ -395,6 +410,25 @@ impl CompactorManager {
     pub fn max_concurrent_task_number(&self) -> usize {
         self.policy.read().max_concurrent_task_num()
     }
+
+    /// Update compactor state based on its workload.
+    pub fn update_compactor_state(
+        &self,
+        context_id: HummockContextId,
+        workload: CompactorWorkload,
+    ) {
+        if let Some(compactor) = self.policy.read().get_compactor(context_id) {
+            compactor.cpu_ratio.store(workload.cpu, Ordering::Release);
+        }
+    }
+
+    pub fn total_cpu_core_num(&self) -> u32 {
+        self.policy.read().total_cpu_core_num()
+    }
+
+    pub fn total_running_cpu_core_num(&self) -> u32 {
+        self.policy.read().total_running_cpu_core_num()
+    }
 }
 
 #[cfg(test)]
@@ -416,7 +450,7 @@ mod tests {
             let context_id = worker_node.id;
             let compactor_manager = hummock_manager.compactor_manager_ref_for_test();
             let _sst_infos = add_ssts(1, hummock_manager.as_ref(), context_id).await;
-            let _receiver = compactor_manager.add_compactor(context_id, 1);
+            let _receiver = compactor_manager.add_compactor(context_id, 1, 1);
             let _compactor = hummock_manager.get_idle_compactor().await.unwrap();
             let task = hummock_manager
                 .get_compact_task(
@@ -484,7 +518,7 @@ mod tests {
         // Test add
         assert_eq!(compactor_manager.compactor_num(), 0);
         assert!(compactor_manager.get_compactor(context_id).is_none());
-        compactor_manager.add_compactor(context_id, 1);
+        compactor_manager.add_compactor(context_id, 1, 1);
         assert_eq!(compactor_manager.compactor_num(), 1);
         assert_eq!(
             compactor_manager
@@ -498,7 +532,7 @@ mod tests {
         assert_eq!(compactor_manager.compactor_num(), 0);
         assert!(compactor_manager.get_compactor(context_id).is_none());
         for _ in 0..3 {
-            compactor_manager.add_compactor(context_id, 1);
+            compactor_manager.add_compactor(context_id, 1, 1);
             assert_eq!(compactor_manager.compactor_num(), 1);
             assert_eq!(
                 compactor_manager
diff --git a/src/meta/src/hummock/manager/compaction_group_manager.rs b/src/meta/src/hummock/manager/compaction_group_manager.rs
index 92e11420043a3..19129fd789b9a 100644
--- a/src/meta/src/hummock/manager/compaction_group_manager.rs
+++ b/src/meta/src/hummock/manager/compaction_group_manager.rs
@@ -26,10 +26,11 @@ use risingwave_hummock_sdk::compaction_group::hummock_version_ext::{
 use risingwave_hummock_sdk::compaction_group::{StateTableId, StaticCompactionGroupId};
 use risingwave_hummock_sdk::CompactionGroupId;
 use risingwave_pb::hummock::group_delta::DeltaType;
+use risingwave_pb::hummock::hummock_version_delta::GroupDeltas;
 use risingwave_pb::hummock::rise_ctl_update_compaction_config_request::mutable_config::MutableConfig;
 use risingwave_pb::hummock::{
-    CompactionConfig, CompactionGroupInfo, GroupConstruct, GroupDelta, GroupDestroy,
-    GroupMetaChange,
+    compact_task, CompactionConfig, CompactionGroupInfo, GroupConstruct, GroupDelta, GroupDestroy,
+    GroupMetaChange, GroupTableChange,
 };
 use tokio::sync::{OnceCell, RwLock};
 
@@ -61,7 +62,7 @@ impl<S: MetaStore> HummockManager<S> {
     ) -> Result<RwLock<CompactionGroupManager>> {
         let compaction_group_manager = RwLock::new(CompactionGroupManager {
             compaction_groups: BTreeMap::new(),
-            provided_default_config_for_test: config,
+            default_config: config,
         });
         compaction_group_manager
             .write()
@@ -421,11 +422,24 @@ impl<S: MetaStore> HummockManager<S> {
 
     /// Splits a compaction group into two. The new one will contain `table_ids`.
     /// Returns the newly created compaction group id.
-    #[named]
     pub async fn split_compaction_group(
         &self,
         parent_group_id: CompactionGroupId,
         table_ids: &[StateTableId],
+    ) -> Result<CompactionGroupId> {
+        self.move_state_table_to_compaction_group(parent_group_id, table_ids, None, false)
+            .await
+    }
+
+    /// move some table to another compaction-group. Create a new compaction group if it does not
+    /// exist.
+    #[named]
+    pub async fn move_state_table_to_compaction_group(
+        &self,
+        parent_group_id: CompactionGroupId,
+        table_ids: &[StateTableId],
+        target_group_id: Option<CompactionGroupId>,
+        allow_split_by_table: bool,
     ) -> Result<CompactionGroupId> {
         if table_ids.is_empty() {
             return Ok(parent_group_id);
@@ -453,120 +467,176 @@ impl<S: MetaStore> HummockManager<S> {
                 parent_group_id
             )));
         }
+        if let Some(compaction_group_id) = target_group_id {
+            if !versioning.check_branched_sst_in_target_group(
+                &table_ids,
+                &parent_group_id,
+                &compaction_group_id,
+            ) {
+                return Err(Error::CompactionGroup(format!(
+                    "invalid split attempt for group {}: we shall wait some time for parent group and target group could compact stale sst files",
+                    parent_group_id
+                )));
+            }
+        }
 
         let mut new_version_delta = BTreeMapEntryTransaction::new_insert(
             &mut versioning.hummock_version_deltas,
             current_version.id + 1,
             build_version_delta_after_version(current_version),
         );
-
-        // Remove tables from parent group.
-        for table_id in &table_ids {
-            let group_deltas = &mut new_version_delta
-                .group_deltas
-                .entry(parent_group_id)
-                .or_default()
-                .group_deltas;
-            group_deltas.push(GroupDelta {
-                delta_type: Some(DeltaType::GroupMetaChange(GroupMetaChange {
-                    table_ids_remove: vec![*table_id],
-                    ..Default::default()
-                })),
-            });
-        }
-
-        // Add tables to new group.
-        let new_group_id = self
-            .env
-            .id_gen_manager()
-            .generate::<{ IdCategory::CompactionGroup }>()
-            .await?;
         let new_sst_start_id = self
             .env
             .id_gen_manager()
             .generate_interval::<{ IdCategory::HummockSstableId }>(
-                versioning.current_version.count_new_ssts_in_group_split(
+                current_version.count_new_ssts_in_group_split(
                     parent_group_id,
-                    &HashSet::from_iter(table_ids.iter().cloned()),
+                    HashSet::from_iter(table_ids.clone()),
                 ),
             )
             .await?;
-        let group_deltas = &mut new_version_delta
-            .group_deltas
-            .entry(new_group_id)
-            .or_default()
-            .group_deltas;
-        let config = self
-            .compaction_group_manager
-            .read()
-            .await
-            .get_compaction_group_config(new_group_id)
-            .compaction_config
-            .as_ref()
-            .clone();
-        group_deltas.push(GroupDelta {
-            delta_type: Some(DeltaType::GroupConstruct(GroupConstruct {
-                group_config: Some(config),
-                group_id: new_group_id,
-                parent_group_id,
-                table_ids,
-                new_sst_start_id,
-            })),
-        });
+        let mut new_group = None;
+        let target_compaction_group_id = match target_group_id {
+            Some(compaction_group_id) => {
+                match current_version.levels.get(&compaction_group_id) {
+                    Some(group) => {
+                        for table_id in &table_ids {
+                            if group.member_table_ids.contains(table_id) {
+                                return Err(Error::CompactionGroup(format!(
+                                    "table {} already exist in group {}",
+                                    *table_id, compaction_group_id,
+                                )));
+                            }
+                        }
+                    }
+                    None => {
+                        return Err(Error::CompactionGroup(format!(
+                            "target group {} does not exist",
+                            compaction_group_id,
+                        )));
+                    }
+                }
+                let group_deltas = &mut new_version_delta
+                    .group_deltas
+                    .entry(compaction_group_id)
+                    .or_default()
+                    .group_deltas;
+                group_deltas.push(GroupDelta {
+                    delta_type: Some(DeltaType::GroupTableChange(GroupTableChange {
+                        table_ids: table_ids.to_vec(),
+                        origin_group_id: parent_group_id,
+                        target_group_id: compaction_group_id,
+                        new_sst_start_id,
+                    })),
+                });
+                compaction_group_id
+            }
+            None => {
+                // All NewCompactionGroup pairs are mapped to one new compaction group.
+                let new_compaction_group_id = self
+                    .env
+                    .id_gen_manager()
+                    .generate::<{ IdCategory::CompactionGroup }>()
+                    .await?;
+                let mut config = self
+                    .compaction_group_manager
+                    .read()
+                    .await
+                    .get_default_compaction_group_config();
+                config.split_by_state_table = allow_split_by_table;
+
+                new_version_delta.group_deltas.insert(
+                    new_compaction_group_id,
+                    GroupDeltas {
+                        group_deltas: vec![GroupDelta {
+                            delta_type: Some(DeltaType::GroupConstruct(GroupConstruct {
+                                group_config: Some(config.clone()),
+                                group_id: new_compaction_group_id,
+                                parent_group_id,
+                                new_sst_start_id,
+                                table_ids: table_ids.to_vec(),
+                            })),
+                        }],
+                    },
+                );
 
+                new_group = Some((new_compaction_group_id, config));
+                new_version_delta.group_deltas.insert(
+                    parent_group_id,
+                    GroupDeltas {
+                        group_deltas: vec![GroupDelta {
+                            delta_type: Some(DeltaType::GroupMetaChange(GroupMetaChange {
+                                table_ids_remove: table_ids.to_vec(),
+                                ..Default::default()
+                            })),
+                        }],
+                    },
+                );
+                new_compaction_group_id
+            }
+        };
         let mut branched_ssts = BTreeMapTransaction::new(&mut versioning.branched_ssts);
         let mut trx = Transaction::default();
         new_version_delta.apply_to_txn(&mut trx)?;
-        self.env.meta_store().txn(trx).await?;
+        if let Some((new_compaction_group_id, config)) = new_group {
+            let mut compaction_group_manager = self.compaction_group_manager.write().await;
+            let insert = BTreeMapEntryTransaction::new_insert(
+                &mut compaction_group_manager.compaction_groups,
+                new_compaction_group_id,
+                CompactionGroup {
+                    group_id: new_compaction_group_id,
+                    compaction_config: Arc::new(config),
+                },
+            );
+            insert.apply_to_txn(&mut trx)?;
+            self.env.meta_store().txn(trx).await?;
+            insert.commit();
+        } else {
+            self.env.meta_store().txn(trx).await?;
+        }
         let sst_split_info = versioning
             .current_version
             .apply_version_delta(&new_version_delta);
         // Updates SST split info
-        for (object_id, sst_id, parent_old_sst_id, parent_new_sst_id) in sst_split_info {
+        for (object_id, sst_id, _parent_old_sst_id, parent_new_sst_id) in sst_split_info {
             match branched_ssts.get_mut(object_id) {
                 Some(mut entry) => {
-                    let p = entry.get_mut(&parent_group_id).unwrap();
-                    let parent_pos = p.iter().position(|id| *id == parent_old_sst_id).unwrap();
                     if let Some(parent_new_sst_id) = parent_new_sst_id {
-                        p[parent_pos] = parent_new_sst_id;
+                        entry.insert(parent_group_id, parent_new_sst_id);
                     } else {
-                        p.remove(parent_pos);
-                        if p.is_empty() {
-                            entry.remove(&parent_group_id);
-                        }
+                        entry.remove(&parent_group_id);
                     }
-                    entry.entry(new_group_id).or_default().push(sst_id);
+                    entry.insert(target_compaction_group_id, sst_id);
                 }
                 None => {
-                    branched_ssts.insert(
-                        object_id,
-                        if let Some(parent_new_sst_id) = parent_new_sst_id {
-                            [
-                                (parent_group_id, vec![parent_new_sst_id]),
-                                (new_group_id, vec![sst_id]),
-                            ]
-                            .into_iter()
-                            .collect()
-                        } else {
-                            [(new_group_id, vec![sst_id])].into_iter().collect()
-                        },
-                    );
+                    let mut groups = HashMap::from_iter([(target_compaction_group_id, sst_id)]);
+                    if let Some(parent_new_sst_id) = parent_new_sst_id {
+                        groups.insert(parent_group_id, parent_new_sst_id);
+                    }
+                    branched_ssts.insert(object_id, groups);
                 }
             }
         }
         new_version_delta.commit();
         branched_ssts.commit_memory();
         self.notify_last_version_delta(versioning);
-
-        Ok(new_group_id)
+        // Don't trigger compactions if we enable deterministic compaction
+        if !self.env.opts.compaction_deterministic_test {
+            // commit_epoch may contains SSTs from any compaction group
+            self.try_send_compaction_request(parent_group_id, compact_task::TaskType::SpaceReclaim);
+            self.try_send_compaction_request(
+                target_compaction_group_id,
+                compact_task::TaskType::SpaceReclaim,
+            );
+        }
+        Ok(target_compaction_group_id)
     }
 }
 
 #[derive(Default)]
 pub(super) struct CompactionGroupManager {
     compaction_groups: BTreeMap<CompactionGroupId, CompactionGroup>,
-    /// Provided default config, only used in test.
-    provided_default_config_for_test: CompactionConfig,
+    default_config: CompactionConfig,
 }
 
 impl CompactionGroupManager {
@@ -602,14 +672,20 @@ impl CompactionGroupManager {
         compaction_group_ids
             .iter()
             .map(|id| {
-                let group = self.compaction_groups.get(id).cloned().unwrap_or_else(|| {
-                    CompactionGroup::new(*id, self.provided_default_config_for_test.clone())
-                });
+                let group = self
+                    .compaction_groups
+                    .get(id)
+                    .cloned()
+                    .unwrap_or_else(|| CompactionGroup::new(*id, self.default_config.clone()));
                 (*id, group)
             })
             .collect()
     }
 
+    fn get_default_compaction_group_config(&self) -> CompactionConfig {
+        self.default_config.clone()
+    }
+
     async fn update_compaction_config<S: MetaStore>(
         &mut self,
         compaction_group_ids: &[CompactionGroupId],
@@ -621,10 +697,7 @@ impl CompactionGroupManager {
             if !compaction_groups.contains_key(compaction_group_id) {
                 compaction_groups.insert(
                     *compaction_group_id,
-                    CompactionGroup::new(
-                        *compaction_group_id,
-                        self.provided_default_config_for_test.clone(),
-                    ),
+                    CompactionGroup::new(*compaction_group_id, self.default_config.clone()),
                 );
             }
             let group = compaction_groups.get(compaction_group_id).unwrap();
diff --git a/src/meta/src/hummock/manager/mod.rs b/src/meta/src/hummock/manager/mod.rs
index 70bf0c797f267..c2e1aefabc0cb 100644
--- a/src/meta/src/hummock/manager/mod.rs
+++ b/src/meta/src/hummock/manager/mod.rs
@@ -29,7 +29,7 @@ use risingwave_common::util::epoch::{Epoch, INVALID_EPOCH};
 use risingwave_hummock_sdk::compact::compact_task_to_string;
 use risingwave_hummock_sdk::compaction_group::hummock_version_ext::{
     add_new_sub_level, build_initial_compaction_group_levels, build_version_delta_after_version,
-    get_compaction_group_ids, get_member_table_ids, try_get_compaction_group_id_by_table_id,
+    get_compaction_group_ids, try_get_compaction_group_id_by_table_id, BranchedSstInfo,
     HummockVersionExt, HummockVersionUpdateExt,
 };
 use risingwave_hummock_sdk::{
@@ -52,7 +52,7 @@ use tokio::sync::{Notify, RwLockWriteGuard};
 use tokio::task::JoinHandle;
 
 use crate::hummock::compaction::{
-    CompactStatus, LevelSelector, LocalSelectorStatistic, ManualCompactionOption,
+    CompactStatus, LocalSelectorStatistic, ManualCompactionOption, ScaleCompactorInfo,
 };
 use crate::hummock::compaction_scheduler::CompactionRequestChannelRef;
 use crate::hummock::error::{Error, Result};
@@ -91,7 +91,7 @@ type Snapshot = ArcSwap<HummockSnapshot>;
 // - Call `commit_multi_var` to commit the changes via meta store transaction. If transaction
 //   succeeds, the in-mem state will be updated by the way.
 pub struct HummockManager<S: MetaStore> {
-    env: MetaSrvEnv<S>,
+    pub env: MetaSrvEnv<S>,
     cluster_manager: ClusterManagerRef<S>,
     catalog_manager: CatalogManagerRef<S>,
     // `CompactionGroupManager` manages `CompactionGroup`'s members.
@@ -112,7 +112,7 @@ pub struct HummockManager<S: MetaStore> {
     compaction_resume_notifier: parking_lot::RwLock<Option<Arc<Notify>>>,
     compaction_tasks_to_cancel: parking_lot::Mutex<Vec<HummockCompactionTaskId>>,
 
-    compactor_manager: CompactorManagerRef,
+    pub compactor_manager: CompactorManagerRef,
     event_sender: HummockManagerEventSender,
 }
 
@@ -161,11 +161,12 @@ macro_rules! read_lock {
 pub(crate) use read_lock;
 use risingwave_hummock_sdk::compaction_group::{StateTableId, StaticCompactionGroupId};
 use risingwave_hummock_sdk::table_stats::{
-    add_prost_table_stats_map, purge_prost_table_stats, ProstTableStatsMap,
+    add_prost_table_stats_map, purge_prost_table_stats, PbTableStatsMap,
 };
 use risingwave_pb::catalog::Table;
 use risingwave_pb::hummock::version_update_payload::Payload;
-use risingwave_pb::hummock::CompactionGroupInfo as ProstCompactionGroup;
+use risingwave_pb::hummock::PbCompactionGroupInfo;
+use risingwave_pb::meta::relation::RelationInfo;
 
 /// Acquire write lock of the lock with `lock_name`.
 /// The macro will use macro `function_name` to get the name of the function of method that calls
@@ -194,13 +195,13 @@ macro_rules! start_measure_real_process_timer {
 }
 pub(crate) use start_measure_real_process_timer;
 
-use super::compaction::ManualCompactionSelector;
+use super::compaction::{LevelSelector, ManualCompactionSelector};
 use super::Compactor;
 use crate::hummock::compaction::compaction_config::CompactionConfigBuilder;
 use crate::hummock::manager::compaction_group_manager::CompactionGroupManager;
 use crate::hummock::manager::worker::HummockManagerEventSender;
 
-static CANCEL_STATUS_SET: LazyLock<HashSet<TaskStatus>> = LazyLock::new(|| {
+pub static CANCEL_STATUS_SET: LazyLock<HashSet<TaskStatus>> = LazyLock::new(|| {
     [
         TaskStatus::ManualCanceled,
         TaskStatus::SendFailCanceled,
@@ -787,6 +788,7 @@ where
                 .values()
                 .map(|v| v.minimal_pinned_snapshot)
                 .fold(max_committed_epoch, std::cmp::min);
+
             (versioning_guard.current_version.clone(), watermark)
         };
         if current_version.levels.get(&compaction_group_id).is_none() {
@@ -821,6 +823,12 @@ where
             Some(task) => task,
         };
         compact_task.watermark = watermark;
+        compact_task.existing_table_ids = current_version
+            .levels
+            .get(&compaction_group_id)
+            .unwrap()
+            .member_table_ids
+            .clone();
 
         if CompactStatus::is_trivial_move_task(&compact_task) && can_trivial_move {
             compact_task.sorted_output_ssts = compact_task.input_ssts[0].table_infos.clone();
@@ -837,26 +845,6 @@ where
                 start_time.elapsed()
             );
         } else {
-            let all_table_ids = get_member_table_ids(&current_version);
-            // to get all relational table_id from sst_info
-            let table_ids = compact_task
-                .input_ssts
-                .iter()
-                .flat_map(|level| {
-                    level
-                        .table_infos
-                        .iter()
-                        .flat_map(|sst_info| sst_info.table_ids.iter().cloned())
-                        .collect_vec()
-                })
-                .collect::<HashSet<u32>>();
-            for table_id in table_ids {
-                // to found exist table_id from
-                if all_table_ids.contains(&table_id) {
-                    compact_task.existing_table_ids.push(table_id);
-                }
-            }
-
             compact_task.table_options = table_id_to_option
                 .into_iter()
                 .filter_map(|(table_id, table_option)| {
@@ -1045,19 +1033,14 @@ where
 
     fn is_compact_task_expired(
         compact_task: &CompactTask,
-        branched_ssts: &BTreeMap<
-            HummockSstableObjectId,
-            BTreeMap<CompactionGroupId, Vec<HummockSstableId>>,
-        >,
+        branched_ssts: &BTreeMap<HummockSstableObjectId, BranchedSstInfo>,
     ) -> bool {
         for input_level in compact_task.get_input_ssts() {
             for table_info in input_level.get_table_infos() {
                 if let Some(mp) = branched_ssts.get(&table_info.object_id) {
                     if mp
                         .get(&compact_task.compaction_group_id)
-                        .map_or(true, |sst_id_vec| {
-                            !sst_id_vec.iter().contains(&table_info.sst_id)
-                        })
+                        .map_or(true, |sst_id| *sst_id != table_info.sst_id)
                     {
                         return true;
                     }
@@ -1071,7 +1054,7 @@ where
         &self,
         context_id: HummockContextId,
         compact_task: &mut CompactTask,
-        table_stats_change: Option<ProstTableStatsMap>,
+        table_stats_change: Option<PbTableStatsMap>,
     ) -> Result<bool> {
         let ret = self
             .report_compact_task_impl(Some(context_id), compact_task, None, table_stats_change)
@@ -1093,7 +1076,7 @@ where
         context_id: Option<HummockContextId>,
         compact_task: &mut CompactTask,
         compaction_guard: Option<RwLockWriteGuard<'_, Compaction>>,
-        table_stats_change: Option<ProstTableStatsMap>,
+        table_stats_change: Option<PbTableStatsMap>,
     ) -> Result<bool> {
         let mut compaction_guard = match compaction_guard {
             None => write_lock!(self, compaction).await,
@@ -1159,9 +1142,12 @@ where
                 }
             }
             let is_success = if let TaskStatus::Success = compact_task.task_status() {
-                let is_expired = !current_version
-                    .get_levels()
-                    .contains_key(&compact_task.compaction_group_id)
+                // if member_table_ids changes, the data of sstable may stale.
+                let is_expired = current_version
+                    .levels
+                    .get(&compact_task.compaction_group_id)
+                    .map(|group| group.member_table_ids != compact_task.existing_table_ids)
+                    .unwrap_or(true)
                     || Self::is_compact_task_expired(compact_task, &versioning.branched_ssts);
                 if is_expired {
                     compact_task.set_task_status(TaskStatus::InvalidGroupCanceled);
@@ -1345,7 +1331,7 @@ where
         .await?;
 
         // Consume and aggregate table stats.
-        let mut table_stats_change = ProstTableStatsMap::default();
+        let mut table_stats_change = PbTableStatsMap::default();
         for s in &mut sstables {
             add_prost_table_stats_map(&mut table_stats_change, &std::mem::take(&mut s.table_stats));
         }
@@ -1376,7 +1362,7 @@ where
                     None => false,
                 };
             if !is_sst_belong_to_group_declared {
-                let mut group_table_ids: BTreeMap<_, Vec<_>> = BTreeMap::new();
+                let mut group_table_ids: BTreeMap<_, Vec<u32>> = BTreeMap::new();
                 for table_id in sst.get_table_ids() {
                     match try_get_compaction_group_id_by_table_id(
                         &versioning.current_version,
@@ -1418,15 +1404,14 @@ where
         let mut branched_ssts = BTreeMapTransaction::new(&mut versioning.branched_ssts);
         let mut branch_sstables = Vec::with_capacity(new_sst_id_number);
         for (sst, group_table_ids) in incorrect_ssts {
-            let mut branch_groups = BTreeMap::new();
-            for (group_id, match_ids) in group_table_ids {
+            let mut branch_groups = HashMap::new();
+            for (group_id, _match_ids) in group_table_ids {
                 let mut branch_sst = sst.clone();
                 branch_sst.sst_id = new_sst_id;
-                branch_sst.table_ids = match_ids;
                 branch_sstables.push(ExtendedSstableInfo::with_compaction_group(
                     group_id, branch_sst,
                 ));
-                branch_groups.insert(group_id, vec![new_sst_id]);
+                branch_groups.insert(group_id, new_sst_id);
                 new_sst_id += 1;
             }
             if !branch_groups.is_empty() {
@@ -1640,24 +1625,31 @@ where
                 let checkpoint_version_copy = versioning_guard.checkpoint_version.clone();
                 let hummock_version_deltas_copy = versioning_guard.hummock_version_deltas.clone();
                 let version_stats_copy = versioning_guard.version_stats.clone();
+                let branched_ssts = versioning_guard.branched_ssts.clone();
                 (
-                    compact_statuses_copy,
-                    compact_task_assignment_copy,
-                    pinned_versions_copy,
-                    pinned_snapshots_copy,
-                    checkpoint_version_copy,
-                    hummock_version_deltas_copy,
-                    version_stats_copy,
+                    (
+                        compact_statuses_copy,
+                        compact_task_assignment_copy,
+                        pinned_versions_copy,
+                        pinned_snapshots_copy,
+                        checkpoint_version_copy,
+                        hummock_version_deltas_copy,
+                        version_stats_copy,
+                    ),
+                    branched_ssts,
                 )
             };
-        let mem_state = get_state(compaction_guard.borrow(), versioning_guard.borrow());
+        let (mem_state, branched_ssts) =
+            get_state(compaction_guard.borrow(), versioning_guard.borrow());
         self.load_meta_store_state_impl(
             compaction_guard.borrow_mut(),
             versioning_guard.borrow_mut(),
         )
         .await
         .expect("Failed to load state from meta store");
-        let loaded_state = get_state(compaction_guard.borrow(), versioning_guard.borrow());
+        let (loaded_state, load_branched_ssts) =
+            get_state(compaction_guard.borrow(), versioning_guard.borrow());
+        assert_eq!(branched_ssts, load_branched_ssts);
         assert_eq!(
             mem_state, loaded_state,
             "hummock in-mem state is inconsistent with meta store state",
@@ -1671,6 +1663,13 @@ where
         read_lock!(self, versioning).await.current_version.clone()
     }
 
+    /// Gets branched sstable infos
+    /// Should not be called inside [`HummockManager`], because it requests locks internally.
+    #[named]
+    pub async fn get_branched_ssts_info(&self) -> BTreeMap<HummockSstableId, BranchedSstInfo> {
+        read_lock!(self, versioning).await.branched_ssts.clone()
+    }
+
     /// Get version deltas from meta store
     #[cfg_attr(coverage, no_coverage)]
     pub async fn list_version_deltas(
@@ -1700,7 +1699,7 @@ where
     pub async fn init_metadata_for_version_replay(
         &self,
         table_catalogs: Vec<Table>,
-        compaction_groups: Vec<ProstCompactionGroup>,
+        compaction_groups: Vec<PbCompactionGroupInfo>,
     ) -> Result<()> {
         for table in &table_catalogs {
             table.insert(self.env.meta_store()).await?;
@@ -1734,11 +1733,11 @@ where
         for table in table_catalogs {
             self.env
                 .notification_manager()
-                .notify_hummock(Operation::Add, Info::Table(table.clone()))
+                .notify_hummock_relation_info(Operation::Add, RelationInfo::Table(table.clone()))
                 .await;
             self.env
                 .notification_manager()
-                .notify_compactor(Operation::Add, Info::Table(table))
+                .notify_compactor_relation_info(Operation::Add, RelationInfo::Table(table))
                 .await;
         }
 
@@ -1982,6 +1981,50 @@ where
         &self.cluster_manager
     }
 
+    pub async fn report_scale_compactor_info(&self) {
+        let info = self.get_scale_compactor_info().await;
+        let suggest_scale_out_core = info.scale_out_cores();
+        self.metrics
+            .scale_compactor_core_num
+            .set(suggest_scale_out_core as i64);
+
+        tracing::debug!(
+            "report_scale_compactor_info {:?} suggest_scale_out_core {:?}",
+            info,
+            suggest_scale_out_core
+        );
+    }
+
+    #[named]
+    pub async fn get_scale_compactor_info(&self) -> ScaleCompactorInfo {
+        let total_cpu_core = self.compactor_manager.total_cpu_core_num();
+        let total_running_cpu_core = self.compactor_manager.total_running_cpu_core_num();
+        let version = {
+            let guard = read_lock!(self, versioning).await;
+            guard.current_version.clone()
+        };
+        let mut global_info = ScaleCompactorInfo {
+            total_cores: total_cpu_core as u64,
+            running_cores: total_running_cpu_core as u64,
+            ..Default::default()
+        };
+
+        let compaction = read_lock!(self, compaction).await;
+        for (group_id, status) in &compaction.compaction_statuses {
+            if let Some(levels) = version.levels.get(group_id) {
+                let cg = self
+                    .compaction_group_manager
+                    .read()
+                    .await
+                    .get_compaction_group_config(*group_id);
+                let info = status.get_compaction_info(levels, cg.compaction_config());
+                global_info.add(&info);
+                tracing::debug!("cg {} info {:?}", group_id, info);
+            }
+        }
+        global_info
+    }
+
     fn notify_last_version_delta(&self, versioning: &Versioning) {
         self.env
             .notification_manager()
@@ -2016,30 +2059,37 @@ where
                     }
                 }
 
-                let id_to_config = hummock_manager.get_compaction_group_map().await;
-                let current_version = {
-                    let mut versioning_guard =
-                        write_lock!(hummock_manager.as_ref(), versioning).await;
-                    versioning_guard.deref_mut().current_version.clone()
-                };
+                {
+                    let id_to_config = hummock_manager.get_compaction_group_map().await;
+                    let current_version = {
+                        let mut versioning_guard =
+                            write_lock!(hummock_manager.as_ref(), versioning).await;
+                        versioning_guard.deref_mut().current_version.clone()
+                    };
+
+                    let compaction_group_ids_from_version =
+                        get_compaction_group_ids(&current_version);
+                    let default_config = CompactionConfigBuilder::new().build();
+                    for compaction_group_id in &compaction_group_ids_from_version {
+                        let compaction_group_config = id_to_config
+                            .get(compaction_group_id)
+                            .cloned()
+                            .unwrap_or_else(|| {
+                                CompactionGroup::new(*compaction_group_id, default_config.clone())
+                            });
+
+                        trigger_lsm_stat(
+                            &hummock_manager.metrics,
+                            compaction_group_config.compaction_config(),
+                            current_version
+                                .get_compaction_group_levels(compaction_group_config.group_id()),
+                            compaction_group_config.group_id(),
+                        )
+                    }
+                }
 
-                let compaction_group_ids_from_version = get_compaction_group_ids(&current_version);
-                let default_config = CompactionConfigBuilder::new().build();
-                for compaction_group_id in &compaction_group_ids_from_version {
-                    let compaction_group_config = id_to_config
-                        .get(compaction_group_id)
-                        .cloned()
-                        .unwrap_or_else(|| {
-                            CompactionGroup::new(*compaction_group_id, default_config.clone())
-                        });
-
-                    trigger_lsm_stat(
-                        &hummock_manager.metrics,
-                        compaction_group_config.compaction_config(),
-                        current_version
-                            .get_compaction_group_levels(compaction_group_config.group_id()),
-                        compaction_group_config.group_id(),
-                    )
+                {
+                    hummock_manager.report_scale_compactor_info().await;
                 }
             }
         });
@@ -2048,27 +2098,20 @@ where
 }
 
 fn drop_sst(
-    branched_ssts: &mut BTreeMapTransaction<
-        '_,
-        HummockSstableObjectId,
-        BTreeMap<CompactionGroupId, Vec<HummockSstableId>>,
-    >,
+    branched_ssts: &mut BTreeMapTransaction<'_, HummockSstableObjectId, BranchedSstInfo>,
     group_id: CompactionGroupId,
     object_id: HummockSstableObjectId,
     sst_id: HummockSstableId,
 ) -> bool {
     match branched_ssts.get_mut(object_id) {
         Some(mut entry) => {
-            let sst_id_vec = entry.get_mut(&group_id).unwrap();
-            sst_id_vec.remove(sst_id_vec.iter().position(|id| *id == sst_id).unwrap());
-            if sst_id_vec.is_empty() {
-                entry.remove(&group_id);
-                if entry.is_empty() {
-                    branched_ssts.remove(object_id);
-                    true
-                } else {
-                    false
-                }
+            // if group_id not exist, it would not pass the stale check before.
+            let removed_sst_id = entry.get(&group_id).unwrap();
+            assert_eq!(*removed_sst_id, sst_id);
+            entry.remove(&group_id);
+            if entry.is_empty() {
+                branched_ssts.remove(object_id);
+                true
             } else {
                 false
             }
@@ -2079,11 +2122,7 @@ fn drop_sst(
 
 fn gen_version_delta<'a>(
     txn: &mut BTreeMapTransaction<'a, HummockVersionId, HummockVersionDelta>,
-    branched_ssts: &mut BTreeMapTransaction<
-        'a,
-        HummockSstableObjectId,
-        BTreeMap<CompactionGroupId, Vec<HummockSstableId>>,
-    >,
+    branched_ssts: &mut BTreeMapTransaction<'a, HummockSstableObjectId, BranchedSstInfo>,
     old_version: &HummockVersion,
     compact_task: &CompactTask,
     trivial_move: bool,
diff --git a/src/meta/src/hummock/manager/tests.rs b/src/meta/src/hummock/manager/tests.rs
index 8a26c17cf2181..0181cf0b5be71 100644
--- a/src/meta/src/hummock/manager/tests.rs
+++ b/src/meta/src/hummock/manager/tests.rs
@@ -21,13 +21,13 @@ use itertools::Itertools;
 use risingwave_common::util::epoch::INVALID_EPOCH;
 use risingwave_hummock_sdk::compact::compact_task_to_string;
 use risingwave_hummock_sdk::compaction_group::hummock_version_ext::{
-    get_compaction_group_ids, get_compaction_group_ssts, HummockVersionExt,
+    get_compaction_group_ids, get_compaction_group_ssts, BranchedSstInfo, HummockVersionExt,
 };
 use risingwave_hummock_sdk::compaction_group::StaticCompactionGroupId;
 use risingwave_hummock_sdk::table_stats::{to_prost_table_stats_map, TableStats, TableStatsMap};
 use risingwave_hummock_sdk::{
-    CompactionGroupId, ExtendedSstableInfo, HummockContextId, HummockEpoch, HummockSstableId,
-    HummockSstableObjectId, HummockVersionId, LocalSstableInfo, FIRST_VERSION_ID,
+    CompactionGroupId, ExtendedSstableInfo, HummockContextId, HummockEpoch, HummockSstableObjectId,
+    HummockVersionId, LocalSstableInfo, FIRST_VERSION_ID,
 };
 use risingwave_pb::common::{HostAddress, WorkerType};
 use risingwave_pb::hummock::compact_task::TaskStatus;
@@ -37,7 +37,9 @@ use risingwave_pb::hummock::{
     KeyRange, SstableInfo,
 };
 
-use crate::hummock::compaction::{default_level_selector, ManualCompactionOption};
+use crate::hummock::compaction::{
+    default_level_selector, LevelSelector, ManualCompactionOption, SpaceReclaimCompactionSelector,
+};
 use crate::hummock::error::Error;
 use crate::hummock::test_utils::*;
 use crate::hummock::{
@@ -58,6 +60,34 @@ fn pin_snapshots_epoch(pin_snapshots: &[HummockPinnedSnapshot]) -> Vec<u64> {
         .collect_vec()
 }
 
+fn gen_sstable_info(sst_id: u64, idx: usize, table_ids: Vec<u32>) -> SstableInfo {
+    SstableInfo {
+        sst_id,
+        key_range: Some(KeyRange {
+            left: iterator_test_key_of_epoch(1, idx, 1),
+            right: iterator_test_key_of_epoch(1, idx, 1),
+            right_exclusive: false,
+        }),
+        table_ids,
+        object_id: sst_id,
+        min_epoch: 20,
+        max_epoch: 20,
+        ..Default::default()
+    }
+}
+
+fn gen_extend_sstable_info(
+    sst_id: u64,
+    group_id: u64,
+    idx: usize,
+    table_ids: Vec<u32>,
+) -> ExtendedSstableInfo {
+    ExtendedSstableInfo {
+        compaction_group_id: group_id,
+        sst_info: gen_sstable_info(sst_id, idx, table_ids),
+        table_stats: Default::default(),
+    }
+}
 fn get_compaction_group_object_ids(
     version: &HummockVersion,
     group_id: CompactionGroupId,
@@ -165,7 +195,7 @@ async fn test_hummock_compaction_task() {
         .unwrap();
     // Get the compactor and assign task.
     let compactor_manager = hummock_manager.compactor_manager_ref_for_test();
-    compactor_manager.add_compactor(worker_node.id, u64::MAX);
+    compactor_manager.add_compactor(worker_node.id, u64::MAX, 16);
     let compactor = hummock_manager.get_idle_compactor().await.unwrap();
     hummock_manager
         .assign_compaction_task(&compact_task, compactor.context_id())
@@ -811,7 +841,7 @@ async fn test_trigger_manual_compaction() {
 
     // No compaction task available.
     let compactor_manager_ref = hummock_manager.compactor_manager_ref_for_test();
-    let receiver = compactor_manager_ref.add_compactor(context_id, u64::MAX);
+    let receiver = compactor_manager_ref.add_compactor(context_id, u64::MAX, 16);
     {
         let option = ManualCompactionOption::default();
         // to check no compaction task
@@ -840,7 +870,7 @@ async fn test_trigger_manual_compaction() {
     }
 
     compactor_manager_ref.remove_compactor(context_id);
-    let _receiver = compactor_manager_ref.add_compactor(context_id, u64::MAX);
+    let _receiver = compactor_manager_ref.add_compactor(context_id, u64::MAX, 16);
 
     {
         let option = ManualCompactionOption {
@@ -889,7 +919,7 @@ async fn test_trigger_compaction_deterministic() {
         compactor_manager_ref.clone(),
     ));
 
-    let _ = compactor_manager_ref.add_compactor(context_id, u64::MAX);
+    let _ = compactor_manager_ref.add_compactor(context_id, u64::MAX, 16);
     let (_handle, shutdown_tx) = start_compaction_scheduler(compaction_scheduler);
 
     // Generate data for compaction task
@@ -920,7 +950,7 @@ async fn test_hummock_compaction_task_heartbeat() {
     let sst_num = 2;
 
     let compactor_manager = hummock_manager.compactor_manager_ref_for_test();
-    let _tx = compactor_manager.add_compactor(context_id, 100);
+    let _tx = compactor_manager.add_compactor(context_id, 100, 100);
     let (join_handle, shutdown_tx) =
         HummockManager::start_compaction_heartbeat(hummock_manager.clone()).await;
 
@@ -1047,7 +1077,7 @@ async fn test_hummock_compaction_task_heartbeat_removal_on_node_removal() {
     let sst_num = 2;
 
     let compactor_manager = hummock_manager.compactor_manager_ref_for_test();
-    let _tx = compactor_manager.add_compactor(context_id, 100);
+    let _tx = compactor_manager.add_compactor(context_id, 100, 100);
     let (join_handle, shutdown_tx) =
         HummockManager::start_compaction_heartbeat(hummock_manager.clone()).await;
 
@@ -1254,7 +1284,7 @@ async fn test_version_stats() {
     // Report compaction
     hummock_manager
         .compactor_manager_ref_for_test()
-        .add_compactor(worker_node.id, u64::MAX);
+        .add_compactor(worker_node.id, u64::MAX, 16);
     let compactor = hummock_manager.get_idle_compactor().await.unwrap();
     let mut compact_task = hummock_manager
         .get_compact_task(
@@ -1387,7 +1417,7 @@ async fn test_split_compaction_group_on_commit() {
 
 async fn get_branched_ssts<S: MetaStore>(
     hummock_manager: &HummockManager<S>,
-) -> BTreeMap<HummockSstableObjectId, BTreeMap<CompactionGroupId, Vec<HummockSstableId>>> {
+) -> BTreeMap<HummockSstableObjectId, BranchedSstInfo> {
     hummock_manager
         .versioning
         .read(&["", "", ""])
@@ -1528,7 +1558,7 @@ async fn test_split_compaction_group_on_demand_basic() {
                 .get(&new_group_id)
                 .cloned()
                 .unwrap(),
-            vec![object_id],
+            object_id,
             "trivial adjust should also generate a new SST id"
         );
     }
@@ -1597,7 +1627,7 @@ async fn test_split_compaction_group_on_demand_non_trivial() {
     assert_eq!(branched_ssts.len(), 1);
     assert_eq!(branched_ssts.get(&10).unwrap().len(), 2);
     let sst_ids = branched_ssts.get(&10).unwrap().get(&2).cloned().unwrap();
-    assert_ne!(sst_ids, vec![10]);
+    assert_ne!(sst_ids, 10);
     assert_ne!(
         branched_ssts
             .get(&10)
@@ -1607,15 +1637,6 @@ async fn test_split_compaction_group_on_demand_non_trivial() {
             .unwrap(),
         sst_ids,
     );
-    assert_ne!(
-        branched_ssts
-            .get(&10)
-            .unwrap()
-            .get(&new_group_id)
-            .cloned()
-            .unwrap(),
-        vec![10],
-    );
 }
 
 async fn get_manual_compact_task<S: MetaStore>(
@@ -1624,7 +1645,7 @@ async fn get_manual_compact_task<S: MetaStore>(
 ) -> CompactTask {
     hummock_manager
         .compactor_manager
-        .add_compactor(context_id, 1);
+        .add_compactor(context_id, 1, 1);
     let compaction_task = hummock_manager
         .manual_get_compact_task(
             2,
@@ -1685,8 +1706,8 @@ async fn test_split_compaction_group_on_demand_bottom_levels() {
     assert_eq!(compaction_task.target_level, base_level as u32);
     compaction_task.sorted_output_ssts = vec![
         SstableInfo {
-            object_id: sst_1.sst_info.get_object_id() + 1,
-            sst_id: sst_1.sst_info.get_object_id() + 1,
+            object_id: 11,
+            sst_id: 11,
             table_ids: vec![100, 101],
             key_range: Some(KeyRange {
                 left: iterator_test_key_of_epoch(1, 1, 1),
@@ -1696,8 +1717,8 @@ async fn test_split_compaction_group_on_demand_bottom_levels() {
             ..Default::default()
         },
         SstableInfo {
-            object_id: sst_1.sst_info.get_object_id() + 2,
-            sst_id: sst_1.sst_info.get_object_id() + 2,
+            object_id: 12,
+            sst_id: 12,
             table_ids: vec![100],
             key_range: Some(KeyRange {
                 left: iterator_test_key_of_epoch(1, 2, 2),
@@ -1739,10 +1760,24 @@ async fn test_split_compaction_group_on_demand_bottom_levels() {
             .len(),
         1
     );
+
+    let branched_ssts = hummock_manager.get_branched_ssts_info().await;
+    // object-11 and object-12
+    assert_eq!(branched_ssts.len(), 2);
+    let info = branched_ssts.get(&11).unwrap();
+    assert_eq!(
+        info.keys().sorted().cloned().collect_vec(),
+        vec![2, new_group_id]
+    );
+    assert_eq!(
+        current_version.get_compaction_group_levels(2).levels[base_level - 1].table_infos[0]
+            .object_id,
+        sst_1.sst_info.get_object_id() + 1,
+    );
     assert_eq!(
         current_version.get_compaction_group_levels(2).levels[base_level - 1].table_infos[0]
             .table_ids,
-        vec![101]
+        vec![100, 101]
     );
     assert_eq!(
         current_version
@@ -1758,7 +1793,7 @@ async fn test_split_compaction_group_on_demand_bottom_levels() {
             .levels[base_level - 1]
             .table_infos[0]
             .table_ids,
-        vec![100]
+        vec![100, 101]
     );
     assert_eq!(
         current_version
@@ -1858,3 +1893,135 @@ async fn test_compaction_task_expiration_due_to_split_group() {
         "version should change because compaction task has succeeded"
     );
 }
+
+#[tokio::test]
+async fn test_move_tables_between_compaction_group() {
+    let (_env, hummock_manager, _, worker_node) = setup_compute_env(80).await;
+    let context_id = worker_node.id;
+
+    hummock_manager
+        .register_table_ids(&[(100, 2)])
+        .await
+        .unwrap();
+    hummock_manager
+        .register_table_ids(&[(101, 2)])
+        .await
+        .unwrap();
+    hummock_manager
+        .register_table_ids(&[(102, 2)])
+        .await
+        .unwrap();
+    let sst_1 = gen_extend_sstable_info(10, 2, 1, vec![100, 101, 102]);
+    hummock_manager
+        .commit_epoch(30, vec![sst_1.clone()], HashMap::from([(10, context_id)]))
+        .await
+        .unwrap();
+    // Construct data via manual compaction
+    let mut compaction_task = get_manual_compact_task(&hummock_manager, context_id).await;
+    let base_level: usize = 6;
+    assert_eq!(compaction_task.input_ssts[0].table_infos.len(), 1);
+    assert_eq!(compaction_task.target_level, base_level as u32);
+    compaction_task.sorted_output_ssts = vec![
+        gen_sstable_info(11, 1, vec![100]),
+        gen_sstable_info(12, 2, vec![100, 101]),
+        gen_sstable_info(13, 3, vec![101, 102]),
+    ];
+    compaction_task.task_status = TaskStatus::Success.into();
+    assert!(hummock_manager
+        .report_compact_task(context_id, &mut compaction_task, None)
+        .await
+        .unwrap());
+    let sst_2 = gen_extend_sstable_info(14, 2, 1, vec![101, 102]);
+    hummock_manager
+        .commit_epoch(31, vec![sst_2.clone()], HashMap::from([(14, context_id)]))
+        .await
+        .unwrap();
+    let current_version = hummock_manager.get_current_version().await;
+    assert_eq!(
+        current_version.get_compaction_group_levels(2).levels[base_level - 1]
+            .table_infos
+            .len(),
+        3
+    );
+
+    hummock_manager
+        .split_compaction_group(2, &[100])
+        .await
+        .unwrap();
+    let current_version = hummock_manager.get_current_version().await;
+    let new_group_id = current_version.levels.keys().max().cloned().unwrap();
+    assert_eq!(
+        current_version.get_compaction_group_levels(2).levels[base_level - 1]
+            .table_infos
+            .len(),
+        2
+    );
+
+    let level = &current_version
+        .get_compaction_group_levels(new_group_id)
+        .levels[base_level - 1];
+    assert_eq!(level.table_infos[0].table_ids, vec![100]);
+    assert_eq!(level.table_infos[1].table_ids, vec![100, 101]);
+    assert_eq!(level.table_infos.len(), 2);
+    let branched_ssts = hummock_manager.get_branched_ssts_info().await;
+    // object-id 11 and 12.
+    assert_eq!(branched_ssts.len(), 2);
+    let info = branched_ssts.get(&12).unwrap();
+    let groups = info.keys().sorted().cloned().collect_vec();
+    assert_eq!(groups, vec![2, new_group_id]);
+    let ret = hummock_manager
+        .move_state_table_to_compaction_group(2, &[101], Some(new_group_id), false)
+        .await;
+    // we can not move table-101 since sst-12 has been moved to new-group. If we move sst-12 to
+    // new-group, some of its data may be expired and it would return error result.
+    assert!(ret.is_err());
+    let mut selector: Box<dyn LevelSelector> = Box::<SpaceReclaimCompactionSelector>::default();
+    let mut compaction_task = hummock_manager
+        .get_compact_task(2, &mut selector)
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(compaction_task.existing_table_ids, vec![101, 102]);
+    assert_eq!(compaction_task.input_ssts[0].table_infos.len(), 1);
+    assert_eq!(compaction_task.input_ssts[0].table_infos[0].object_id, 12);
+    compaction_task.sorted_output_ssts = vec![gen_sstable_info(20, 2, vec![101])];
+    compaction_task.task_status = TaskStatus::Success.into();
+    hummock_manager
+        .assign_compaction_task(&compaction_task, context_id)
+        .await
+        .unwrap();
+    let ret = hummock_manager
+        .report_compact_task(context_id, &mut compaction_task, None)
+        .await
+        .unwrap();
+    assert!(ret);
+    let branched_ssts = hummock_manager.get_branched_ssts_info().await;
+    // there is still left one sst for object-12 in branched-sst.
+    assert_eq!(branched_ssts.len(), 2);
+    hummock_manager
+        .move_state_table_to_compaction_group(2, &[101], Some(new_group_id), false)
+        .await
+        .unwrap();
+    let current_version = hummock_manager.get_current_version().await;
+    assert_eq!(
+        current_version
+            .get_compaction_group_levels(new_group_id)
+            .levels[base_level - 1]
+            .table_infos
+            .len(),
+        4
+    );
+    assert_eq!(
+        current_version.get_compaction_group_levels(2).levels[base_level - 1]
+            .table_infos
+            .len(),
+        1
+    );
+    let branched_ssts = hummock_manager.get_branched_ssts_info().await;
+    assert_eq!(branched_ssts.len(), 5);
+    let info = branched_ssts.get(&14).unwrap();
+    assert_eq!(
+        info.keys().cloned().sorted().collect_vec(),
+        vec![2, new_group_id]
+    );
+}
diff --git a/src/meta/src/hummock/manager/versioning.rs b/src/meta/src/hummock/manager/versioning.rs
index 48c02cb01accc..2d089cfb4ef97 100644
--- a/src/meta/src/hummock/manager/versioning.rs
+++ b/src/meta/src/hummock/manager/versioning.rs
@@ -13,14 +13,17 @@
 // limitations under the License.
 
 use std::cmp;
-use std::collections::{BTreeMap, HashMap};
+use std::collections::{BTreeMap, HashMap, HashSet};
 use std::ops::RangeBounds;
 
 use function_name::named;
 use itertools::Itertools;
-use risingwave_hummock_sdk::compaction_group::hummock_version_ext::get_compaction_group_ids;
+use risingwave_hummock_sdk::compaction_group::hummock_version_ext::{
+    get_compaction_group_ids, BranchedSstInfo, HummockVersionExt,
+};
+use risingwave_hummock_sdk::compaction_group::StateTableId;
 use risingwave_hummock_sdk::{
-    CompactionGroupId, HummockContextId, HummockSstableId, HummockSstableObjectId, HummockVersionId,
+    CompactionGroupId, HummockContextId, HummockSstableObjectId, HummockVersionId,
 };
 use risingwave_pb::common::WorkerNode;
 use risingwave_pb::hummock::write_limits::WriteLimit;
@@ -83,7 +86,7 @@ pub struct Versioning {
     pub branched_ssts: BTreeMap<
         // SST object id
         HummockSstableObjectId,
-        BTreeMap<CompactionGroupId, /* SST ids */ Vec<HummockSstableId>>,
+        BranchedSstInfo,
     >,
     /// `version_safe_points` is similar to `pinned_versions` expect for being a transient state.
     /// Hummock versions GE than min(safe_point) should not be GCed.
@@ -149,6 +152,46 @@ impl Versioning {
             // deleted.
         }
     }
+
+    /// If there is some sst in the target group which is just split but we have not compact it, we
+    ///  can not split or move state-table to those group, because it may cause data overlap.
+    pub fn check_branched_sst_in_target_group(
+        &self,
+        table_ids: &[StateTableId],
+        source_group_id: &CompactionGroupId,
+        target_group_id: &CompactionGroupId,
+    ) -> bool {
+        for groups in self.branched_ssts.values() {
+            if groups.contains_key(target_group_id) && groups.contains_key(source_group_id) {
+                return false;
+            }
+        }
+        let mut found_sstable_repeated = false;
+        let moving_table_ids: HashSet<&u32> = HashSet::from_iter(table_ids);
+        if let Some(group) = self.current_version.levels.get(target_group_id) {
+            let target_member_table_ids: HashSet<u32> =
+                HashSet::from_iter(group.member_table_ids.clone());
+            self.current_version.level_iter(*source_group_id, |level| {
+                for sst in &level.table_infos {
+                    if sst
+                        .table_ids
+                        .iter()
+                        .all(|table_id| !moving_table_ids.contains(table_id))
+                    {
+                        continue;
+                    }
+                    for table_id in &sst.table_ids {
+                        if target_member_table_ids.contains(table_id) {
+                            found_sstable_repeated = true;
+                            return false;
+                        }
+                    }
+                }
+                true
+            });
+        }
+        !found_sstable_repeated
+    }
 }
 
 impl<S> HummockManager<S>
diff --git a/src/meta/src/hummock/mock_hummock_meta_client.rs b/src/meta/src/hummock/mock_hummock_meta_client.rs
index b0bdaff78b6ba..fee99b07cd115 100644
--- a/src/meta/src/hummock/mock_hummock_meta_client.rs
+++ b/src/meta/src/hummock/mock_hummock_meta_client.rs
@@ -29,8 +29,8 @@ use risingwave_hummock_sdk::{
 use risingwave_pb::common::{HostAddress, WorkerType};
 use risingwave_pb::hummock::subscribe_compact_tasks_response::Task;
 use risingwave_pb::hummock::{
-    compact_task, CompactTask, CompactTaskProgress, HummockSnapshot, HummockVersion,
-    SubscribeCompactTasksResponse, VacuumTask,
+    compact_task, CompactTask, CompactTaskProgress, CompactorWorkload, HummockSnapshot,
+    HummockVersion, SubscribeCompactTasksResponse, VacuumTask,
 };
 use risingwave_rpc_client::error::{Result, RpcError};
 use risingwave_rpc_client::{CompactTaskItem, HummockMetaClient};
@@ -172,6 +172,7 @@ impl HummockMetaClient for MockHummockMetaClient {
     async fn subscribe_compact_tasks(
         &self,
         _max_concurrent_task_number: u64,
+        _cpu_core_num: u32,
     ) -> Result<BoxStream<'static, CompactTaskItem>> {
         let (sched_tx, mut sched_rx) = tokio::sync::mpsc::unbounded_channel();
         let sched_channel = Arc::new(CompactionRequestChannel::new(sched_tx));
@@ -195,7 +196,7 @@ impl HummockMetaClient for MockHummockMetaClient {
         let _ = self
             .hummock_manager
             .compactor_manager_ref_for_test()
-            .add_compactor(context_id, 8);
+            .add_compactor(context_id, 8, 8);
         self.compact_context_id.store(context_id, Ordering::Release);
 
         let hummock_manager_compact = self.hummock_manager.clone();
@@ -235,9 +236,10 @@ impl HummockMetaClient for MockHummockMetaClient {
         }))
     }
 
-    async fn report_compaction_task_progress(
+    async fn compactor_heartbeat(
         &self,
         _progress: Vec<CompactTaskProgress>,
+        _workload: CompactorWorkload,
     ) -> Result<()> {
         Ok(())
     }
diff --git a/src/meta/src/hummock/model/compact_task_assignment.rs b/src/meta/src/hummock/model/compact_task_assignment.rs
index a9a0f72429f1b..4145182bdd8ff 100644
--- a/src/meta/src/hummock/model/compact_task_assignment.rs
+++ b/src/meta/src/hummock/model/compact_task_assignment.rs
@@ -22,13 +22,13 @@ use crate::model::{MetadataModel, MetadataModelResult};
 /// `AssignedCompactTasks` tracks compact tasks assigned to context id.
 impl MetadataModel for CompactTaskAssignment {
     type KeyType = HummockCompactionTaskId;
-    type ProstType = CompactTaskAssignment;
+    type PbType = CompactTaskAssignment;
 
     fn cf_name() -> String {
         HUMMOCK_COMPACT_TASK_ASSIGNMENT.to_string()
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.clone()
     }
 
@@ -36,7 +36,7 @@ impl MetadataModel for CompactTaskAssignment {
         self.encode_to_vec()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost
     }
 
diff --git a/src/meta/src/hummock/model/compaction_group_config.rs b/src/meta/src/hummock/model/compaction_group_config.rs
index 8d16cc01d8229..c130c2b36f1ef 100644
--- a/src/meta/src/hummock/model/compaction_group_config.rs
+++ b/src/meta/src/hummock/model/compaction_group_config.rs
@@ -71,17 +71,17 @@ impl From<&CompactionGroup> for risingwave_pb::hummock::CompactionGroup {
 
 impl MetadataModel for CompactionGroup {
     type KeyType = CompactionGroupId;
-    type ProstType = risingwave_pb::hummock::CompactionGroup;
+    type PbType = risingwave_pb::hummock::CompactionGroup;
 
     fn cf_name() -> String {
         String::from(HUMMOCK_COMPACTION_GROUP_CONFIG_CF_NAME)
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.borrow().into()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost.borrow().into()
     }
 
diff --git a/src/meta/src/hummock/model/compaction_status.rs b/src/meta/src/hummock/model/compaction_status.rs
index 6ffa1553565f2..4f10e8c5091e2 100644
--- a/src/meta/src/hummock/model/compaction_status.rs
+++ b/src/meta/src/hummock/model/compaction_status.rs
@@ -23,17 +23,17 @@ use crate::model::{MetadataModel, MetadataModelResult};
 
 impl MetadataModel for CompactStatus {
     type KeyType = CompactionGroupId;
-    type ProstType = risingwave_pb::hummock::CompactStatus;
+    type PbType = risingwave_pb::hummock::CompactStatus;
 
     fn cf_name() -> String {
         String::from(HUMMOCK_COMPACTION_STATUS_CF_NAME)
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.into()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost.borrow().into()
     }
 
diff --git a/src/meta/src/hummock/model/pinned_snapshot.rs b/src/meta/src/hummock/model/pinned_snapshot.rs
index 8c153844355fa..b436b2d9312ac 100644
--- a/src/meta/src/hummock/model/pinned_snapshot.rs
+++ b/src/meta/src/hummock/model/pinned_snapshot.rs
@@ -22,13 +22,13 @@ use crate::model::{MetadataModel, MetadataModelResult};
 /// `HummockPinnedSnapshot` tracks pinned snapshots by given context id.
 impl MetadataModel for HummockPinnedSnapshot {
     type KeyType = HummockContextId;
-    type ProstType = HummockPinnedSnapshot;
+    type PbType = HummockPinnedSnapshot;
 
     fn cf_name() -> String {
         String::from(HUMMOCK_PINNED_SNAPSHOT_CF_NAME)
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.clone()
     }
 
@@ -36,7 +36,7 @@ impl MetadataModel for HummockPinnedSnapshot {
         self.encode_to_vec()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost
     }
 
diff --git a/src/meta/src/hummock/model/pinned_version.rs b/src/meta/src/hummock/model/pinned_version.rs
index 020532166ca9e..c2a49206ff8e6 100644
--- a/src/meta/src/hummock/model/pinned_version.rs
+++ b/src/meta/src/hummock/model/pinned_version.rs
@@ -22,13 +22,13 @@ use crate::model::{MetadataModel, MetadataModelResult};
 /// `HummockPinnedVersion` tracks pinned versions by given context id.
 impl MetadataModel for HummockPinnedVersion {
     type KeyType = HummockContextId;
-    type ProstType = HummockPinnedVersion;
+    type PbType = HummockPinnedVersion;
 
     fn cf_name() -> String {
         String::from(HUMMOCK_PINNED_VERSION_CF_NAME)
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.clone()
     }
 
@@ -36,7 +36,7 @@ impl MetadataModel for HummockPinnedVersion {
         self.encode_to_vec()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost
     }
 
diff --git a/src/meta/src/hummock/model/version.rs b/src/meta/src/hummock/model/version.rs
index 0ecd42ce5d39a..d6a85ae745c64 100644
--- a/src/meta/src/hummock/model/version.rs
+++ b/src/meta/src/hummock/model/version.rs
@@ -22,13 +22,13 @@ use crate::model::{MetadataModel, MetadataModelResult};
 /// `HummockVersion` tracks `Sstables` in given version.
 impl MetadataModel for HummockVersion {
     type KeyType = HummockVersionId;
-    type ProstType = HummockVersion;
+    type PbType = HummockVersion;
 
     fn cf_name() -> String {
         String::from(HUMMOCK_VERSION_CF_NAME)
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.clone()
     }
 
@@ -36,7 +36,7 @@ impl MetadataModel for HummockVersion {
         self.encode_to_vec()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost
     }
 
diff --git a/src/meta/src/hummock/model/version_delta.rs b/src/meta/src/hummock/model/version_delta.rs
index 5b2f541a4e5a5..a7d97790ce51a 100644
--- a/src/meta/src/hummock/model/version_delta.rs
+++ b/src/meta/src/hummock/model/version_delta.rs
@@ -22,13 +22,13 @@ use crate::model::{MetadataModel, MetadataModelResult};
 /// `HummockVersionDelta` tracks delta of `Sstables` in given version based on previous version.
 impl MetadataModel for HummockVersionDelta {
     type KeyType = HummockVersionId;
-    type ProstType = HummockVersionDelta;
+    type PbType = HummockVersionDelta;
 
     fn cf_name() -> String {
         String::from(HUMMOCK_VERSION_DELTA_CF_NAME)
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.clone()
     }
 
@@ -36,7 +36,7 @@ impl MetadataModel for HummockVersionDelta {
         self.encode_to_vec()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost
     }
 
diff --git a/src/meta/src/hummock/model/version_stats.rs b/src/meta/src/hummock/model/version_stats.rs
index 7e3f71e5204d4..6a498daa33903 100644
--- a/src/meta/src/hummock/model/version_stats.rs
+++ b/src/meta/src/hummock/model/version_stats.rs
@@ -23,13 +23,13 @@ use crate::model::{MetadataModel, MetadataModelResult};
 /// Currently it only persists one row for latest version.
 impl MetadataModel for HummockVersionStats {
     type KeyType = HummockVersionId;
-    type ProstType = HummockVersionStats;
+    type PbType = HummockVersionStats;
 
     fn cf_name() -> String {
         String::from(HUMMOCK_VERSION_STATS_CF_NAME)
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.clone()
     }
 
@@ -37,7 +37,7 @@ impl MetadataModel for HummockVersionStats {
         self.encode_to_vec()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost
     }
 
diff --git a/src/meta/src/hummock/test_utils.rs b/src/meta/src/hummock/test_utils.rs
index 34ad67d8ec0bb..8c6d025facf76 100644
--- a/src/meta/src/hummock/test_utils.rs
+++ b/src/meta/src/hummock/test_utils.rs
@@ -24,7 +24,7 @@ use risingwave_hummock_sdk::key::key_with_epoch;
 use risingwave_hummock_sdk::{
     CompactionGroupId, HummockContextId, HummockEpoch, HummockSstableObjectId, LocalSstableInfo,
 };
-use risingwave_pb::catalog::Table as ProstTable;
+use risingwave_pb::catalog::PbTable;
 use risingwave_pb::common::{HostAddress, WorkerNode, WorkerType};
 use risingwave_pb::hummock::compact_task::TaskStatus;
 use risingwave_pb::hummock::{
@@ -86,9 +86,16 @@ where
     {
         hummock_manager
             .compactor_manager_ref_for_test()
-            .add_compactor(context_id, u64::MAX);
+            .add_compactor(context_id, u64::MAX, 16);
         temp_compactor = true;
     }
+    let test_tables_2 = generate_test_tables(epoch, get_sst_ids(hummock_manager, 1).await);
+    register_sstable_infos_to_compaction_group(
+        hummock_manager,
+        &test_tables_2,
+        StaticCompactionGroupId::StateDefault.into(),
+    )
+    .await;
     let compactor = hummock_manager.get_idle_compactor().await.unwrap();
     let mut selector = default_level_selector();
     let mut compact_task = hummock_manager
@@ -104,19 +111,13 @@ where
     if temp_compactor {
         assert_eq!(compactor.context_id(), context_id);
     }
-    let test_tables_2 = generate_test_tables(epoch, get_sst_ids(hummock_manager, 1).await);
-    register_sstable_infos_to_compaction_group(
-        hummock_manager,
-        &test_tables_2,
-        StaticCompactionGroupId::StateDefault.into(),
-    )
-    .await;
     compact_task.sorted_output_ssts = test_tables_2.clone();
     compact_task.set_task_status(TaskStatus::Success);
-    hummock_manager
+    let ret = hummock_manager
         .report_compact_task(context_id, &mut compact_task, None)
         .await
         .unwrap();
+    assert!(ret);
     if temp_compactor {
         hummock_manager
             .compactor_manager_ref_for_test()
@@ -239,7 +240,7 @@ pub fn update_filter_key_extractor_for_table_ids(
 
 pub fn update_filter_key_extractor_for_tables(
     filter_key_extractor_manager_ref: &FilterKeyExtractorManagerRef,
-    tables: &[ProstTable],
+    tables: &[PbTable],
 ) {
     for table in tables {
         filter_key_extractor_manager_ref.update(
diff --git a/src/meta/src/hummock/vacuum.rs b/src/meta/src/hummock/vacuum.rs
index 4c87290470745..c280c75a21e2d 100644
--- a/src/meta/src/hummock/vacuum.rs
+++ b/src/meta/src/hummock/vacuum.rs
@@ -389,7 +389,7 @@ mod tests {
             VacuumManager::vacuum_sst_data(&vacuum).await.unwrap().len(),
             0
         );
-        let _receiver = compactor_manager.add_compactor(context_id, u64::MAX);
+        let _receiver = compactor_manager.add_compactor(context_id, u64::MAX, 16);
         // SST deletion is scheduled.
         assert_eq!(
             VacuumManager::vacuum_sst_data(&vacuum).await.unwrap().len(),
@@ -453,7 +453,7 @@ mod tests {
             .await
             .unwrap());
 
-        let mut receiver = compactor_manager.add_compactor(context_id, u64::MAX);
+        let mut receiver = compactor_manager.add_compactor(context_id, u64::MAX, 16);
 
         assert!(vacuum
             .start_full_gc(Duration::from_secs(
diff --git a/src/meta/src/lib.rs b/src/meta/src/lib.rs
index 2c91ace5ca79a..744c72dd995a1 100644
--- a/src/meta/src/lib.rs
+++ b/src/meta/src/lib.rs
@@ -46,15 +46,14 @@ mod model;
 mod rpc;
 pub mod storage;
 mod stream;
+pub(crate) mod telemetry;
 
 use std::time::Duration;
 
 use clap::Parser;
 pub use error::{MetaError, MetaResult};
-use risingwave_common::system_param::default;
 use risingwave_common::{GIT_SHA, RW_VERSION};
 use risingwave_common_proc_macro::OverrideConfig;
-use risingwave_pb::meta::SystemParams;
 
 use crate::manager::MetaOpts;
 use crate::rpc::server::{rpc_serve, AddressInfo, MetaStoreBackend};
@@ -107,42 +106,6 @@ pub struct MetaNodeOpts {
     #[clap(long, env = "RW_PROMETHEUS_ENDPOINT")]
     prometheus_endpoint: Option<String>,
 
-    /// State store url.
-    #[clap(long, env = "RW_STATE_STORE")]
-    state_store: Option<String>,
-
-    /// The interval of periodic barrier.
-    #[clap(long, env = "RW_BARRIER_INTERVAL_MS", default_value_t = default::barrier_interval_ms())]
-    barrier_interval_ms: u32,
-
-    /// There will be a checkpoint for every n barriers
-    #[clap(long, env = "RW_CHECKPOINT_FREQUENCY", default_value_t = default::checkpoint_frequency())]
-    pub checkpoint_frequency: u64,
-
-    /// Target size of the Sstable.
-    #[clap(long, env = "RW_SSTABLE_SIZE_MB", default_value_t = default::sstable_size_mb())]
-    sstable_size_mb: u32,
-
-    /// Size of each block in bytes in SST.
-    #[clap(long, env = "RW_BLOCK_SIZE_KB", default_value_t = default::block_size_kb())]
-    block_size_kb: u32,
-
-    /// False positive probability of bloom filter.
-    #[clap(long, env = "RW_BLOOM_FALSE_POSITIVE", default_value_t = default::bloom_false_positive())]
-    bloom_false_positive: f64,
-
-    /// Remote directory for storing data and metadata objects.
-    #[clap(long, env = "RW_DATA_DIRECTORY", default_value_t = default::data_directory())]
-    data_directory: String,
-
-    /// Remote storage url for storing snapshots.
-    #[clap(long, env = "RW_BACKUP_STORAGE_URL", default_value_t = default::backup_storage_url())]
-    backup_storage_url: String,
-
-    /// Remote directory for storing snapshots.
-    #[clap(long, env = "RW_STORAGE_DIRECTORY", default_value_t = default::backup_storage_directory())]
-    backup_storage_directory: String,
-
     /// Endpoint of the connector node, there will be a sidecar connector node
     /// colocated with Meta node in the cloud environment
     #[clap(long, env = "RW_CONNECTOR_RPC_ENDPOINT")]
@@ -164,6 +127,46 @@ pub struct OverrideConfigOpts {
     #[clap(long, env = "RW_BACKEND", value_enum)]
     #[override_opts(path = meta.backend)]
     backend: Option<MetaBackend>,
+
+    /// The interval of periodic barrier.
+    #[clap(long, env = "RW_BARRIER_INTERVAL_MS")]
+    #[override_opts(path = system.barrier_interval_ms)]
+    barrier_interval_ms: Option<u32>,
+
+    /// Target size of the Sstable.
+    #[clap(long, env = "RW_SSTABLE_SIZE_MB")]
+    #[override_opts(path = system.sstable_size_mb)]
+    sstable_size_mb: Option<u32>,
+
+    /// Size of each block in bytes in SST.
+    #[clap(long, env = "RW_BLOCK_SIZE_KB")]
+    #[override_opts(path = system.block_size_kb)]
+    block_size_kb: Option<u32>,
+
+    /// False positive probability of bloom filter.
+    #[clap(long, env = "RW_BLOOM_FALSE_POSITIVE")]
+    #[override_opts(path = system.bloom_false_positive)]
+    bloom_false_positive: Option<f64>,
+
+    /// State store url
+    #[clap(long, env = "RW_STATE_STORE")]
+    #[override_opts(path = system.state_store)]
+    state_store: Option<String>,
+
+    /// Remote directory for storing data and metadata objects.
+    #[clap(long, env = "RW_DATA_DIRECTORY")]
+    #[override_opts(path = system.data_directory)]
+    data_directory: Option<String>,
+
+    /// Remote storage url for storing snapshots.
+    #[clap(long, env = "RW_BACKUP_STORAGE_URL")]
+    #[override_opts(path = system.backup_storage_url)]
+    backup_storage_url: Option<String>,
+
+    /// Remote directory for storing snapshots.
+    #[clap(long, env = "RW_BACKUP_STORAGE_DIRECTORY")]
+    #[override_opts(path = system.backup_storage_directory)]
+    backup_storage_directory: Option<String>,
 }
 
 use std::future::Future;
@@ -240,37 +243,47 @@ pub fn start(opts: MetaNodeOpts) -> Pin<Box<dyn Future<Output = ()> + Send>> {
                 periodic_space_reclaim_compaction_interval_sec: config
                     .meta
                     .periodic_space_reclaim_compaction_interval_sec,
+                telemetry_enabled: config.server.telemetry_enabled,
                 periodic_ttl_reclaim_compaction_interval_sec: config
                     .meta
                     .periodic_ttl_reclaim_compaction_interval_sec,
+                max_compactor_task_multiplier: config.meta.max_compactor_task_multiplier,
             },
-            SystemParams {
-                barrier_interval_ms: Some(opts.barrier_interval_ms),
-                checkpoint_frequency: Some(opts.checkpoint_frequency),
-                sstable_size_mb: Some(opts.sstable_size_mb),
-                block_size_kb: Some(opts.block_size_kb),
-                bloom_false_positive: Some(opts.bloom_false_positive),
-                state_store: Some(opts.state_store.unwrap_or_default()),
-                data_directory: Some(opts.data_directory),
-                backup_storage_url: Some(opts.backup_storage_url),
-                backup_storage_directory: Some(opts.backup_storage_directory),
-            },
+            config.system.into_init_system_params(),
         )
         .await
         .unwrap();
 
-        let res = tokio::select! {
-            _ = tokio::signal::ctrl_c() => {
-                tracing::info!("receive ctrl+c");
-                shutdown_send.send(()).unwrap();
-                join_handle.await
+        match leader_lost_handle {
+            None => {
+                tokio::select! {
+                    _ = tokio::signal::ctrl_c() => {
+                        tracing::info!("receive ctrl+c");
+                        shutdown_send.send(()).unwrap();
+                        join_handle.await.unwrap()
+                    }
+                    res = &mut join_handle => res.unwrap(),
+                };
+            }
+            Some(mut handle) => {
+                tokio::select! {
+                    _ = &mut handle => {
+                        tracing::info!("receive leader lost signal");
+                        // When we lose leadership, we will exit as soon as possible.
+                    }
+                    _ = tokio::signal::ctrl_c() => {
+                        tracing::info!("receive ctrl+c");
+                        shutdown_send.send(()).unwrap();
+                        join_handle.await.unwrap();
+                        handle.abort();
+                    }
+                    res = &mut join_handle => {
+                        res.unwrap();
+                        handle.abort();
+                    },
+                };
             }
-            res = &mut join_handle => res,
         };
-        res.unwrap();
-        if let Some(leader_lost_handle) = leader_lost_handle {
-            leader_lost_handle.abort();
-        }
     })
 }
 
diff --git a/src/meta/src/manager/catalog/database.rs b/src/meta/src/manager/catalog/database.rs
index d678ba3445e5b..01f24a3585116 100644
--- a/src/meta/src/manager/catalog/database.rs
+++ b/src/meta/src/manager/catalog/database.rs
@@ -343,6 +343,14 @@ impl DatabaseManager {
         }
     }
 
+    pub fn ensure_view_id(&self, view_id: ViewId) -> MetaResult<()> {
+        if self.views.contains_key(&view_id) {
+            Ok(())
+        } else {
+            Err(MetaError::catalog_id_not_found("view", view_id))
+        }
+    }
+
     pub fn ensure_table_id(&self, table_id: TableId) -> MetaResult<()> {
         if self.tables.contains_key(&table_id) {
             Ok(())
@@ -351,6 +359,30 @@ impl DatabaseManager {
         }
     }
 
+    pub fn ensure_source_id(&self, source_id: SourceId) -> MetaResult<()> {
+        if self.sources.contains_key(&source_id) {
+            Ok(())
+        } else {
+            Err(MetaError::catalog_id_not_found("source", source_id))
+        }
+    }
+
+    pub fn ensure_sink_id(&self, sink_id: SinkId) -> MetaResult<()> {
+        if self.sinks.contains_key(&sink_id) {
+            Ok(())
+        } else {
+            Err(MetaError::catalog_id_not_found("sink", sink_id))
+        }
+    }
+
+    pub fn ensure_index_id(&self, index_id: IndexId) -> MetaResult<()> {
+        if self.indexes.contains_key(&index_id) {
+            Ok(())
+        } else {
+            Err(MetaError::catalog_id_not_found("index", index_id))
+        }
+    }
+
     // TODO(zehua): refactor when using SourceId.
     pub fn ensure_table_or_source_id(&self, table_id: &TableId) -> MetaResult<()> {
         if self.tables.contains_key(table_id) || self.sources.contains_key(table_id) {
diff --git a/src/meta/src/manager/catalog/fragment.rs b/src/meta/src/manager/catalog/fragment.rs
index de1aa73f54f35..51d823d65d93b 100644
--- a/src/meta/src/manager/catalog/fragment.rs
+++ b/src/meta/src/manager/catalog/fragment.rs
@@ -18,8 +18,9 @@ use std::sync::Arc;
 
 use anyhow::{anyhow, Context};
 use itertools::Itertools;
+use risingwave_common::buffer::Bitmap;
 use risingwave_common::catalog::TableId;
-use risingwave_common::hash::ParallelUnitId;
+use risingwave_common::hash::{ActorMapping, ParallelUnitMapping};
 use risingwave_common::{bail, try_match_expand};
 use risingwave_connector::source::SplitImpl;
 use risingwave_pb::common::{ParallelUnit, WorkerNode};
@@ -278,6 +279,7 @@ where
         // FIXME: we use a dummy table ID for new table fragments, so we can drop the old fragments
         // with the real table ID, then replace the dummy table ID with the real table ID. This is a
         // workaround for not having the version info in the fragment manager.
+        #[allow(unused_variables)]
         let old_table_fragment = table_fragments
             .remove(table_id)
             .with_context(|| format!("table_fragment not exist: id={}", table_id))?;
@@ -343,8 +345,10 @@ where
         // Commit changes and notify about the changes.
         commit_meta!(self, table_fragments)?;
 
-        self.notify_fragment_mapping(&old_table_fragment, Operation::Delete)
-            .await;
+        // FIXME: Do not notify frontend currently, because frontend nodes might refer to old table
+        // catalog and need to access the old fragment. Let frontend nodes delete the old fragment
+        // when they receive table catalog change. self.notify_fragment_mapping(&
+        // old_table_fragment, Operation::Delete)     .await;
         self.notify_fragment_mapping(&table_fragment, Operation::Add)
             .await;
 
@@ -736,6 +740,10 @@ where
                 let actor_status = table_fragment.actor_status.clone();
                 let fragment = table_fragment.fragments.get_mut(&fragment_id).unwrap();
 
+                fragment
+                    .actors
+                    .retain(|a| !removed_actor_ids.contains(&a.actor_id));
+
                 // update vnode mapping for actors.
                 for actor in &mut fragment.actors {
                     if let Some(bitmap) = vnode_bitmap_updates.get(&actor.actor_id) {
@@ -743,37 +751,43 @@ where
                     }
                 }
 
-                fragment
-                    .actors
-                    .retain(|a| !removed_actor_ids.contains(&a.actor_id));
-
                 // update fragment's vnode mapping
-                if let Some(vnode_mapping) = fragment.vnode_mapping.as_mut() {
-                    let mut actor_to_parallel_unit = HashMap::with_capacity(fragment.actors.len());
-                    for actor in &fragment.actors {
-                        if let Some(actor_status) = actor_status.get(&actor.actor_id) {
-                            if let Some(parallel_unit) = actor_status.parallel_unit.as_ref() {
-                                actor_to_parallel_unit.insert(
-                                    actor.actor_id as ActorId,
-                                    parallel_unit.id as ParallelUnitId,
-                                );
-                            }
-                        }
+                let mut actor_to_parallel_unit = HashMap::with_capacity(fragment.actors.len());
+                let mut actor_to_vnode_bitmap = HashMap::with_capacity(fragment.actors.len());
+                for actor in &fragment.actors {
+                    let actor_status = &actor_status[&actor.actor_id];
+                    let parallel_unit_id = actor_status.parallel_unit.as_ref().unwrap().id;
+                    actor_to_parallel_unit.insert(actor.actor_id, parallel_unit_id);
+
+                    if let Some(vnode_bitmap) = &actor.vnode_bitmap {
+                        let bitmap = Bitmap::from(vnode_bitmap);
+                        actor_to_vnode_bitmap.insert(actor.actor_id, bitmap);
                     }
+                }
 
-                    if let Some(actor_mapping) = upstream_dispatcher_mapping.as_ref() {
-                        *vnode_mapping = actor_mapping
-                            .to_parallel_unit(&actor_to_parallel_unit)
-                            .to_protobuf();
-                    }
+                let vnode_mapping = if actor_to_vnode_bitmap.is_empty() {
+                    // If there's no `vnode_bitmap`, then the fragment must be a singleton fragment.
+                    // We directly use the single parallel unit to construct the mapping.
+                    // TODO: also fill `vnode_bitmap` for the actor of singleton fragment so that we
+                    // don't need this branch.
+                    let parallel_unit = *actor_to_parallel_unit.values().exactly_one().unwrap();
+                    ParallelUnitMapping::new_single(parallel_unit)
+                } else {
+                    // Generate the parallel unit mapping from the fragment's actor bitmaps.
+                    assert_eq!(actor_to_vnode_bitmap.len(), actor_to_parallel_unit.len());
+                    ActorMapping::from_bitmaps(&actor_to_vnode_bitmap)
+                        .to_parallel_unit(&actor_to_parallel_unit)
+                }
+                .to_protobuf();
 
-                    if !fragment.state_table_ids.is_empty() {
-                        let fragment_mapping = FragmentParallelUnitMapping {
-                            fragment_id: fragment_id as FragmentId,
-                            mapping: Some(vnode_mapping.clone()),
-                        };
-                        fragment_mapping_to_notify.push(fragment_mapping);
-                    }
+                *fragment.vnode_mapping.as_mut().unwrap() = vnode_mapping.clone();
+
+                if !fragment.state_table_ids.is_empty() {
+                    let fragment_mapping = FragmentParallelUnitMapping {
+                        fragment_id: fragment_id as FragmentId,
+                        mapping: Some(vnode_mapping),
+                    };
+                    fragment_mapping_to_notify.push(fragment_mapping);
                 }
 
                 // Second step, update upstream fragments
diff --git a/src/meta/src/manager/catalog/mod.rs b/src/meta/src/manager/catalog/mod.rs
index b35126e1507d3..b7dd6149bd0fc 100644
--- a/src/meta/src/manager/catalog/mod.rs
+++ b/src/meta/src/manager/catalog/mod.rs
@@ -16,6 +16,7 @@ mod connection;
 mod database;
 mod fragment;
 mod user;
+mod utils;
 
 use std::collections::{HashMap, HashSet, VecDeque};
 use std::iter;
@@ -88,7 +89,12 @@ macro_rules! commit_meta {
     };
 }
 pub(crate) use commit_meta;
-use risingwave_pb::meta::CreatingJobInfo;
+use risingwave_common::util::column_index_mapping::ColIndexMapping;
+use risingwave_pb::expr::expr_node::RexNode;
+use risingwave_pb::meta::relation::RelationInfo;
+use risingwave_pb::meta::{CreatingJobInfo, Relation, RelationGroup};
+
+use crate::manager::catalog::utils::{alter_relation_rename, alter_relation_rename_refs};
 
 pub type CatalogManagerRef<S> = Arc<CatalogManager<S>>;
 
@@ -450,7 +456,7 @@ where
         }
 
         let version = self
-            .notify_frontend(Operation::Add, Info::View(view.to_owned()))
+            .notify_frontend_relation_info(Operation::Add, RelationInfo::View(view.to_owned()))
             .await;
 
         Ok(version)
@@ -459,41 +465,40 @@ where
     pub async fn drop_view(&self, view_id: ViewId) -> MetaResult<NotificationVersion> {
         let core = &mut *self.core.lock().await;
         let database_core = &mut core.database;
+        database_core.ensure_view_id(view_id)?;
+
         let user_core = &mut core.user;
         let mut views = BTreeMapTransaction::new(&mut database_core.views);
         let mut users = BTreeMapTransaction::new(&mut user_core.user_info);
 
-        let view = views.remove(view_id);
-        if let Some(view) = view {
-            match database_core.relation_ref_count.get(&view_id) {
-                Some(ref_count) => Err(MetaError::permission_denied(format!(
-                    "Fail to delete view `{}` because {} other relation(s) depend on it",
-                    view.name, ref_count
-                ))),
-                None => {
-                    let users_need_update =
-                        Self::update_user_privileges(&mut users, &[Object::ViewId(view_id)]);
-                    commit_meta!(self, views, users)?;
+        let view = views.remove(view_id).unwrap();
 
-                    user_core.decrease_ref(view.owner);
+        match database_core.relation_ref_count.get(&view_id) {
+            Some(ref_count) => Err(MetaError::permission_denied(format!(
+                "Fail to delete view `{}` because {} other relation(s) depend on it",
+                view.name, ref_count
+            ))),
+            None => {
+                let users_need_update =
+                    Self::update_user_privileges(&mut users, &[Object::ViewId(view_id)]);
+                commit_meta!(self, views, users)?;
 
-                    for &dependent_relation_id in &view.dependent_relations {
-                        database_core.decrease_ref_count(dependent_relation_id);
-                    }
+                user_core.decrease_ref(view.owner);
 
-                    for user in users_need_update {
-                        self.notify_frontend(Operation::Update, Info::User(user))
-                            .await;
-                    }
-                    let version = self
-                        .notify_frontend(Operation::Delete, Info::View(view))
-                        .await;
+                for &dependent_relation_id in &view.dependent_relations {
+                    database_core.decrease_ref_count(dependent_relation_id);
+                }
 
-                    Ok(version)
+                for user in users_need_update {
+                    self.notify_frontend(Operation::Update, Info::User(user))
+                        .await;
                 }
+                let version = self
+                    .notify_frontend_relation_info(Operation::Delete, RelationInfo::View(view))
+                    .await;
+
+                Ok(version)
             }
-        } else {
-            Err(MetaError::catalog_id_not_found("view", view_id))
         }
     }
 
@@ -514,7 +519,10 @@ where
         user_core.increase_ref(function.owner);
 
         let version = self
-            .notify_frontend(Operation::Add, Info::Function(function.to_owned()))
+            .notify_frontend_relation_info(
+                Operation::Add,
+                RelationInfo::Function(function.to_owned()),
+            )
             .await;
 
         Ok(version)
@@ -544,7 +552,7 @@ where
         }
 
         let version = self
-            .notify_frontend(Operation::Delete, Info::Function(function))
+            .notify_frontend_relation_info(Operation::Delete, RelationInfo::Function(function))
             .await;
 
         Ok(version)
@@ -575,8 +583,11 @@ where
         let core = &mut self.core.lock().await.database;
         core.mark_creating_tables(creating_tables);
         for table in creating_tables {
-            self.notify_hummock_and_compactor(Operation::Add, Info::Table(table.to_owned()))
-                .await;
+            self.notify_hummock_and_compactor_relation_info(
+                Operation::Add,
+                RelationInfo::Table(table.to_owned()),
+            )
+            .await;
         }
     }
 
@@ -585,9 +596,10 @@ where
         core.unmark_creating_tables(creating_table_ids);
         if need_notify {
             for table_id in creating_table_ids {
-                self.notify_hummock_and_compactor(
+                // TODO: use group notification?
+                self.notify_hummock_and_compactor_relation_info(
                     Operation::Delete,
-                    Info::Table(Table {
+                    RelationInfo::Table(Table {
                         id: *table_id,
                         ..Default::default()
                     }),
@@ -597,15 +609,19 @@ where
         }
     }
 
-    async fn notify_hummock_and_compactor(&self, operation: Operation, info: Info) {
+    async fn notify_hummock_and_compactor_relation_info(
+        &self,
+        operation: Operation,
+        relation_info: RelationInfo,
+    ) {
         self.env
             .notification_manager()
-            .notify_hummock(operation, info.clone())
+            .notify_hummock_relation_info(operation, relation_info.clone())
             .await;
 
         self.env
             .notification_manager()
-            .notify_compactor(operation, info)
+            .notify_compactor_relation_info(operation, relation_info)
             .await;
     }
 
@@ -664,13 +680,20 @@ where
         }
         commit_meta!(self, tables)?;
 
-        for internal_table in internal_tables {
-            self.notify_frontend(Operation::Add, Info::Table(internal_table))
-                .await;
-        }
-
         let version = self
-            .notify_frontend(Operation::Add, Info::Table(table.to_owned()))
+            .notify_frontend(
+                Operation::Add,
+                Info::RelationGroup(RelationGroup {
+                    relations: vec![Relation {
+                        relation_info: RelationInfo::Table(table.to_owned()).into(),
+                    }]
+                    .into_iter()
+                    .chain(internal_tables.into_iter().map(|internal_table| Relation {
+                        relation_info: RelationInfo::Table(internal_table).into(),
+                    }))
+                    .collect_vec(),
+                }),
+            )
             .await;
 
         Ok(version)
@@ -776,22 +799,10 @@ where
             });
             user_core.decrease_ref(table.owner);
 
-            for index in indexes_removed {
-                self.notify_frontend(Operation::Delete, Info::Index(index))
-                    .await;
-            }
-
-            for index_table in index_tables {
+            for index_table in &index_tables {
                 for dependent_relation_id in &index_table.dependent_relations {
                     database_core.decrease_ref_count(*dependent_relation_id);
                 }
-                self.notify_frontend(Operation::Delete, Info::Table(index_table))
-                    .await;
-            }
-
-            for internal_table in internal_tables {
-                self.notify_frontend(Operation::Delete, Info::Table(internal_table))
-                    .await;
             }
 
             for user in users_need_update {
@@ -804,7 +815,28 @@ where
             }
 
             let version = self
-                .notify_frontend(Operation::Delete, Info::Table(table))
+                .notify_frontend(
+                    Operation::Delete,
+                    Info::RelationGroup(RelationGroup {
+                        relations: indexes_removed
+                            .into_iter()
+                            .map(|index| Relation {
+                                relation_info: RelationInfo::Index(index).into(),
+                            })
+                            .chain(
+                                internal_tables
+                                    .into_iter()
+                                    .chain(index_tables.into_iter())
+                                    .map(|internal_table| Relation {
+                                        relation_info: RelationInfo::Table(internal_table).into(),
+                                    }),
+                            )
+                            .chain(vec![Relation {
+                                relation_info: RelationInfo::Table(table.to_owned()).into(),
+                            }])
+                            .collect_vec(),
+                    }),
+                )
                 .await;
 
             let catalog_deleted_ids = index_table_ids
@@ -836,64 +868,360 @@ where
     ) -> MetaResult<NotificationVersion> {
         let core = &mut *self.core.lock().await;
         let database_core = &mut core.database;
+        database_core.ensure_index_id(index_id)?;
+
         let user_core = &mut core.user;
         let mut indexes = BTreeMapTransaction::new(&mut database_core.indexes);
         let mut tables = BTreeMapTransaction::new(&mut database_core.tables);
         let mut users = BTreeMapTransaction::new(&mut user_core.user_info);
 
-        let index = indexes.remove(index_id);
-        if let Some(index) = index {
-            assert_eq!(index_table_id, index.index_table_id);
-
-            // drop index table
-            let table = tables.remove(index_table_id);
-            if let Some(table) = table {
-                match database_core
-                    .relation_ref_count
-                    .get(&index_table_id)
-                    .cloned()
-                {
-                    Some(ref_count) => Err(MetaError::permission_denied(format!(
-                        "Fail to delete table `{}` because {} other relation(s) depend on it",
-                        table.name, ref_count
-                    ))),
-                    None => {
-                        let dependent_relations = table.dependent_relations.clone();
+        let index = indexes.remove(index_id).unwrap();
+        assert_eq!(index_table_id, index.index_table_id);
 
-                        let objects = &[Object::TableId(table.id)];
+        // drop index table
+        let table = tables.remove(index_table_id);
+        if let Some(table) = table {
+            match database_core
+                .relation_ref_count
+                .get(&index_table_id)
+                .cloned()
+            {
+                Some(ref_count) => Err(MetaError::permission_denied(format!(
+                    "Fail to delete table `{}` because {} other relation(s) depend on it",
+                    table.name, ref_count
+                ))),
+                None => {
+                    let dependent_relations = table.dependent_relations.clone();
 
-                        let users_need_update = Self::update_user_privileges(&mut users, objects);
+                    let objects = &[Object::TableId(table.id)];
 
-                        commit_meta!(self, tables, indexes, users)?;
+                    let users_need_update = Self::update_user_privileges(&mut users, objects);
 
-                        // index table and index.
-                        user_core.decrease_ref_count(index.owner, 2);
+                    commit_meta!(self, tables, indexes, users)?;
 
-                        for user in users_need_update {
-                            self.notify_frontend(Operation::Update, Info::User(user))
-                                .await;
-                        }
+                    // index table and index.
+                    user_core.decrease_ref_count(index.owner, 2);
 
-                        self.notify_frontend(Operation::Delete, Info::Table(table))
+                    for user in users_need_update {
+                        self.notify_frontend(Operation::Update, Info::User(user))
                             .await;
+                    }
 
-                        for dependent_relation_id in dependent_relations {
-                            database_core.decrease_ref_count(dependent_relation_id);
-                        }
+                    for dependent_relation_id in dependent_relations {
+                        database_core.decrease_ref_count(dependent_relation_id);
+                    }
 
-                        let version = self
-                            .notify_frontend(Operation::Delete, Info::Index(index))
-                            .await;
+                    let version = self
+                        .notify_frontend(
+                            Operation::Delete,
+                            Info::RelationGroup(RelationGroup {
+                                relations: vec![
+                                    Relation {
+                                        relation_info: RelationInfo::Table(table.to_owned()).into(),
+                                    },
+                                    Relation {
+                                        relation_info: RelationInfo::Index(index).into(),
+                                    },
+                                ],
+                            }),
+                        )
+                        .await;
 
-                        Ok(version)
-                    }
+                    Ok(version)
                 }
-            } else {
-                bail!("index table doesn't exist",)
             }
         } else {
-            bail!("index doesn't exist",)
+            bail!("index table doesn't exist",)
+        }
+    }
+
+    pub async fn alter_table_name(
+        &self,
+        table_id: TableId,
+        table_name: &str,
+    ) -> MetaResult<NotificationVersion> {
+        let core = &mut *self.core.lock().await;
+        let database_core = &mut core.database;
+        database_core.ensure_table_id(table_id)?;
+
+        // 1. validate new table name.
+        let mut table = database_core.tables.get(&table_id).unwrap().clone();
+        let old_name = table.name.clone();
+        database_core.check_relation_name_duplicated(&(
+            table.database_id,
+            table.schema_id,
+            table_name.to_string(),
+        ))?;
+
+        let source = table.optional_associated_source_id.as_ref().map(
+            |OptionalAssociatedSourceId::AssociatedSourceId(id)| {
+                let mut source = database_core.sources.get(id).unwrap().clone();
+                source.name = table_name.to_string();
+                source
+            },
+        );
+
+        // 2. rename table and its definition.
+        table.name = table_name.to_string();
+        table.definition = alter_relation_rename(&table.definition, table_name);
+
+        // 3. update all relations that depend on this table, note that indexes are not included.
+        self.alter_relation_name_refs_inner(
+            database_core,
+            table_id,
+            &old_name,
+            table_name,
+            vec![table],
+            vec![],
+            vec![],
+            source,
+        )
+        .await
+    }
+
+    // TODO: refactor dependency cache in catalog manager for better performance.
+    #[allow(clippy::too_many_arguments)]
+    async fn alter_relation_name_refs_inner(
+        &self,
+        database_mgr: &mut DatabaseManager,
+        relation_id: RelationId,
+        from: &str,
+        to: &str,
+        mut to_update_tables: Vec<Table>,
+        mut to_update_views: Vec<View>,
+        mut to_update_sinks: Vec<Sink>,
+        to_update_source: Option<Source>,
+    ) -> MetaResult<NotificationVersion> {
+        for table in database_mgr.tables.values() {
+            if table.dependent_relations.contains(&relation_id) {
+                let mut table = table.clone();
+                table.definition = alter_relation_rename_refs(&table.definition, from, to);
+                to_update_tables.push(table);
+            }
+        }
+
+        for view in database_mgr.views.values() {
+            if view.dependent_relations.contains(&relation_id) {
+                let mut view = view.clone();
+                view.sql = alter_relation_rename_refs(&view.sql, from, to);
+                to_update_views.push(view);
+            }
+        }
+
+        for sink in database_mgr.sinks.values() {
+            if sink.dependent_relations.contains(&relation_id) {
+                let mut sink = sink.clone();
+                sink.definition = alter_relation_rename_refs(&sink.definition, from, to);
+                to_update_sinks.push(sink);
+            }
+        }
+
+        // commit meta.
+        let mut tables = BTreeMapTransaction::new(&mut database_mgr.tables);
+        let mut views = BTreeMapTransaction::new(&mut database_mgr.views);
+        let mut sinks = BTreeMapTransaction::new(&mut database_mgr.sinks);
+        let mut sources = BTreeMapTransaction::new(&mut database_mgr.sources);
+        to_update_tables.iter().for_each(|table| {
+            tables.insert(table.id, table.clone());
+        });
+        // TODO: there are some inconsistencies in the process of notifying the frontend, we need to
+        // support batch notification.
+        to_update_views.iter().for_each(|view| {
+            views.insert(view.id, view.clone());
+        });
+        to_update_sinks.iter().for_each(|sink| {
+            sinks.insert(sink.id, sink.clone());
+        });
+        if let Some(source) = &to_update_source {
+            sources.insert(source.id, source.clone());
         }
+        commit_meta!(self, tables, views, sinks, sources)?;
+
+        // 5. notify frontend.
+        assert!(
+            !to_update_tables.is_empty()
+                || !to_update_views.is_empty()
+                || !to_update_sinks.is_empty()
+                || to_update_source.is_some()
+        );
+        let version = self
+            .notify_frontend(
+                Operation::Update,
+                Info::RelationGroup(RelationGroup {
+                    relations: to_update_tables
+                        .into_iter()
+                        .map(|table| Relation {
+                            relation_info: RelationInfo::Table(table).into(),
+                        })
+                        .chain(to_update_views.into_iter().map(|view| Relation {
+                            relation_info: RelationInfo::View(view).into(),
+                        }))
+                        .chain(to_update_sinks.into_iter().map(|sink| Relation {
+                            relation_info: RelationInfo::Sink(sink).into(),
+                        }))
+                        .chain(to_update_source.into_iter().map(|source| Relation {
+                            relation_info: RelationInfo::Source(source).into(),
+                        }))
+                        .collect(),
+                }),
+            )
+            .await;
+
+        Ok(version)
+    }
+
+    pub async fn alter_view_name(
+        &self,
+        view_id: ViewId,
+        view_name: &str,
+    ) -> MetaResult<NotificationVersion> {
+        let core = &mut *self.core.lock().await;
+        let database_core = &mut core.database;
+        database_core.ensure_view_id(view_id)?;
+
+        // 1. validate new view name.
+        let mut view = database_core.views.get(&view_id).unwrap().clone();
+        let old_name = view.name.clone();
+        database_core.check_relation_name_duplicated(&(
+            view.database_id,
+            view.schema_id,
+            view_name.to_string(),
+        ))?;
+
+        // 2. rename view, note that there's no need to update its definition since it only stores
+        // the query part.
+        view.name = view_name.to_string();
+
+        // 3. update all relations that depend on this view.
+        self.alter_relation_name_refs_inner(
+            database_core,
+            view_id,
+            &old_name,
+            view_name,
+            vec![],
+            vec![view],
+            vec![],
+            None,
+        )
+        .await
+    }
+
+    pub async fn alter_sink_name(
+        &self,
+        sink_id: SinkId,
+        sink_name: &str,
+    ) -> MetaResult<NotificationVersion> {
+        let core = &mut *self.core.lock().await;
+        let database_core = &mut core.database;
+        database_core.ensure_sink_id(sink_id)?;
+
+        // 1. validate new sink name.
+        let mut sink = database_core.sinks.get(&sink_id).unwrap().clone();
+        database_core.check_relation_name_duplicated(&(
+            sink.database_id,
+            sink.schema_id,
+            sink_name.to_string(),
+        ))?;
+
+        // 2. rename sink and its definition.
+        sink.name = sink_name.to_string();
+        sink.definition = alter_relation_rename(&sink.definition, sink_name);
+
+        // 3. commit meta.
+        let mut sinks = BTreeMapTransaction::new(&mut database_core.sinks);
+        sinks.insert(sink_id, sink.clone());
+        commit_meta!(self, sinks)?;
+
+        let version = self
+            .notify_frontend_relation_info(Operation::Update, RelationInfo::Sink(sink))
+            .await;
+
+        Ok(version)
+    }
+
+    pub async fn alter_source_name(
+        &self,
+        source_id: SourceId,
+        source_name: &str,
+    ) -> MetaResult<NotificationVersion> {
+        let core = &mut *self.core.lock().await;
+        let database_core = &mut core.database;
+        database_core.ensure_source_id(source_id)?;
+
+        // 1. validate new source name.
+        let mut source = database_core.sources.get(&source_id).unwrap().clone();
+        database_core.check_relation_name_duplicated(&(
+            source.database_id,
+            source.schema_id,
+            source_name.to_string(),
+        ))?;
+
+        // 2. rename source and its definition.
+        let old_name = source.name.clone();
+        source.name = source_name.to_string();
+
+        // 3. update, commit and notify all relations that depend on this source.
+        self.alter_relation_name_refs_inner(
+            database_core,
+            source_id,
+            &old_name,
+            source_name,
+            vec![],
+            vec![],
+            vec![],
+            Some(source),
+        )
+        .await
+    }
+
+    pub async fn alter_index_name(
+        &self,
+        index_id: IndexId,
+        index_name: &str,
+    ) -> MetaResult<NotificationVersion> {
+        let core = &mut *self.core.lock().await;
+        let database_core = &mut core.database;
+        database_core.ensure_index_id(index_id)?;
+
+        // 1. validate new index name.
+        let mut index = database_core.indexes.get(&index_id).unwrap().clone();
+        database_core.check_relation_name_duplicated(&(
+            index.database_id,
+            index.schema_id,
+            index_name.to_string(),
+        ))?;
+        let mut index_table = database_core
+            .tables
+            .get(&index.index_table_id)
+            .unwrap()
+            .clone();
+
+        // 2. rename index name.
+        index.name = index_name.to_string();
+        index_table.name = index_name.to_string();
+        let mut indexes = BTreeMapTransaction::new(&mut database_core.indexes);
+        let mut tables = BTreeMapTransaction::new(&mut database_core.tables);
+        indexes.insert(index_id, index.clone());
+        tables.insert(index.index_table_id, index_table.clone());
+        commit_meta!(self, indexes, tables)?;
+
+        let version = self
+            .notify_frontend(
+                Operation::Update,
+                Info::RelationGroup(RelationGroup {
+                    relations: vec![
+                        Relation {
+                            relation_info: RelationInfo::Table(index_table).into(),
+                        },
+                        Relation {
+                            relation_info: RelationInfo::Index(index).into(),
+                        },
+                    ],
+                }),
+            )
+            .await;
+
+        Ok(version)
     }
 
     pub async fn start_create_source_procedure(&self, source: &Source) -> MetaResult<()> {
@@ -942,7 +1270,7 @@ where
         commit_meta!(self, sources)?;
 
         let version = self
-            .notify_frontend(Operation::Add, Info::Source(source.to_owned()))
+            .notify_frontend_relation_info(Operation::Add, RelationInfo::Source(source.to_owned()))
             .await;
 
         Ok(version)
@@ -967,37 +1295,36 @@ where
     pub async fn drop_source(&self, source_id: SourceId) -> MetaResult<NotificationVersion> {
         let core = &mut *self.core.lock().await;
         let database_core = &mut core.database;
+        database_core.ensure_source_id(source_id)?;
+
         let user_core = &mut core.user;
         let mut sources = BTreeMapTransaction::new(&mut database_core.sources);
         let mut users = BTreeMapTransaction::new(&mut user_core.user_info);
 
-        let source = sources.remove(source_id);
-        if let Some(source) = source {
-            match database_core.relation_ref_count.get(&source_id) {
-                Some(ref_count) => Err(MetaError::permission_denied(format!(
-                    "Fail to delete source `{}` because {} other relation(s) depend on it",
-                    source.name, ref_count
-                ))),
-                None => {
-                    let users_need_update =
-                        Self::update_user_privileges(&mut users, &[Object::SourceId(source_id)]);
-                    commit_meta!(self, sources, users)?;
+        let source = sources.remove(source_id).unwrap();
 
-                    user_core.decrease_ref(source.owner);
+        match database_core.relation_ref_count.get(&source_id) {
+            Some(ref_count) => Err(MetaError::permission_denied(format!(
+                "Fail to delete source `{}` because {} other relation(s) depend on it",
+                source.name, ref_count
+            ))),
+            None => {
+                let users_need_update =
+                    Self::update_user_privileges(&mut users, &[Object::SourceId(source_id)]);
+                commit_meta!(self, sources, users)?;
 
-                    for user in users_need_update {
-                        self.notify_frontend(Operation::Update, Info::User(user))
-                            .await;
-                    }
-                    let version = self
-                        .notify_frontend(Operation::Delete, Info::Source(source))
-                        .await;
+                user_core.decrease_ref(source.owner);
 
-                    Ok(version)
+                for user in users_need_update {
+                    self.notify_frontend(Operation::Update, Info::User(user))
+                        .await;
                 }
+                let version = self
+                    .notify_frontend_relation_info(Operation::Delete, RelationInfo::Source(source))
+                    .await;
+
+                Ok(version)
             }
-        } else {
-            Err(MetaError::catalog_id_not_found("source", source_id))
         }
     }
 
@@ -1074,18 +1401,27 @@ where
         }
         commit_meta!(self, sources, tables)?;
 
-        for internal_table in internal_tables {
-            self.notify_frontend(Operation::Add, Info::Table(internal_table))
-                .await;
-        }
-
-        self.notify_frontend(Operation::Add, Info::Table(mview.to_owned()))
-            .await;
-
-        // Currently frontend uses source's version
         let version = self
-            .notify_frontend(Operation::Add, Info::Source(source.to_owned()))
+            .notify_frontend(
+                Operation::Add,
+                Info::RelationGroup(RelationGroup {
+                    relations: vec![
+                        Relation {
+                            relation_info: RelationInfo::Table(mview.to_owned()).into(),
+                        },
+                        Relation {
+                            relation_info: RelationInfo::Source(source.to_owned()).into(),
+                        },
+                    ]
+                    .into_iter()
+                    .chain(internal_tables.into_iter().map(|internal_table| Relation {
+                        relation_info: RelationInfo::Table(internal_table).into(),
+                    }))
+                    .collect_vec(),
+                }),
+            )
             .await;
+
         Ok(version)
     }
 
@@ -1205,17 +1541,10 @@ where
 
                 user_core.decrease_ref_count(mview.owner, 2); // source and mview.
 
-                for index in indexes_removed {
-                    self.notify_frontend(Operation::Delete, Info::Index(index))
-                        .await;
-                }
-
-                for index_table in index_tables {
+                for index_table in &index_tables {
                     for dependent_relation_id in &index_table.dependent_relations {
                         database_core.decrease_ref_count(*dependent_relation_id);
                     }
-                    self.notify_frontend(Operation::Delete, Info::Table(index_table))
-                        .await;
                 }
 
                 for &dependent_relation_id in &mview.dependent_relations {
@@ -1225,15 +1554,37 @@ where
                     self.notify_frontend(Operation::Update, Info::User(user))
                         .await;
                 }
-                self.notify_frontend(Operation::Delete, Info::Table(mview))
-                    .await;
-                for internal_table in internal_tables {
-                    self.notify_frontend(Operation::Delete, Info::Table(internal_table))
-                        .await;
-                }
 
                 let version = self
-                    .notify_frontend(Operation::Delete, Info::Source(source))
+                    .notify_frontend(
+                        Operation::Delete,
+                        Info::RelationGroup(RelationGroup {
+                            relations: indexes_removed
+                                .into_iter()
+                                .map(|index| Relation {
+                                    relation_info: RelationInfo::Index(index).into(),
+                                })
+                                .chain(
+                                    internal_tables
+                                        .into_iter()
+                                        .chain(index_tables.into_iter())
+                                        .map(|internal_table| Relation {
+                                            relation_info: RelationInfo::Table(internal_table)
+                                                .into(),
+                                        }),
+                                )
+                                .chain(vec![
+                                    Relation {
+                                        relation_info: RelationInfo::Table(mview.to_owned()).into(),
+                                    },
+                                    Relation {
+                                        relation_info: RelationInfo::Source(source.to_owned())
+                                            .into(),
+                                    },
+                                ])
+                                .collect_vec(),
+                        }),
+                    )
                     .await;
 
                 let catalog_deleted_ids = index_table_ids
@@ -1330,11 +1681,20 @@ where
 
         commit_meta!(self, indexes, tables)?;
 
-        self.notify_frontend(Operation::Add, Info::Table(table.to_owned()))
-            .await;
-
         let version = self
-            .notify_frontend(Operation::Add, Info::Index(index.to_owned()))
+            .notify_frontend(
+                Operation::Add,
+                Info::RelationGroup(RelationGroup {
+                    relations: vec![
+                        Relation {
+                            relation_info: RelationInfo::Table(table.to_owned()).into(),
+                        },
+                        Relation {
+                            relation_info: RelationInfo::Index(index.to_owned()).into(),
+                        },
+                    ],
+                }),
+            )
             .await;
 
         Ok(version)
@@ -1395,13 +1755,20 @@ where
         }
         commit_meta!(self, sinks, tables)?;
 
-        for internal_table in internal_tables {
-            self.notify_frontend(Operation::Add, Info::Table(internal_table))
-                .await;
-        }
-
         let version = self
-            .notify_frontend(Operation::Add, Info::Sink(sink.to_owned()))
+            .notify_frontend(
+                Operation::Add,
+                Info::RelationGroup(RelationGroup {
+                    relations: vec![Relation {
+                        relation_info: RelationInfo::Sink(sink.to_owned()).into(),
+                    }]
+                    .into_iter()
+                    .chain(internal_tables.into_iter().map(|internal_table| Relation {
+                        relation_info: RelationInfo::Table(internal_table).into(),
+                    }))
+                    .collect_vec(),
+                }),
+            )
             .await;
 
         Ok(version)
@@ -1433,66 +1800,70 @@ where
     ) -> MetaResult<NotificationVersion> {
         let core = &mut *self.core.lock().await;
         let database_core = &mut core.database;
+        database_core.ensure_sink_id(sink_id)?;
+
         let user_core = &mut core.user;
         let mut sinks = BTreeMapTransaction::new(&mut database_core.sinks);
         let mut tables = BTreeMapTransaction::new(&mut database_core.tables);
         let mut users = BTreeMapTransaction::new(&mut user_core.user_info);
 
-        let sink = sinks.remove(sink_id);
-        if let Some(sink) = sink {
-            match database_core.relation_ref_count.get(&sink_id).cloned() {
-                Some(_) => bail!("No relation should depend on Sink"),
-                None => {
-                    let dependent_relations = sink.dependent_relations.clone();
-
-                    let objects = &[Object::SinkId(sink.id)]
-                        .into_iter()
-                        .chain(
-                            internal_table_ids
-                                .iter()
-                                .map(|table_id| Object::TableId(*table_id))
-                                .collect_vec(),
-                        )
-                        .collect_vec();
-
-                    let internal_tables = internal_table_ids
-                        .iter()
-                        .map(|internal_table_id| {
-                            tables
-                                .remove(*internal_table_id)
-                                .expect("internal table should exist")
-                        })
-                        .collect_vec();
-
-                    let users_need_update = Self::update_user_privileges(&mut users, objects);
+        let sink = sinks.remove(sink_id).unwrap();
+        match database_core.relation_ref_count.get(&sink_id).cloned() {
+            Some(_) => bail!("No relation should depend on Sink"),
+            None => {
+                let dependent_relations = sink.dependent_relations.clone();
 
-                    commit_meta!(self, sinks, tables, users)?;
+                let objects = &[Object::SinkId(sink.id)]
+                    .into_iter()
+                    .chain(
+                        internal_table_ids
+                            .iter()
+                            .map(|table_id| Object::TableId(*table_id)),
+                    )
+                    .collect_vec();
 
-                    user_core.decrease_ref(sink.owner);
+                let internal_tables = internal_table_ids
+                    .iter()
+                    .map(|internal_table_id| {
+                        tables
+                            .remove(*internal_table_id)
+                            .expect("internal table should exist")
+                    })
+                    .collect_vec();
 
-                    for user in users_need_update {
-                        self.notify_frontend(Operation::Update, Info::User(user))
-                            .await;
-                    }
+                let users_need_update = Self::update_user_privileges(&mut users, objects);
 
-                    for dependent_relation_id in dependent_relations {
-                        database_core.decrease_ref_count(dependent_relation_id);
-                    }
+                commit_meta!(self, sinks, tables, users)?;
 
-                    for internal_table in internal_tables {
-                        self.notify_frontend(Operation::Delete, Info::Table(internal_table))
-                            .await;
-                    }
+                user_core.decrease_ref(sink.owner);
 
-                    let version = self
-                        .notify_frontend(Operation::Delete, Info::Sink(sink))
+                for user in users_need_update {
+                    self.notify_frontend(Operation::Update, Info::User(user))
                         .await;
+                }
 
-                    Ok(version)
+                for dependent_relation_id in dependent_relations {
+                    database_core.decrease_ref_count(dependent_relation_id);
                 }
+
+                let version = self
+                    .notify_frontend(
+                        Operation::Delete,
+                        Info::RelationGroup(RelationGroup {
+                            relations: vec![Relation {
+                                relation_info: RelationInfo::Sink(sink.to_owned()).into(),
+                            }]
+                            .into_iter()
+                            .chain(internal_tables.into_iter().map(|internal_table| Relation {
+                                relation_info: RelationInfo::Table(internal_table).into(),
+                            }))
+                            .collect_vec(),
+                        }),
+                    )
+                    .await;
+
+                Ok(version)
             }
-        } else {
-            Err(MetaError::catalog_id_not_found("sink", sink_id))
         }
     }
 
@@ -1529,10 +1900,12 @@ where
     pub async fn finish_replace_table_procedure(
         &self,
         table: &Table,
+        table_col_index_mapping: ColIndexMapping,
     ) -> MetaResult<NotificationVersion> {
         let core = &mut *self.core.lock().await;
         let database_core = &mut core.database;
         let mut tables = BTreeMapTransaction::new(&mut database_core.tables);
+        let mut indexes = BTreeMapTransaction::new(&mut database_core.indexes);
         let key = (table.database_id, table.schema_id, table.name.clone());
         assert!(
             tables.contains_key(&table.id)
@@ -1540,14 +1913,61 @@ where
             "table must exist and be in altering procedure"
         );
 
+        let index_ids: Vec<_> = indexes
+            .tree_ref()
+            .iter()
+            .filter(|(_, index)| index.primary_table_id == table.id)
+            .map(|(index_id, _index)| *index_id)
+            .collect_vec();
+
+        let mut updated_indexes = vec![];
+
+        for index_id in &index_ids {
+            let mut index = indexes.get_mut(*index_id).unwrap();
+            index
+                .index_item
+                .iter_mut()
+                .for_each(|x| match x.rex_node.as_mut().unwrap() {
+                    RexNode::InputRef(input_col_idx) => {
+                        *input_col_idx =
+                            table_col_index_mapping.map(*input_col_idx as usize) as u32;
+                        assert_eq!(
+                            x.return_type,
+                            table.columns[*input_col_idx as usize]
+                                .column_desc
+                                .clone()
+                                .unwrap()
+                                .column_type
+                        );
+                    }
+                    RexNode::FuncCall(_) => unimplemented!(),
+                    _ => unreachable!(),
+                });
+
+            updated_indexes.push(indexes.get(index_id).cloned().unwrap());
+        }
+
         // TODO: Here we reuse the `creation` tracker for `alter` procedure, as an `alter` must
         database_core.in_progress_creation_tracker.remove(&key);
 
         tables.insert(table.id, table.clone());
-        commit_meta!(self, tables)?;
+        commit_meta!(self, tables, indexes)?;
 
+        // Group notification
         let version = self
-            .notify_frontend(Operation::Update, Info::Table(table.to_owned()))
+            .notify_frontend(
+                Operation::Update,
+                Info::RelationGroup(RelationGroup {
+                    relations: vec![Relation {
+                        relation_info: RelationInfo::Table(table.to_owned()).into(),
+                    }]
+                    .into_iter()
+                    .chain(updated_indexes.into_iter().map(|index| Relation {
+                        relation_info: RelationInfo::Index(index).into(),
+                    }))
+                    .collect_vec(),
+                }),
+            )
             .await;
 
         Ok(version)
@@ -1635,6 +2055,17 @@ where
             .notify_frontend(operation, info)
             .await
     }
+
+    async fn notify_frontend_relation_info(
+        &self,
+        operation: Operation,
+        relation_info: RelationInfo,
+    ) -> NotificationVersion {
+        self.env
+            .notification_manager()
+            .notify_frontend_relation_info(operation, relation_info)
+            .await
+    }
 }
 
 // User related methods
@@ -1909,6 +2340,7 @@ where
         grant_user.extend(user_ids);
 
         let mut version = 0;
+        // FIXME: user might not be updated.
         for user in user_updated {
             version = self
                 .notify_frontend(Operation::Update, Info::User(user))
@@ -2067,6 +2499,7 @@ where
         core.build_grant_relation_map();
 
         let mut version = 0;
+        // FIXME: user might not be updated.
         for (_, user_info) in user_updated {
             version = self
                 .notify_frontend(Operation::Update, Info::User(user_info))
diff --git a/src/meta/src/manager/catalog/utils.rs b/src/meta/src/manager/catalog/utils.rs
new file mode 100644
index 0000000000000..0d19dd3a21542
--- /dev/null
+++ b/src/meta/src/manager/catalog/utils.rs
@@ -0,0 +1,371 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 itertools::Itertools;
+use risingwave_sqlparser::ast::{
+    Array, CreateSink, CreateSinkStatement, CreateSourceStatement, Distinct, Expr, Function,
+    FunctionArg, FunctionArgExpr, Ident, ObjectName, Query, SelectItem, SetExpr, Statement,
+    TableAlias, TableFactor, TableWithJoins,
+};
+use risingwave_sqlparser::parser::Parser;
+
+/// `alter_relation_rename` renames a relation to a new name in its `Create` statement, and returns
+/// the updated definition raw sql. Note that the `definition` must be a `Create` statement and the
+/// `new_name` must be a valid identifier, it should be validated before calling this function. To
+/// update all relations that depend on the renamed one, use `alter_relation_rename_refs`.
+pub fn alter_relation_rename(definition: &str, new_name: &str) -> String {
+    // This happens when we try to rename a table that's created by `CREATE TABLE AS`. Remove it
+    // when we support `SHOW CREATE TABLE` for `CREATE TABLE AS`.
+    if definition.is_empty() {
+        tracing::warn!("found empty definition when renaming relation, ignored.");
+        return definition.into();
+    }
+    let ast = Parser::parse_sql(definition).expect("failed to parse relation definition");
+    let mut stmt = ast
+        .into_iter()
+        .exactly_one()
+        .expect("should contains only one statement");
+
+    match &mut stmt {
+        Statement::CreateTable { name, .. }
+        | Statement::CreateView { name, .. }
+        | Statement::CreateIndex { name, .. }
+        | Statement::CreateSource {
+            stmt: CreateSourceStatement {
+                source_name: name, ..
+            },
+        }
+        | Statement::CreateSink {
+            stmt: CreateSinkStatement {
+                sink_name: name, ..
+            },
+        } => replace_table_name(name, new_name),
+        _ => unreachable!(),
+    };
+
+    stmt.to_string()
+}
+
+/// `alter_relation_rename_refs` updates all references of renamed-relation in the definition of
+/// target relation's `Create` statement.
+pub fn alter_relation_rename_refs(definition: &str, from: &str, to: &str) -> String {
+    let ast = Parser::parse_sql(definition).expect("failed to parse relation definition");
+    let mut stmt = ast
+        .into_iter()
+        .exactly_one()
+        .expect("should contains only one statement");
+
+    match &mut stmt {
+        Statement::CreateTable {
+            query: Some(query), ..
+        }
+        | Statement::CreateView { query, .. }
+        | Statement::Query(query) // Used by view, actually we store a query as the definition of view.
+        | Statement::CreateSink {
+            stmt:
+                CreateSinkStatement {
+                    sink_from: CreateSink::AsQuery(query),
+                    ..
+                },
+        } => {
+            QueryRewriter::rewrite_query(query, from, to);
+        }
+        Statement::CreateIndex { table_name, .. }
+        | Statement::CreateSink {
+            stmt:
+                CreateSinkStatement {
+                    sink_from: CreateSink::From(table_name),
+                    ..
+                },
+        } => replace_table_name(table_name, to),
+        _ => unreachable!(),
+    };
+    stmt.to_string()
+}
+
+/// Replace the last ident in the `table_name` with the given name, the object name is ensured to be
+/// non-empty. e.g. `schema.table` or `database.schema.table`.
+fn replace_table_name(table_name: &mut ObjectName, to: &str) {
+    let idx = table_name.0.len() - 1;
+    table_name.0[idx] = Ident::new_unchecked(to);
+}
+
+/// `QueryRewriter` is a visitor that updates all references of relation named `from` to `to` in the
+/// given query, which is the part of create statement of `relation`.
+struct QueryRewriter<'a> {
+    from: &'a str,
+    to: &'a str,
+}
+
+impl QueryRewriter<'_> {
+    fn rewrite_query(query: &mut Query, from: &str, to: &str) {
+        let rewriter = QueryRewriter { from, to };
+        rewriter.visit_query(query)
+    }
+
+    /// Visit the query and update all references of relation named `from` to `to`.
+    fn visit_query(&self, query: &mut Query) {
+        if let Some(with) = &mut query.with {
+            for cte_table in &mut with.cte_tables {
+                self.visit_query(&mut cte_table.query);
+            }
+        }
+        self.visit_set_expr(&mut query.body);
+        for expr in &mut query.order_by {
+            self.visit_expr(&mut expr.expr);
+        }
+    }
+
+    /// Visit table factor and update all references of relation named `from` to `to`.
+    /// Rewrite idents(i.e. `schema.table`, `table`) that contains the old name in the
+    /// following pattern:
+    /// 1. `FROM a` to `FROM new_a AS a`
+    /// 2. `FROM a AS b` to `FROM new_a AS b`
+    ///
+    /// So that we DON'T have to:
+    /// 1. rewrite the select and expr part like `schema.table.column`, `table.column`,
+    /// `alias.column` etc.
+    /// 2. handle the case that the old name is used as alias.
+    /// 3. handle the case that the new name is used as alias.
+    fn visit_table_factor(&self, table_factor: &mut TableFactor) {
+        match table_factor {
+            TableFactor::Table { name, alias, .. } => {
+                let idx = name.0.len() - 1;
+                if name.0[idx].real_value() == self.from {
+                    if alias.is_none() {
+                        *alias = Some(TableAlias {
+                            name: Ident::new_unchecked(self.from),
+                            columns: vec![],
+                        });
+                    }
+                    name.0[idx] = Ident::new_unchecked(self.to);
+                }
+            }
+            TableFactor::Derived { subquery, .. } => self.visit_query(subquery),
+            TableFactor::TableFunction { args, .. } => {
+                for arg in args {
+                    self.visit_function_args(arg);
+                }
+            }
+            TableFactor::NestedJoin(table_with_joins) => {
+                self.visit_table_with_joins(table_with_joins);
+            }
+        }
+    }
+
+    /// Visit table with joins and update all references of relation named `from` to `to`.
+    fn visit_table_with_joins(&self, table_with_joins: &mut TableWithJoins) {
+        self.visit_table_factor(&mut table_with_joins.relation);
+        for join in &mut table_with_joins.joins {
+            self.visit_table_factor(&mut join.relation);
+        }
+    }
+
+    /// Visit query body expression and update all references.
+    fn visit_set_expr(&self, set_expr: &mut SetExpr) {
+        match set_expr {
+            SetExpr::Select(select) => {
+                if let Distinct::DistinctOn(exprs) = &mut select.distinct {
+                    for expr in exprs {
+                        self.visit_expr(expr);
+                    }
+                }
+                for select_item in &mut select.projection {
+                    self.visit_select_item(select_item);
+                }
+                for from_item in &mut select.from {
+                    self.visit_table_with_joins(from_item);
+                }
+                if let Some(where_clause) = &mut select.selection {
+                    self.visit_expr(where_clause);
+                }
+                for expr in &mut select.group_by {
+                    self.visit_expr(expr);
+                }
+                if let Some(having) = &mut select.having {
+                    self.visit_expr(having);
+                }
+            }
+            SetExpr::Query(query) => self.visit_query(query),
+            SetExpr::SetOperation { left, right, .. } => {
+                self.visit_set_expr(left);
+                self.visit_set_expr(right);
+            }
+            SetExpr::Values(_) => {}
+        }
+    }
+
+    /// Visit function arguments and update all references.
+    fn visit_function_args(&self, function_args: &mut FunctionArg) {
+        match function_args {
+            FunctionArg::Unnamed(arg) | FunctionArg::Named { arg, .. } => match arg {
+                FunctionArgExpr::Expr(expr) | FunctionArgExpr::ExprQualifiedWildcard(expr, _) => {
+                    self.visit_expr(expr)
+                }
+                FunctionArgExpr::QualifiedWildcard(_) | FunctionArgExpr::Wildcard => {}
+            },
+        }
+    }
+
+    /// Visit function and update all references.
+    fn visit_function(&self, function: &mut Function) {
+        for arg in &mut function.args {
+            self.visit_function_args(arg);
+        }
+    }
+
+    /// Visit expression and update all references.
+    fn visit_expr(&self, expr: &mut Expr) {
+        match expr {
+            Expr::FieldIdentifier(expr, ..)
+            | Expr::IsNull(expr)
+            | Expr::IsNotNull(expr)
+            | Expr::IsTrue(expr)
+            | Expr::IsNotTrue(expr)
+            | Expr::IsFalse(expr)
+            | Expr::IsNotFalse(expr)
+            | Expr::InList { expr, .. }
+            | Expr::SomeOp(expr)
+            | Expr::AllOp(expr)
+            | Expr::UnaryOp { expr, .. }
+            | Expr::Cast { expr, .. }
+            | Expr::TryCast { expr, .. }
+            | Expr::AtTimeZone {
+                timestamp: expr, ..
+            }
+            | Expr::Extract { expr, .. }
+            | Expr::Substring { expr, .. }
+            | Expr::Overlay { expr, .. }
+            | Expr::Trim { expr, .. }
+            | Expr::Nested(expr)
+            | Expr::ArrayIndex { obj: expr, .. } => self.visit_expr(expr),
+
+            Expr::InSubquery { expr, subquery, .. } => {
+                self.visit_expr(expr);
+                self.visit_query(subquery);
+            }
+            Expr::Between {
+                expr, low, high, ..
+            } => {
+                self.visit_expr(expr);
+                self.visit_expr(low);
+                self.visit_expr(high);
+            }
+
+            Expr::IsDistinctFrom(expr1, expr2)
+            | Expr::IsNotDistinctFrom(expr1, expr2)
+            | Expr::BinaryOp {
+                left: expr1,
+                right: expr2,
+                ..
+            } => {
+                self.visit_expr(expr1);
+                self.visit_expr(expr2);
+            }
+            Expr::Function(function) => self.visit_function(function),
+            Expr::Exists(query) | Expr::Subquery(query) => self.visit_query(query),
+
+            Expr::GroupingSets(exprs_vec) | Expr::Cube(exprs_vec) | Expr::Rollup(exprs_vec) => {
+                for exprs in exprs_vec {
+                    for expr in exprs {
+                        self.visit_expr(expr);
+                    }
+                }
+            }
+
+            Expr::Row(exprs) | Expr::Array(Array { elem: exprs, .. }) => {
+                for expr in exprs {
+                    self.visit_expr(expr);
+                }
+            }
+
+            // No need to visit.
+            Expr::Identifier(_)
+            | Expr::CompoundIdentifier(_)
+            | Expr::Collate { .. }
+            | Expr::Value(_)
+            | Expr::Parameter { .. }
+            | Expr::TypedString { .. }
+            | Expr::Case { .. } => {}
+        }
+    }
+
+    /// Visit select item and update all references.
+    fn visit_select_item(&self, select_item: &mut SelectItem) {
+        match select_item {
+            SelectItem::UnnamedExpr(expr)
+            | SelectItem::ExprQualifiedWildcard(expr, _)
+            | SelectItem::ExprWithAlias { expr, .. } => self.visit_expr(expr),
+            SelectItem::QualifiedWildcard(_) | SelectItem::Wildcard => {}
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::manager::catalog::utils::{alter_relation_rename, alter_relation_rename_refs};
+
+    #[test]
+    fn test_alter_table_rename() {
+        let definition = "CREATE TABLE foo (a int, b int)";
+        let new_name = "bar";
+        let expected = "CREATE TABLE bar (a INT, b INT)";
+        let actual = alter_relation_rename(definition, new_name);
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn test_rename_index_refs() {
+        let definition = "CREATE INDEX idx1 ON foo(v1 DESC, v2)";
+        let from = "foo";
+        let to = "bar";
+        let expected = "CREATE INDEX idx1 ON bar(v1 DESC, v2)";
+        let actual = alter_relation_rename_refs(definition, from, to);
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn test_rename_sink_refs() {
+        let definition =
+            "CREATE SINK sink_t FROM foo WITH (connector = 'kafka', format = 'append_only')";
+        let from = "foo";
+        let to = "bar";
+        let expected =
+            "CREATE SINK sink_t FROM bar WITH (connector = 'kafka', format = 'append_only')";
+        let actual = alter_relation_rename_refs(definition, from, to);
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn test_rename_with_alias_refs() {
+        let definition =
+            "CREATE MATERIALIZED VIEW mv1 AS SELECT foo.v1 AS m1v, foo.v2 AS m2v FROM foo";
+        let from = "foo";
+        let to = "bar";
+        let expected =
+            "CREATE MATERIALIZED VIEW mv1 AS SELECT foo.v1 AS m1v, foo.v2 AS m2v FROM bar AS foo";
+        let actual = alter_relation_rename_refs(definition, from, to);
+        assert_eq!(expected, actual);
+
+        let definition = "CREATE MATERIALIZED VIEW mv1 AS SELECT foo.v1 AS m1v, (foo.v2).v3 AS m2v FROM foo WHERE foo.v1 = 1 AND (foo.v2).v3 IS TRUE";
+        let expected = "CREATE MATERIALIZED VIEW mv1 AS SELECT foo.v1 AS m1v, (foo.v2).v3 AS m2v FROM bar AS foo WHERE foo.v1 = 1 AND (foo.v2).v3 IS TRUE";
+        let actual = alter_relation_rename_refs(definition, from, to);
+        assert_eq!(expected, actual);
+
+        let definition = "CREATE MATERIALIZED VIEW mv1 AS SELECT bar.v1 AS m1v, (bar.v2).v3 AS m2v FROM foo AS bar WHERE bar.v1 = 1";
+        let expected = "CREATE MATERIALIZED VIEW mv1 AS SELECT bar.v1 AS m1v, (bar.v2).v3 AS m2v FROM bar AS bar WHERE bar.v1 = 1";
+        let actual = alter_relation_rename_refs(definition, from, to);
+        assert_eq!(expected, actual);
+    }
+}
diff --git a/src/meta/src/manager/cluster.rs b/src/meta/src/manager/cluster.rs
index faabe2c827434..412c5fc58cea7 100644
--- a/src/meta/src/manager/cluster.rs
+++ b/src/meta/src/manager/cluster.rs
@@ -182,11 +182,13 @@ where
                 .await;
         }
 
-        // Notify local subscribers.
-        self.env
-            .notification_manager()
-            .notify_local_subscribers(LocalNotification::WorkerNodeIsDeleted(worker_node))
-            .await;
+        if worker_type != WorkerType::RiseCtl {
+            // Notify local subscribers.
+            self.env
+                .notification_manager()
+                .notify_local_subscribers(LocalNotification::WorkerNodeIsDeleted(worker_node))
+                .await;
+        }
 
         Ok(worker_type)
     }
diff --git a/src/meta/src/manager/env.rs b/src/meta/src/manager/env.rs
index 1840669c57b27..868aaeef1a53b 100644
--- a/src/meta/src/manager/env.rs
+++ b/src/meta/src/manager/env.rs
@@ -100,8 +100,13 @@ pub struct MetaOpts {
     /// Schedule space_reclaim_compaction for all compaction groups with this interval.
     pub periodic_space_reclaim_compaction_interval_sec: u64,
 
+    /// telemetry enabled in config file or not
+    pub telemetry_enabled: bool,
     /// Schedule ttl_reclaim_compaction for all compaction groups with this interval.
     pub periodic_ttl_reclaim_compaction_interval_sec: u64,
+
+    ///  compactor task limit = max_compactor_task_multiplier * cpu_core_num
+    pub max_compactor_task_multiplier: u32,
 }
 
 impl MetaOpts {
@@ -123,7 +128,9 @@ impl MetaOpts {
             security_group_id: None,
             connector_rpc_endpoint: None,
             periodic_space_reclaim_compaction_interval_sec: 60,
+            telemetry_enabled: false,
             periodic_ttl_reclaim_compaction_interval_sec: 60,
+            max_compactor_task_multiplier: 2,
         }
     }
 }
diff --git a/src/meta/src/manager/notification.rs b/src/meta/src/manager/notification.rs
index a6423e77139ea..ffbe9ca70285a 100644
--- a/src/meta/src/manager/notification.rs
+++ b/src/meta/src/manager/notification.rs
@@ -19,8 +19,11 @@ use std::sync::Arc;
 use risingwave_common::system_param::reader::SystemParamsReader;
 use risingwave_pb::common::{WorkerNode, WorkerType};
 use risingwave_pb::hummock::CompactTask;
+use risingwave_pb::meta::relation::RelationInfo;
 use risingwave_pb::meta::subscribe_response::{Info, Operation};
-use risingwave_pb::meta::{MetaSnapshot, SubscribeResponse, SubscribeType};
+use risingwave_pb::meta::{
+    MetaSnapshot, Relation, RelationGroup, SubscribeResponse, SubscribeType,
+};
 use tokio::sync::mpsc::{self, UnboundedSender};
 use tokio::sync::Mutex;
 use tonic::Status;
@@ -170,16 +173,67 @@ where
             .await
     }
 
+    pub async fn notify_frontend_relation_info(
+        &self,
+        operation: Operation,
+        relation_info: RelationInfo,
+    ) -> NotificationVersion {
+        self.notify_with_version(
+            SubscribeType::Frontend.into(),
+            operation,
+            Info::RelationGroup(RelationGroup {
+                relations: vec![Relation {
+                    relation_info: relation_info.into(),
+                }],
+            }),
+        )
+        .await
+    }
+
     pub async fn notify_hummock(&self, operation: Operation, info: Info) -> NotificationVersion {
         self.notify_with_version(SubscribeType::Hummock.into(), operation, info)
             .await
     }
 
+    pub async fn notify_hummock_relation_info(
+        &self,
+        operation: Operation,
+        relation_info: RelationInfo,
+    ) -> NotificationVersion {
+        self.notify_with_version(
+            SubscribeType::Hummock.into(),
+            operation,
+            Info::RelationGroup(RelationGroup {
+                relations: vec![Relation {
+                    relation_info: relation_info.into(),
+                }],
+            }),
+        )
+        .await
+    }
+
     pub async fn notify_compactor(&self, operation: Operation, info: Info) -> NotificationVersion {
         self.notify_with_version(SubscribeType::Compactor.into(), operation, info)
             .await
     }
 
+    pub async fn notify_compactor_relation_info(
+        &self,
+        operation: Operation,
+        relation_info: RelationInfo,
+    ) -> NotificationVersion {
+        self.notify_with_version(
+            SubscribeType::Compactor.into(),
+            operation,
+            Info::RelationGroup(RelationGroup {
+                relations: vec![Relation {
+                    relation_info: relation_info.into(),
+                }],
+            }),
+        )
+        .await
+    }
+
     pub async fn notify_compute(&self, operation: Operation, info: Info) -> NotificationVersion {
         self.notify_with_version(SubscribeType::Compute.into(), operation, info)
             .await
diff --git a/src/meta/src/model/catalog.rs b/src/meta/src/model/catalog.rs
index b96e3d5704fa1..de3ef793ff253 100644
--- a/src/meta/src/model/catalog.rs
+++ b/src/meta/src/model/catalog.rs
@@ -37,17 +37,17 @@ macro_rules! impl_model_for_catalog {
     ($name:ident, $cf:ident, $key_ty:ty, $key_fn:ident) => {
         impl MetadataModel for $name {
             type KeyType = $key_ty;
-            type ProstType = Self;
+            type PbType = Self;
 
             fn cf_name() -> String {
                 $cf.to_string()
             }
 
-            fn to_protobuf(&self) -> Self::ProstType {
+            fn to_protobuf(&self) -> Self::PbType {
                 self.clone()
             }
 
-            fn from_protobuf(prost: Self::ProstType) -> Self {
+            fn from_protobuf(prost: Self::PbType) -> Self {
                 prost
             }
 
diff --git a/src/meta/src/model/cluster.rs b/src/meta/src/model/cluster.rs
index 50723dcca7f0c..17ea0b62b4243 100644
--- a/src/meta/src/model/cluster.rs
+++ b/src/meta/src/model/cluster.rs
@@ -46,17 +46,17 @@ pub struct Worker {
 
 impl MetadataModel for Worker {
     type KeyType = HostAddress;
-    type ProstType = WorkerNode;
+    type PbType = WorkerNode;
 
     fn cf_name() -> String {
         WORKER_CF_NAME.to_string()
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.worker_node.clone()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         Self {
             worker_node: prost,
             expire_at: INVALID_EXPIRE_AT,
diff --git a/src/meta/src/model/connection.rs b/src/meta/src/model/connection.rs
index 7f762ab931204..81ebbf0f86f99 100644
--- a/src/meta/src/model/connection.rs
+++ b/src/meta/src/model/connection.rs
@@ -21,17 +21,17 @@ const CONNECTION_CF_NAME: &str = "cf/connection";
 
 impl MetadataModel for Connection {
     type KeyType = u32;
-    type ProstType = Connection;
+    type PbType = Connection;
 
     fn cf_name() -> String {
         CONNECTION_CF_NAME.to_string()
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.clone()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost
     }
 
diff --git a/src/meta/src/model/error.rs b/src/meta/src/model/error.rs
index 083efbe8f1c19..e53a6ae3547f7 100644
--- a/src/meta/src/model/error.rs
+++ b/src/meta/src/model/error.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use anyhow::anyhow;
-use risingwave_pb::ProstFieldNotFound;
+use risingwave_pb::PbFieldNotFound;
 use thiserror::Error;
 
 use crate::storage::MetaStoreError;
@@ -25,15 +25,15 @@ pub enum MetadataModelError {
     #[error("Meta store error: {0}")]
     MetaStoreError(#[from] MetaStoreError),
 
-    #[error("Prost decode error: {0}")]
-    ProstDecode(#[from] prost::DecodeError),
+    #[error("Pb decode error: {0}")]
+    PbDecode(#[from] prost::DecodeError),
 
     #[error(transparent)]
     InternalError(anyhow::Error),
 }
 
-impl From<ProstFieldNotFound> for MetadataModelError {
-    fn from(p: ProstFieldNotFound) -> Self {
+impl From<PbFieldNotFound> for MetadataModelError {
+    fn from(p: PbFieldNotFound) -> Self {
         MetadataModelError::InternalError(anyhow::anyhow!(
             "Failed to decode prost: field not found `{}`",
             p.0
diff --git a/src/meta/src/model/mod.rs b/src/meta/src/model/mod.rs
index 5acbe36f63a2e..fa1b91abbdac2 100644
--- a/src/meta/src/model/mod.rs
+++ b/src/meta/src/model/mod.rs
@@ -63,7 +63,7 @@ mod private {
 #[async_trait]
 pub trait MetadataModel: std::fmt::Debug + Sized + private::MetadataModelMarker {
     /// Serialized prost message type.
-    type ProstType: Message + Default;
+    type PbType: Message + Default;
     /// Serialized key type.
     type KeyType: Message;
 
@@ -71,7 +71,7 @@ pub trait MetadataModel: std::fmt::Debug + Sized + private::MetadataModelMarker
     fn cf_name() -> String;
 
     /// Serialize to protobuf.
-    fn to_protobuf(&self) -> Self::ProstType;
+    fn to_protobuf(&self) -> Self::PbType;
 
     /// Serialize to protobuf encoded byte vector.
     fn to_protobuf_encoded_vec(&self) -> Vec<u8> {
@@ -79,7 +79,7 @@ pub trait MetadataModel: std::fmt::Debug + Sized + private::MetadataModelMarker
     }
 
     /// Deserialize from protobuf.
-    fn from_protobuf(prost: Self::ProstType) -> Self;
+    fn from_protobuf(prost: Self::PbType) -> Self;
 
     /// Current record key.
     fn key(&self) -> MetadataModelResult<Self::KeyType>;
@@ -93,7 +93,7 @@ pub trait MetadataModel: std::fmt::Debug + Sized + private::MetadataModelMarker
         bytes_vec
             .iter()
             .map(|(_k, v)| {
-                Self::ProstType::decode(v.as_slice())
+                Self::PbType::decode(v.as_slice())
                     .map(Self::from_protobuf)
                     .map_err(Into::into)
             })
@@ -108,7 +108,7 @@ pub trait MetadataModel: std::fmt::Debug + Sized + private::MetadataModelMarker
         bytes_vec
             .iter()
             .map(|(_k, v)| {
-                Self::ProstType::decode(v.as_slice())
+                Self::PbType::decode(v.as_slice())
                     .map(Self::from_protobuf)
                     .map_err(Into::into)
             })
@@ -155,7 +155,7 @@ pub trait MetadataModel: std::fmt::Debug + Sized + private::MetadataModelMarker
                 return Ok(None);
             }
         };
-        let model = Self::from_protobuf(Self::ProstType::decode(byte_vec.as_slice())?);
+        let model = Self::from_protobuf(Self::PbType::decode(byte_vec.as_slice())?);
         Ok(Some(model))
     }
 }
diff --git a/src/meta/src/model/stream.rs b/src/meta/src/model/stream.rs
index 05e680a034756..4b6d41f0fb9ca 100644
--- a/src/meta/src/model/stream.rs
+++ b/src/meta/src/model/stream.rs
@@ -21,11 +21,10 @@ use risingwave_connector::source::SplitImpl;
 use risingwave_pb::common::{ParallelUnit, ParallelUnitMapping};
 use risingwave_pb::meta::table_fragments::actor_status::ActorState;
 use risingwave_pb::meta::table_fragments::{ActorStatus, Fragment, State};
-use risingwave_pb::meta::TableFragments as ProstTableFragments;
+use risingwave_pb::meta::PbTableFragments;
 use risingwave_pb::stream_plan::stream_node::NodeBody;
 use risingwave_pb::stream_plan::{
-    FragmentTypeFlag, SourceNode, StreamActor, StreamEnvironment as ProstStreamEnvironment,
-    StreamNode,
+    FragmentTypeFlag, PbStreamEnvironment, SourceNode, StreamActor, StreamNode,
 };
 
 use super::{ActorId, FragmentId};
@@ -68,13 +67,13 @@ pub struct StreamEnvironment {
 }
 
 impl StreamEnvironment {
-    pub fn to_protobuf(&self) -> ProstStreamEnvironment {
-        ProstStreamEnvironment {
+    pub fn to_protobuf(&self) -> PbStreamEnvironment {
+        PbStreamEnvironment {
             timezone: self.timezone.clone().unwrap_or("".into()),
         }
     }
 
-    pub fn from_protobuf(prost: &ProstStreamEnvironment) -> Self {
+    pub fn from_protobuf(prost: &PbStreamEnvironment) -> Self {
         Self {
             timezone: if prost.get_timezone().is_empty() {
                 None
@@ -87,14 +86,14 @@ impl StreamEnvironment {
 
 impl MetadataModel for TableFragments {
     type KeyType = u32;
-    type ProstType = ProstTableFragments;
+    type PbType = PbTableFragments;
 
     fn cf_name() -> String {
         TABLE_FRAGMENTS_CF_NAME.to_string()
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
-        Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
+        Self::PbType {
             table_id: self.table_id.table_id(),
             state: self.state as _,
             fragments: self.fragments.clone().into_iter().collect(),
@@ -104,7 +103,7 @@ impl MetadataModel for TableFragments {
         }
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         let env = StreamEnvironment::from_protobuf(prost.get_env().unwrap());
         Self {
             table_id: TableId::new(prost.table_id),
diff --git a/src/meta/src/model/user.rs b/src/meta/src/model/user.rs
index b77f0aa16942f..1a6cf5392ee49 100644
--- a/src/meta/src/model/user.rs
+++ b/src/meta/src/model/user.rs
@@ -22,17 +22,17 @@ const USER_INFO_CF_NAME: &str = "cf/user_info";
 /// `UserInfo` stores the user information.
 impl MetadataModel for UserInfo {
     type KeyType = u32;
-    type ProstType = UserInfo;
+    type PbType = UserInfo;
 
     fn cf_name() -> String {
         USER_INFO_CF_NAME.to_string()
     }
 
-    fn to_protobuf(&self) -> Self::ProstType {
+    fn to_protobuf(&self) -> Self::PbType {
         self.clone()
     }
 
-    fn from_protobuf(prost: Self::ProstType) -> Self {
+    fn from_protobuf(prost: Self::PbType) -> Self {
         prost
     }
 
diff --git a/src/meta/src/rpc/ddl_controller.rs b/src/meta/src/rpc/ddl_controller.rs
index a52f526ca3ce3..93ce88dfdb5ed 100644
--- a/src/meta/src/rpc/ddl_controller.rs
+++ b/src/meta/src/rpc/ddl_controller.rs
@@ -15,6 +15,7 @@
 use itertools::Itertools;
 use risingwave_common::util::column_index_mapping::ColIndexMapping;
 use risingwave_pb::catalog::{Connection, Database, Function, Schema, Source, Table, View};
+use risingwave_pb::ddl_service::alter_relation_name_request::Relation;
 use risingwave_pb::ddl_service::DdlProgress;
 use risingwave_pb::stream_plan::StreamFragmentGraph as StreamFragmentGraphProto;
 
@@ -62,9 +63,10 @@ pub enum DdlCommand {
     DropFunction(FunctionId),
     CreateView(View),
     DropView(ViewId),
-    CreatingStreamingJob(StreamingJob, StreamFragmentGraphProto),
+    CreateStreamingJob(StreamingJob, StreamFragmentGraphProto),
     DropStreamingJob(StreamingJobId),
     ReplaceTable(StreamingJob, StreamFragmentGraphProto, ColIndexMapping),
+    AlterRelationName(Relation, String),
     CreateConnection(Connection),
     DropConnection(String),
 }
@@ -135,7 +137,7 @@ where
                 DdlCommand::DropFunction(function_id) => ctrl.drop_function(function_id).await,
                 DdlCommand::CreateView(view) => ctrl.create_view(view).await,
                 DdlCommand::DropView(view_id) => ctrl.drop_view(view_id).await,
-                DdlCommand::CreatingStreamingJob(stream_job, fragment_graph) => {
+                DdlCommand::CreateStreamingJob(stream_job, fragment_graph) => {
                     ctrl.create_streaming_job(stream_job, fragment_graph).await
                 }
                 DdlCommand::DropStreamingJob(job_id) => ctrl.drop_streaming_job(job_id).await,
@@ -143,6 +145,9 @@ where
                     ctrl.replace_table(stream_job, fragment_graph, table_col_index_mapping)
                         .await
                 }
+                DdlCommand::AlterRelationName(relation, name) => {
+                    ctrl.alter_relation_name(relation, &name).await
+                }
                 DdlCommand::CreateConnection(connection) => {
                     ctrl.create_connection(connection).await
                 }
@@ -550,7 +555,12 @@ where
 
         let result = try {
             let (ctx, table_fragments) = self
-                .build_replace_table(env, &stream_job, fragment_graph, table_col_index_mapping)
+                .build_replace_table(
+                    env,
+                    &stream_job,
+                    fragment_graph,
+                    table_col_index_mapping.clone(),
+                )
                 .await?;
 
             self.stream_manager
@@ -559,7 +569,10 @@ where
         };
 
         match result {
-            Ok(_) => self.finish_replace_table(&stream_job).await,
+            Ok(_) => {
+                self.finish_replace_table(&stream_job, table_col_index_mapping)
+                    .await
+            }
             Err(err) => {
                 self.cancel_replace_table(&stream_job).await?;
                 Err(err)
@@ -687,13 +700,14 @@ where
     async fn finish_replace_table(
         &self,
         stream_job: &StreamingJob,
+        table_col_index_mapping: ColIndexMapping,
     ) -> MetaResult<NotificationVersion> {
         let StreamingJob::Table(None, table) = stream_job else {
             unreachable!("unexpected job: {stream_job:?}")
         };
 
         self.catalog_manager
-            .finish_replace_table_procedure(table)
+            .finish_replace_table_procedure(table, table_col_index_mapping)
             .await
     }
 
@@ -706,4 +720,38 @@ where
             .cancel_replace_table_procedure(table)
             .await
     }
+
+    async fn alter_relation_name(
+        &self,
+        relation: Relation,
+        new_name: &str,
+    ) -> MetaResult<NotificationVersion> {
+        match relation {
+            Relation::TableId(table_id) => {
+                self.catalog_manager
+                    .alter_table_name(table_id, new_name)
+                    .await
+            }
+            Relation::ViewId(view_id) => {
+                self.catalog_manager
+                    .alter_view_name(view_id, new_name)
+                    .await
+            }
+            Relation::IndexId(index_id) => {
+                self.catalog_manager
+                    .alter_index_name(index_id, new_name)
+                    .await
+            }
+            Relation::SinkId(sink_id) => {
+                self.catalog_manager
+                    .alter_sink_name(sink_id, new_name)
+                    .await
+            }
+            Relation::SourceId(source_id) => {
+                self.catalog_manager
+                    .alter_source_name(source_id, new_name)
+                    .await
+            }
+        }
+    }
 }
diff --git a/src/meta/src/rpc/election_client.rs b/src/meta/src/rpc/election_client.rs
index 1d9ea210bce3b..0195d211cea10 100644
--- a/src/meta/src/rpc/election_client.rs
+++ b/src/meta/src/rpc/election_client.rs
@@ -352,7 +352,7 @@ mod tests {
         let handle = tokio::spawn(async move {
             let addr = "0.0.0.0:2388".parse().unwrap();
             let mut builder = etcd_client::SimServer::builder();
-            builder.serve(addr).await;
+            builder.serve(addr).await.unwrap();
         });
 
         let mut clients: Vec<(watch::Sender<()>, Arc<dyn ElectionClient>)> = vec![];
diff --git a/src/meta/src/rpc/metrics.rs b/src/meta/src/rpc/metrics.rs
index 8cc8705334add..26eb0ec0c7263 100644
--- a/src/meta/src/rpc/metrics.rs
+++ b/src/meta/src/rpc/metrics.rs
@@ -99,6 +99,9 @@ pub struct MetaMetrics {
     /// compaction
     pub compact_pending_bytes: IntGaugeVec,
     pub compact_level_compression_ratio: GenericGaugeVec<AtomicF64>,
+
+    /// The number of compactor CPU need to be scale.
+    pub scale_compactor_core_num: IntGauge,
 }
 
 impl MetaMetrics {
@@ -273,6 +276,12 @@ impl MetaMetrics {
             registry,
         )
         .unwrap();
+        let scale_compactor_core_num = register_int_gauge_with_registry!(
+            "storage_compactor_suggest_core_count",
+            "num of CPU to be scale to meet compaction need",
+            registry
+        )
+        .unwrap();
 
         let meta_type = register_int_gauge_vec_with_registry!(
             "meta_num",
@@ -330,6 +339,7 @@ impl MetaMetrics {
             meta_type,
             compact_pending_bytes,
             compact_level_compression_ratio,
+            scale_compactor_core_num,
         }
     }
 
diff --git a/src/meta/src/rpc/server.rs b/src/meta/src/rpc/server.rs
index ff7e6c9798682..81f455f9c6bc1 100644
--- a/src/meta/src/rpc/server.rs
+++ b/src/meta/src/rpc/server.rs
@@ -18,7 +18,12 @@ use std::time::Duration;
 
 use either::Either;
 use etcd_client::ConnectOptions;
+use futures::future::join_all;
+use risingwave_common::config::MetaBackend;
 use risingwave_common::monitor::process_linux::monitor_process;
+use risingwave_common::system_param::local_manager::LocalSystemParamsManager;
+use risingwave_common::telemetry::manager::TelemetryManager;
+use risingwave_common::telemetry::telemetry_env_enabled;
 use risingwave_common_service::metrics_manager::MetricsManager;
 use risingwave_pb::backup_service::backup_service_server::BackupServiceServer;
 use risingwave_pb::ddl_service::ddl_service_server::DdlServiceServer;
@@ -31,6 +36,7 @@ use risingwave_pb::meta::notification_service_server::NotificationServiceServer;
 use risingwave_pb::meta::scale_service_server::ScaleServiceServer;
 use risingwave_pb::meta::stream_manager_service_server::StreamManagerServiceServer;
 use risingwave_pb::meta::system_params_service_server::SystemParamsServiceServer;
+use risingwave_pb::meta::telemetry_info_service_server::TelemetryInfoServiceServer;
 use risingwave_pb::meta::SystemParams;
 use risingwave_pb::user::user_service_server::UserServiceServer;
 use risingwave_rpc_client::ComputeClientPool;
@@ -61,9 +67,11 @@ use crate::rpc::service::hummock_service::HummockServiceImpl;
 use crate::rpc::service::meta_member_service::MetaMemberServiceImpl;
 use crate::rpc::service::stream_service::StreamServiceImpl;
 use crate::rpc::service::system_params_service::SystemParamsServiceImpl;
+use crate::rpc::service::telemetry_service::TelemetryInfoServiceImpl;
 use crate::rpc::service::user_service::UserServiceImpl;
 use crate::storage::{EtcdMetaStore, MemStore, MetaStore, WrappedEtcdClient as EtcdClient};
 use crate::stream::{GlobalStreamManager, SourceManager};
+use crate::telemetry::{MetaReportCreator, MetaTelemetryInfoFetcher};
 use crate::{hummock, MetaResult};
 
 #[derive(Debug)]
@@ -123,10 +131,16 @@ pub async fn rpc_serve(
                     .map_err(|e| anyhow::anyhow!("failed to connect etcd {}", e))?;
             let meta_store = Arc::new(EtcdMetaStore::new(client));
 
+            // `with_keep_alive` option will break the long connection in election client.
+            let mut election_options = ConnectOptions::default();
+            if let Some((username, password)) = &credentials {
+                election_options = election_options.with_user(username, password)
+            }
+
             let election_client = Arc::new(
                 EtcdElectionClient::new(
                     endpoints,
-                    Some(options),
+                    Some(election_options),
                     auth_enabled,
                     address_info.advertise_addr.clone(),
                 )
@@ -373,6 +387,7 @@ pub async fn start_service_as_election_leader<S: MetaStore>(
 
     let (barrier_scheduler, scheduled_barriers) = BarrierScheduler::new_pair(
         hummock_manager.clone(),
+        meta_metrics.clone(),
         system_params_reader.checkpoint_frequency() as usize,
     );
 
@@ -480,7 +495,6 @@ pub async fn start_service_as_election_leader<S: MetaStore>(
     );
     let hummock_srv = HummockServiceImpl::new(
         hummock_manager.clone(),
-        compactor_manager.clone(),
         vacuum_manager.clone(),
         fragment_manager.clone(),
     );
@@ -494,6 +508,7 @@ pub async fn start_service_as_election_leader<S: MetaStore>(
     );
     let health_srv = HealthServiceImpl::new();
     let backup_srv = BackupServiceImpl::new(backup_manager);
+    let telemetry_srv = TelemetryInfoServiceImpl::new(meta_store.clone());
     let system_params_srv = SystemParamsServiceImpl::new(system_params_manager.clone());
 
     if let Some(prometheus_addr) = address_info.prometheus_addr {
@@ -546,21 +561,47 @@ pub async fn start_service_as_election_leader<S: MetaStore>(
     });
     sub_tasks.push((stream_abort_handler, abort_sender));
 
+    let local_system_params_manager = LocalSystemParamsManager::new(system_params_reader.clone());
+
+    let mgr = TelemetryManager::new(
+        local_system_params_manager.watch_params(),
+        Arc::new(MetaTelemetryInfoFetcher::new(meta_store.clone())),
+        Arc::new(MetaReportCreator::new()),
+    );
+
+    // May start telemetry reporting
+    if let MetaBackend::Etcd = meta_store.meta_store_type() && env.opts.telemetry_enabled && telemetry_env_enabled(){
+        if system_params_reader.telemetry_enabled(){
+            mgr.start_telemetry_reporting();
+        }
+        sub_tasks.push(mgr.watch_params_change());
+    } else {
+        tracing::info!("Telemetry didn't start due to meta backend or config");
+    }
+
     let shutdown_all = async move {
+        let mut handles = Vec::with_capacity(sub_tasks.len());
+
         for (join_handle, shutdown_sender) in sub_tasks {
             if let Err(_err) = shutdown_sender.send(()) {
                 continue;
             }
-            // The barrier manager can't be shutdown gracefully if it's under recovering, try to
-            // abort it using timeout.
-            match tokio::time::timeout(Duration::from_secs(1), join_handle).await {
-                Ok(Err(err)) => {
-                    tracing::warn!("Failed to join shutdown: {:?}", err);
-                }
-                Err(e) => {
-                    tracing::warn!("Join shutdown timeout: {:?}", e);
+
+            handles.push(join_handle);
+        }
+
+        // The barrier manager can't be shutdown gracefully if it's under recovering, try to
+        // abort it using timeout.
+        match tokio::time::timeout(Duration::from_secs(1), join_all(handles)).await {
+            Ok(results) => {
+                for result in results {
+                    if let Err(err) = result {
+                        tracing::warn!("Failed to join shutdown: {:?}", err);
+                    }
                 }
-                _ => {}
+            }
+            Err(e) => {
+                tracing::warn!("Join shutdown timeout: {:?}", e);
             }
         }
     };
@@ -579,6 +620,7 @@ pub async fn start_service_as_election_leader<S: MetaStore>(
         .add_service(HealthServer::new(health_srv))
         .add_service(BackupServiceServer::new(backup_srv))
         .add_service(SystemParamsServiceServer::new(system_params_srv))
+        .add_service(TelemetryInfoServiceServer::new(telemetry_srv))
         .serve_with_shutdown(address_info.listen_addr, async move {
             tokio::select! {
                 res = svc_shutdown_rx.changed() => {
diff --git a/src/meta/src/rpc/service/ddl_service.rs b/src/meta/src/rpc/service/ddl_service.rs
index 77a0f98be9fb5..7b55c1188f5b3 100644
--- a/src/meta/src/rpc/service/ddl_service.rs
+++ b/src/meta/src/rpc/service/ddl_service.rs
@@ -24,7 +24,7 @@ use risingwave_connector::source::KAFKA_CONNECTOR;
 use risingwave_pb::catalog::table::OptionalAssociatedSourceId;
 use risingwave_pb::catalog::{connection, Connection};
 use risingwave_pb::ddl_service::ddl_service_server::DdlService;
-use risingwave_pb::ddl_service::drop_table_request::SourceId as ProstSourceId;
+use risingwave_pb::ddl_service::drop_table_request::PbSourceId;
 use risingwave_pb::ddl_service::*;
 use risingwave_pb::stream_plan::stream_node::NodeBody;
 use tonic::{Request, Response, Status};
@@ -236,7 +236,7 @@ where
 
         let version = self
             .ddl_controller
-            .run_command(DdlCommand::CreatingStreamingJob(stream_job, fragment_graph))
+            .run_command(DdlCommand::CreateStreamingJob(stream_job, fragment_graph))
             .await?;
 
         Ok(Response::new(CreateSinkResponse {
@@ -279,7 +279,7 @@ where
 
         let version = self
             .ddl_controller
-            .run_command(DdlCommand::CreatingStreamingJob(stream_job, fragment_graph))
+            .run_command(DdlCommand::CreateStreamingJob(stream_job, fragment_graph))
             .await?;
 
         Ok(Response::new(CreateMaterializedViewResponse {
@@ -328,7 +328,7 @@ where
 
         let version = self
             .ddl_controller
-            .run_command(DdlCommand::CreatingStreamingJob(stream_job, fragment_graph))
+            .run_command(DdlCommand::CreateStreamingJob(stream_job, fragment_graph))
             .await?;
 
         Ok(Response::new(CreateIndexResponse {
@@ -436,7 +436,7 @@ where
 
         let version = self
             .ddl_controller
-            .run_command(DdlCommand::CreatingStreamingJob(stream_job, fragment_graph))
+            .run_command(DdlCommand::CreateStreamingJob(stream_job, fragment_graph))
             .await?;
 
         Ok(Response::new(CreateTableResponse {
@@ -457,7 +457,7 @@ where
         let version = self
             .ddl_controller
             .run_command(DdlCommand::DropStreamingJob(StreamingJobId::Table(
-                source_id.map(|ProstSourceId::Id(id)| id),
+                source_id.map(|PbSourceId::Id(id)| id),
                 table_id,
             )))
             .await?;
@@ -563,6 +563,21 @@ where
         }
     }
 
+    async fn alter_relation_name(
+        &self,
+        request: Request<AlterRelationNameRequest>,
+    ) -> Result<Response<AlterRelationNameResponse>, Status> {
+        let AlterRelationNameRequest { relation, new_name } = request.into_inner();
+        let version = self
+            .ddl_controller
+            .run_command(DdlCommand::AlterRelationName(relation.unwrap(), new_name))
+            .await?;
+        Ok(Response::new(AlterRelationNameResponse {
+            status: None,
+            version,
+        }))
+    }
+
     async fn get_ddl_progress(
         &self,
         _request: Request<GetDdlProgressRequest>,
diff --git a/src/meta/src/rpc/service/hummock_service.rs b/src/meta/src/rpc/service/hummock_service.rs
index 2aea5b58e3f72..ac07cb082f77e 100644
--- a/src/meta/src/rpc/service/hummock_service.rs
+++ b/src/meta/src/rpc/service/hummock_service.rs
@@ -23,9 +23,7 @@ use risingwave_pb::hummock::*;
 use tonic::{Request, Response, Status};
 
 use crate::hummock::compaction::ManualCompactionOption;
-use crate::hummock::{
-    CompactionResumeTrigger, CompactorManagerRef, HummockManagerRef, VacuumManagerRef,
-};
+use crate::hummock::{CompactionResumeTrigger, HummockManagerRef, VacuumManagerRef};
 use crate::manager::FragmentManagerRef;
 use crate::rpc::service::RwReceiverStream;
 use crate::storage::MetaStore;
@@ -35,7 +33,6 @@ where
     S: MetaStore,
 {
     hummock_manager: HummockManagerRef<S>,
-    compactor_manager: CompactorManagerRef,
     vacuum_manager: VacuumManagerRef<S>,
     fragment_manager: FragmentManagerRef<S>,
 }
@@ -46,13 +43,11 @@ where
 {
     pub fn new(
         hummock_manager: HummockManagerRef<S>,
-        compactor_manager: CompactorManagerRef,
         vacuum_trigger: VacuumManagerRef<S>,
         fragment_manager: FragmentManagerRef<S>,
     ) -> Self {
         HummockServiceImpl {
             hummock_manager,
-            compactor_manager,
             vacuum_manager: vacuum_trigger,
             fragment_manager,
         }
@@ -156,6 +151,7 @@ where
                         Some(req.table_stats_change),
                     )
                     .await?;
+
                 Ok(Response::new(ReportCompactionTasksResponse {
                     status: None,
                 }))
@@ -239,9 +235,16 @@ where
                 format!("invalid hummock context {}", context_id),
             ));
         }
-        let rx = self
-            .compactor_manager
-            .add_compactor(context_id, req.max_concurrent_task_number);
+        let compactor_manager = self.hummock_manager.compactor_manager.clone();
+        let max_compactor_task_multiplier =
+            self.hummock_manager.env.opts.max_compactor_task_multiplier;
+
+        let max_task_num = std::cmp::min(
+            req.max_concurrent_task_number,
+            (req.cpu_core_num * max_compactor_task_multiplier) as u64,
+        );
+        let rx = compactor_manager.add_compactor(context_id, max_task_num, req.cpu_core_num);
+
         // Trigger compaction on all compaction groups.
         for cg_id in self.hummock_manager.compaction_group_ids().await {
             self.hummock_manager
@@ -253,16 +256,17 @@ where
     }
 
     // TODO: convert this into a stream.
-    async fn report_compaction_task_progress(
+    async fn compactor_heartbeat(
         &self,
-        request: Request<ReportCompactionTaskProgressRequest>,
-    ) -> Result<Response<ReportCompactionTaskProgressResponse>, Status> {
+        request: Request<CompactorHeartbeatRequest>,
+    ) -> Result<Response<CompactorHeartbeatResponse>, Status> {
         let req = request.into_inner();
-        self.compactor_manager
-            .update_task_heartbeats(req.context_id, &req.progress);
-        Ok(Response::new(ReportCompactionTaskProgressResponse {
-            status: None,
-        }))
+        let compactor_manager = self.hummock_manager.compactor_manager.clone();
+
+        compactor_manager.update_task_heartbeats(req.context_id, &req.progress);
+        compactor_manager.update_compactor_state(req.context_id, req.workload.unwrap());
+
+        Ok(Response::new(CompactorHeartbeatResponse { status: None }))
     }
 
     async fn report_vacuum_task(
@@ -478,8 +482,9 @@ where
         request: Request<SetCompactorRuntimeConfigRequest>,
     ) -> Result<Response<SetCompactorRuntimeConfigResponse>, Status> {
         let request = request.into_inner();
-        self.compactor_manager
-            .set_compactor_config(request.context_id, request.config.unwrap().into());
+        let compactor_manager = self.hummock_manager.compactor_manager.clone();
+
+        compactor_manager.set_compactor_config(request.context_id, request.config.unwrap().into());
         Ok(Response::new(SetCompactorRuntimeConfigResponse {}))
     }
 
@@ -510,4 +515,15 @@ where
             .await?;
         Ok(Response::new(SplitCompactionGroupResponse { new_group_id }))
     }
+
+    async fn get_scale_compactor(
+        &self,
+        _: Request<GetScaleCompactorRequest>,
+    ) -> Result<Response<GetScaleCompactorResponse>, Status> {
+        let info = self.hummock_manager.get_scale_compactor_info().await;
+        let scale_out_cores = info.scale_out_cores();
+        let mut resp: GetScaleCompactorResponse = info.into();
+        resp.suggest_cores = scale_out_cores;
+        Ok(Response::new(resp))
+    }
 }
diff --git a/src/meta/src/rpc/service/mod.rs b/src/meta/src/rpc/service/mod.rs
index dd775588405d3..33a9f20d9e7f8 100644
--- a/src/meta/src/rpc/service/mod.rs
+++ b/src/meta/src/rpc/service/mod.rs
@@ -23,6 +23,7 @@ pub mod notification_service;
 pub mod scale_service;
 pub mod stream_service;
 pub mod system_params_service;
+pub mod telemetry_service;
 pub mod user_service;
 
 use std::pin::Pin;
diff --git a/src/meta/src/rpc/service/telemetry_service.rs b/src/meta/src/rpc/service/telemetry_service.rs
new file mode 100644
index 0000000000000..c91ea532952dc
--- /dev/null
+++ b/src/meta/src/rpc/service/telemetry_service.rs
@@ -0,0 +1,63 @@
+// Copyright 2023 RisingWave Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::sync::Arc;
+
+use anyhow::anyhow;
+use risingwave_common::config::MetaBackend;
+use risingwave_pb::meta::telemetry_info_service_server::TelemetryInfoService;
+use risingwave_pb::meta::{GetTelemetryInfoRequest, TelemetryInfoResponse};
+use tonic::{Request, Response, Status};
+use uuid::Uuid;
+
+use crate::storage::MetaStore;
+use crate::telemetry::{TELEMETRY_CF, TELEMETRY_KEY};
+
+pub struct TelemetryInfoServiceImpl<S: MetaStore> {
+    meta_store: Arc<S>,
+}
+
+impl<S: MetaStore> TelemetryInfoServiceImpl<S> {
+    pub fn new(meta_store: Arc<S>) -> Self {
+        Self { meta_store }
+    }
+
+    async fn get_tracking_id(&self) -> Option<String> {
+        match self.meta_store.meta_store_type() {
+            MetaBackend::Etcd => match self.meta_store.get_cf(TELEMETRY_CF, TELEMETRY_KEY).await {
+                Ok(id) => Uuid::from_slice_le(&id)
+                    .map_err(|e| anyhow!("failed to parse uuid, {}", e))
+                    .ok()
+                    .map(|uuid| uuid.to_string()),
+                Err(_) => None,
+            },
+            MetaBackend::Mem => None,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl<S: MetaStore> TelemetryInfoService for TelemetryInfoServiceImpl<S> {
+    async fn get_telemetry_info(
+        &self,
+        _request: Request<GetTelemetryInfoRequest>,
+    ) -> Result<Response<TelemetryInfoResponse>, Status> {
+        match self.get_tracking_id().await {
+            Some(tracking_id) => Ok(Response::new(TelemetryInfoResponse {
+                tracking_id: Some(tracking_id),
+            })),
+            None => Ok(Response::new(TelemetryInfoResponse { tracking_id: None })),
+        }
+    }
+}
diff --git a/src/meta/src/storage/etcd_meta_store.rs b/src/meta/src/storage/etcd_meta_store.rs
index 1fd3f11d94bbb..ec0543942c9b4 100644
--- a/src/meta/src/storage/etcd_meta_store.rs
+++ b/src/meta/src/storage/etcd_meta_store.rs
@@ -19,6 +19,7 @@ use async_trait::async_trait;
 use etcd_client::{Compare, CompareOp, Error as EtcdError, GetOptions, Txn, TxnOp};
 use futures::Future;
 use itertools::Itertools;
+use risingwave_common::config::MetaBackend;
 use tokio::sync::Mutex;
 
 use super::{Key, MetaStore, MetaStoreError, MetaStoreResult, Snapshot, Transaction, Value};
@@ -187,6 +188,10 @@ impl EtcdMetaStore {
 impl MetaStore for EtcdMetaStore {
     type Snapshot = EtcdSnapshot;
 
+    fn meta_store_type(&self) -> MetaBackend {
+        MetaBackend::Etcd
+    }
+
     async fn snapshot(&self) -> Self::Snapshot {
         EtcdSnapshot {
             client: self.client.clone(),
diff --git a/src/meta/src/storage/mem_meta_store.rs b/src/meta/src/storage/mem_meta_store.rs
index ab08d6a9c8df9..7b5df1536e896 100644
--- a/src/meta/src/storage/mem_meta_store.rs
+++ b/src/meta/src/storage/mem_meta_store.rs
@@ -16,6 +16,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::sync::Arc;
 
 use async_trait::async_trait;
+use risingwave_common::config::MetaBackend;
 use tokio::sync::{OwnedRwLockReadGuard, RwLock};
 
 use super::{
@@ -78,6 +79,10 @@ impl MemStore {
 impl MetaStore for MemStore {
     type Snapshot = MemSnapshot;
 
+    fn meta_store_type(&self) -> MetaBackend {
+        MetaBackend::Mem
+    }
+
     async fn snapshot(&self) -> Self::Snapshot {
         let guard = self.inner.clone().read_owned().await;
         MemSnapshot(guard)
diff --git a/src/meta/src/storage/meta_store.rs b/src/meta/src/storage/meta_store.rs
index 0cc5315fd826e..8a9e4d4e88600 100644
--- a/src/meta/src/storage/meta_store.rs
+++ b/src/meta/src/storage/meta_store.rs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use async_trait::async_trait;
+use risingwave_common::config::MetaBackend;
 use thiserror::Error;
 
 use crate::storage::transaction::Transaction;
@@ -44,6 +45,8 @@ pub trait MetaStore: Clone + Sync + Send + 'static {
     async fn get_cf(&self, cf: &str, key: &[u8]) -> MetaStoreResult<Vec<u8>> {
         self.snapshot().await.get_cf(cf, key).await
     }
+
+    fn meta_store_type(&self) -> MetaBackend;
 }
 
 // Error of metastore
diff --git a/src/meta/src/stream/scale.rs b/src/meta/src/stream/scale.rs
index 719dad39676a7..cf617fa09819d 100644
--- a/src/meta/src/stream/scale.rs
+++ b/src/meta/src/stream/scale.rs
@@ -432,10 +432,6 @@ where
             // treatment because the upstream and downstream of NoShuffle are always 1-1
             // correspondence, so we need to clone the reschedule plan to the downstream of all
             // cascading relations.
-            //
-            // Delta join will introduce a `NoShuffle` edge between index chain node and lookup node
-            // (index_mv --NoShuffle--> index_chain --NoShuffle--> lookup) which will break current
-            // `NoShuffle` scaling assumption. Currently we detect this case and forbid it to scale.
             if no_shuffle_source_fragment_ids.contains(fragment_id) {
                 let mut queue: VecDeque<_> = fragment_dispatcher_map
                     .get(fragment_id)
@@ -451,21 +447,12 @@ where
 
                     if let Some(downstream_fragments) = fragment_dispatcher_map.get(&downstream_id)
                     {
-                        // If `NoShuffle` used by other fragment type rather than `ChainNode`, bail.
-                        for downstream_fragment_id in downstream_fragments.keys() {
-                            let downstream_fragment = fragment_map
-                                .get(downstream_fragment_id)
-                                .ok_or_else(|| anyhow!("fragment {fragment_id} does not exist"))?;
-                            if (downstream_fragment.get_fragment_type_mask()
-                                & (FragmentTypeFlag::ChainNode as u32
-                                    | FragmentTypeFlag::Mview as u32))
-                                == 0
-                            {
-                                bail!("Rescheduling NoShuffle edge only supports ChainNode and Mview. Other usage for e.g. delta join is forbidden currently.");
-                            }
-                        }
+                        let no_shuffle_downstreams = downstream_fragments
+                            .iter()
+                            .filter(|(_, ty)| **ty == DispatcherType::NoShuffle)
+                            .map(|(fragment_id, _)| fragment_id);
 
-                        queue.extend(downstream_fragments.keys().cloned());
+                        queue.extend(no_shuffle_downstreams.copied());
                     }
 
                     no_shuffle_reschedule.insert(
@@ -743,7 +730,12 @@ where
                 .unwrap();
 
             if let Some(downstream_fragments) = ctx.fragment_dispatcher_map.get(fragment_id) {
-                for downstream_fragment_id in downstream_fragments.keys() {
+                let no_shuffle_downstreams = downstream_fragments
+                    .iter()
+                    .filter(|(_, ty)| **ty == DispatcherType::NoShuffle)
+                    .map(|(fragment_id, _)| fragment_id);
+
+                for downstream_fragment_id in no_shuffle_downstreams {
                     arrange_no_shuffle_relation(
                         ctx,
                         downstream_fragment_id,
@@ -1014,20 +1006,19 @@ where
                 }
             }
 
-            let downstream_fragment_ids =
-                if let Some(downstream_fragments) = ctx.fragment_dispatcher_map.get(&fragment_id) {
-                    // Skip NoShuffle fragments' downstream
-                    if ctx
-                        .no_shuffle_source_fragment_ids
-                        .contains(&fragment.fragment_id)
-                    {
-                        vec![]
-                    } else {
-                        downstream_fragments.keys().copied().collect_vec()
-                    }
-                } else {
-                    vec![]
-                };
+            let downstream_fragment_ids = if let Some(downstream_fragments) =
+                ctx.fragment_dispatcher_map.get(&fragment_id)
+            {
+                // Skip fragments' no-shuffle downstream, as there's no need to update the merger
+                // (receiver) of a no-shuffle downstream
+                downstream_fragments
+                    .iter()
+                    .filter(|(_, dispatcher_type)| *dispatcher_type != &DispatcherType::NoShuffle)
+                    .map(|(fragment_id, _)| *fragment_id)
+                    .collect_vec()
+            } else {
+                vec![]
+            };
 
             let vnode_bitmap_updates = match fragment.distribution_type() {
                 FragmentDistributionType::Hash => {
@@ -1123,7 +1114,7 @@ where
 
         let _source_pause_guard = self.source_manager.paused.lock().await;
 
-        tracing::trace!("reschedule plan: {:#?}", reschedule_fragment);
+        tracing::debug!("reschedule plan: {:#?}", reschedule_fragment);
 
         self.barrier_scheduler
             .run_command_with_paused(Command::RescheduleFragment(reschedule_fragment))
diff --git a/src/meta/src/stream/sink.rs b/src/meta/src/stream/sink.rs
index d4ad160c7e0ab..5fd707941e277 100644
--- a/src/meta/src/stream/sink.rs
+++ b/src/meta/src/stream/sink.rs
@@ -15,12 +15,12 @@
 use anyhow::anyhow;
 use risingwave_connector::sink::catalog::SinkCatalog;
 use risingwave_connector::sink::{SinkConfig, SinkImpl};
-use risingwave_pb::catalog::Sink as ProstSinkCatalog;
+use risingwave_pb::catalog::PbSink;
 
 use crate::{MetaError, MetaResult};
 
 pub async fn validate_sink(
-    prost_sink_catalog: &ProstSinkCatalog,
+    prost_sink_catalog: &PbSink,
     connector_rpc_endpoint: Option<String>,
 ) -> MetaResult<()> {
     let sink_catalog = SinkCatalog::from(prost_sink_catalog);
diff --git a/src/meta/src/stream/stream_manager.rs b/src/meta/src/stream/stream_manager.rs
index 7db0d0119359d..70283c94c3193 100644
--- a/src/meta/src/stream/stream_manager.rs
+++ b/src/meta/src/stream/stream_manager.rs
@@ -726,6 +726,7 @@ mod tests {
 
             let (barrier_scheduler, scheduled_barriers) = BarrierScheduler::new_pair(
                 hummock_manager.clone(),
+                meta_metrics.clone(),
                 system_params.checkpoint_frequency() as usize,
             );
 
diff --git a/src/meta/src/stream/test_fragmenter.rs b/src/meta/src/stream/test_fragmenter.rs
index 43f5e991b9f1c..3daa812dcfb01 100644
--- a/src/meta/src/stream/test_fragmenter.rs
+++ b/src/meta/src/stream/test_fragmenter.rs
@@ -18,14 +18,16 @@ use std::vec;
 
 use itertools::Itertools;
 use risingwave_common::catalog::{DatabaseId, SchemaId, TableId};
-use risingwave_pb::catalog::Table as ProstTable;
-use risingwave_pb::common::{ParallelUnit, PbColumnOrder, PbDirection, PbOrderType, WorkerNode};
+use risingwave_pb::catalog::PbTable;
+use risingwave_pb::common::{
+    ParallelUnit, PbColumnOrder, PbDirection, PbNullsAre, PbOrderType, WorkerNode,
+};
 use risingwave_pb::data::data_type::TypeName;
 use risingwave_pb::data::DataType;
 use risingwave_pb::expr::agg_call::Type;
 use risingwave_pb::expr::expr_node::RexNode;
 use risingwave_pb::expr::expr_node::Type::{Add, GreaterThan, InputRef};
-use risingwave_pb::expr::{AggCall, ExprNode, FunctionCall, InputRef as ProstInputRef};
+use risingwave_pb::expr::{AggCall, ExprNode, FunctionCall, PbInputRef};
 use risingwave_pb::plan_common::{ColumnCatalog, ColumnDesc, Field};
 use risingwave_pb::stream_plan::stream_fragment_graph::{StreamFragment, StreamFragmentEdge};
 use risingwave_pb::stream_plan::stream_node::NodeBody;
@@ -56,7 +58,7 @@ fn make_inputref(idx: u32) -> ExprNode {
 fn make_sum_aggcall(idx: u32) -> AggCall {
     AggCall {
         r#type: Type::Sum as i32,
-        args: vec![ProstInputRef {
+        args: vec![PbInputRef {
             index: idx,
             r#type: Some(DataType {
                 type_name: TypeName::Int64 as i32,
@@ -96,6 +98,7 @@ fn make_column_order(column_index: u32) -> PbColumnOrder {
         column_index,
         order_type: Some(PbOrderType {
             direction: PbDirection::Ascending as _,
+            nulls_are: PbNullsAre::Largest as _,
         }),
     }
 }
@@ -114,12 +117,12 @@ fn make_column(column_type: TypeName, column_id: i32) -> ColumnCatalog {
     }
 }
 
-fn make_source_internal_table(id: u32) -> ProstTable {
+fn make_source_internal_table(id: u32) -> PbTable {
     let columns = vec![
         make_column(TypeName::Varchar, 0),
         make_column(TypeName::Varchar, 1),
     ];
-    ProstTable {
+    PbTable {
         id,
         schema_id: SchemaId::placeholder().schema_id,
         database_id: DatabaseId::placeholder().database_id,
@@ -129,18 +132,19 @@ fn make_source_internal_table(id: u32) -> ProstTable {
             column_index: 0,
             order_type: Some(PbOrderType {
                 direction: PbDirection::Descending as _,
+                nulls_are: PbNullsAre::Largest as _,
             }),
         }],
         ..Default::default()
     }
 }
 
-fn make_internal_table(id: u32, is_agg_value: bool) -> ProstTable {
+fn make_internal_table(id: u32, is_agg_value: bool) -> PbTable {
     let mut columns = vec![make_column(TypeName::Int64, 0)];
     if !is_agg_value {
         columns.push(make_column(TypeName::Int32, 1));
     }
-    ProstTable {
+    PbTable {
         id,
         schema_id: SchemaId::placeholder().schema_id,
         database_id: DatabaseId::placeholder().database_id,
@@ -150,6 +154,7 @@ fn make_internal_table(id: u32, is_agg_value: bool) -> ProstTable {
             column_index: 0,
             order_type: Some(PbOrderType {
                 direction: PbDirection::Descending as _,
+                nulls_are: PbNullsAre::Largest as _,
             }),
         }],
         stream_key: vec![2],
@@ -157,8 +162,8 @@ fn make_internal_table(id: u32, is_agg_value: bool) -> ProstTable {
     }
 }
 
-fn make_empty_table(id: u32) -> ProstTable {
-    ProstTable {
+fn make_empty_table(id: u32) -> PbTable {
+    PbTable {
         id,
         schema_id: SchemaId::placeholder().schema_id,
         database_id: DatabaseId::placeholder().database_id,
@@ -170,7 +175,7 @@ fn make_empty_table(id: u32) -> ProstTable {
     }
 }
 
-fn make_materialize_table(id: u32) -> ProstTable {
+fn make_materialize_table(id: u32) -> PbTable {
     make_internal_table(id, true)
 }
 
@@ -356,7 +361,6 @@ fn make_stream_fragments() -> Vec<StreamFragment> {
             table_id: 1,
             table: Some(make_materialize_table(888)),
             column_orders: vec![make_column_order(1), make_column_order(2)],
-            handle_pk_conflict_behavior: 0,
         })),
         fields: vec![], // TODO: fill this later
         operator_id: 7,
diff --git a/src/meta/src/stream/test_scale.rs b/src/meta/src/stream/test_scale.rs
index d3a42a3c2432c..0ad2f51268db0 100644
--- a/src/meta/src/stream/test_scale.rs
+++ b/src/meta/src/stream/test_scale.rs
@@ -143,7 +143,7 @@ mod tests {
         for parallel_unit_num in simulated_parallel_unit_nums(None, None) {
             let (actor_mapping, _) = generate_actor_mapping(parallel_unit_num);
 
-            let actor_to_parallel_unit_map = (0..parallel_unit_num)
+            let actor_to_parallel_unit_map: HashMap<_, _> = (0..parallel_unit_num)
                 .map(|i| (i as ActorId, i as ParallelUnitId))
                 .collect();
             let parallel_unit_mapping = actor_mapping.to_parallel_unit(&actor_to_parallel_unit_map);
diff --git a/src/meta/src/telemetry.rs b/src/meta/src/telemetry.rs
new file mode 100644
index 0000000000000..a2b69ad4cf844
--- /dev/null
+++ b/src/meta/src/telemetry.rs
@@ -0,0 +1,160 @@
+// Copyright 2023 RisingWave Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::sync::Arc;
+
+use anyhow::anyhow;
+use risingwave_common::telemetry::report::{TelemetryInfoFetcher, TelemetryReportCreator};
+use risingwave_common::telemetry::{
+    current_timestamp, SystemData, TelemetryNodeType, TelemetryReport, TelemetryReportBase,
+};
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+use crate::storage::MetaStore;
+
+/// Column in meta store
+pub const TELEMETRY_CF: &str = "cf/telemetry";
+/// `telemetry` in bytes
+pub const TELEMETRY_KEY: &[u8] = &[74, 65, 0x6c, 65, 0x6d, 65, 74, 72, 79];
+
+#[derive(Debug, Serialize, Deserialize)]
+pub(crate) struct MetaTelemetryReport {
+    #[serde(flatten)]
+    base: TelemetryReportBase,
+}
+
+impl MetaTelemetryReport {
+    pub(crate) fn new(tracking_id: String, session_id: String, up_time: u64) -> Self {
+        Self {
+            base: TelemetryReportBase {
+                tracking_id,
+                session_id,
+                system_data: SystemData::new(),
+                up_time,
+                time_stamp: current_timestamp(),
+                node_type: TelemetryNodeType::Meta,
+            },
+        }
+    }
+}
+
+impl TelemetryReport for MetaTelemetryReport {
+    fn to_json(&self) -> anyhow::Result<String> {
+        let json = serde_json::to_string(self)?;
+        Ok(json)
+    }
+}
+
+pub(crate) struct MetaTelemetryInfoFetcher<S: MetaStore> {
+    meta_store: Arc<S>,
+}
+
+impl<S: MetaStore> MetaTelemetryInfoFetcher<S> {
+    pub(crate) fn new(meta_store: Arc<S>) -> Self {
+        Self { meta_store }
+    }
+}
+
+#[async_trait::async_trait]
+impl<S: MetaStore> TelemetryInfoFetcher for MetaTelemetryInfoFetcher<S> {
+    async fn fetch_telemetry_info(&self) -> anyhow::Result<String> {
+        let tracking_id = get_or_create_tracking_id(self.meta_store.clone()).await?;
+
+        Ok(tracking_id)
+    }
+}
+
+/// fetch or create a `tracking_id` from etcd
+async fn get_or_create_tracking_id(
+    meta_store: Arc<impl MetaStore>,
+) -> Result<String, anyhow::Error> {
+    match meta_store.get_cf(TELEMETRY_CF, TELEMETRY_KEY).await {
+        Ok(bytes) => String::from_utf8(bytes).map_err(|e| anyhow!("failed to parse uuid, {}", e)),
+        Err(_) => {
+            let uuid = Uuid::new_v4().to_string();
+            // put new uuid in meta store
+            match meta_store
+                .put_cf(
+                    TELEMETRY_CF,
+                    TELEMETRY_KEY.to_vec(),
+                    uuid.clone().into_bytes(),
+                )
+                .await
+            {
+                Err(e) => Err(anyhow!("failed to create uuid, {}", e)),
+                Ok(_) => Ok(uuid),
+            }
+        }
+    }
+}
+
+#[derive(Copy, Clone)]
+pub(crate) struct MetaReportCreator {}
+
+impl MetaReportCreator {
+    pub(crate) fn new() -> Self {
+        Self {}
+    }
+}
+
+impl TelemetryReportCreator for MetaReportCreator {
+    fn create_report(
+        &self,
+        tracking_id: String,
+        session_id: String,
+        up_time: u64,
+    ) -> anyhow::Result<MetaTelemetryReport> {
+        Ok(MetaTelemetryReport::new(tracking_id, session_id, up_time))
+    }
+
+    fn report_type(&self) -> &str {
+        "meta"
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+
+    use super::*;
+    use crate::storage::MemStore;
+
+    #[tokio::test]
+    async fn test_get_or_create_tracking_id_existing_id() {
+        let meta_store = Arc::new(MemStore::new());
+        let uuid = Uuid::new_v4().to_string();
+        meta_store
+            .put_cf(
+                TELEMETRY_CF,
+                TELEMETRY_KEY.to_vec(),
+                uuid.clone().into_bytes(),
+            )
+            .await
+            .unwrap();
+        let result = get_or_create_tracking_id(Arc::clone(&meta_store))
+            .await
+            .unwrap();
+        assert_eq!(result, uuid);
+    }
+
+    #[tokio::test]
+    async fn test_get_or_create_tracking_id_new_id() {
+        let meta_store = Arc::new(MemStore::new());
+        let result = get_or_create_tracking_id(Arc::clone(&meta_store))
+            .await
+            .unwrap();
+        assert!(String::from_utf8(result.into_bytes()).is_ok());
+    }
+}
diff --git a/src/object_store/src/object/disk.rs b/src/object_store/src/object/disk.rs
index 3cf4f3895babd..67cd42505a0e5 100644
--- a/src/object_store/src/object/disk.rs
+++ b/src/object_store/src/object/disk.rs
@@ -22,7 +22,7 @@ use std::sync::Arc;
 
 use bytes::Bytes;
 use futures::future::try_join_all;
-use risingwave_common::cache::{CacheableEntry, LruCache};
+use risingwave_common::cache::{CachePriority, CacheableEntry, LruCache};
 use tokio::io::{AsyncRead, AsyncWriteExt};
 
 use super::{
@@ -123,6 +123,7 @@ impl DiskObjectStore {
             opened_read_file_cache: Arc::new(LruCache::new(
                 OPENED_FILE_CACHE_DEFAULT_NUM_SHARD_BITS,
                 OPENED_FILE_CACHE_DEFAULT_CAPACITY,
+                0,
             )),
         }
     }
@@ -151,6 +152,7 @@ impl DiskObjectStore {
             .lookup_with_request_dedup::<_, ObjectError, _>(
                 hash,
                 path.clone(),
+                CachePriority::High,
                 move || async move {
                     let file = utils::open_file(&path, true, false, false)
                         .await?
diff --git a/src/object_store/src/object/mod.rs b/src/object_store/src/object/mod.rs
index 8390693a53f1d..26efba364f8a6 100644
--- a/src/object_store/src/object/mod.rs
+++ b/src/object_store/src/object/mod.rs
@@ -857,6 +857,15 @@ pub async fn parse_remote_object_store(
                     .monitored(metrics),
             )
         }
+        azblob if azblob.starts_with("azblob://") => {
+            let azblob = azblob.strip_prefix("azblob://").unwrap();
+            let (container_name, root) = azblob.split_once('@').unwrap();
+            ObjectStoreImpl::Opendal(
+                OpendalObjectStore::new_azblob_engine(container_name.to_string(), root.to_string())
+                    .unwrap()
+                    .monitored(metrics),
+            )
+        }
         fs if fs.starts_with("fs://") => {
             let fs = fs.strip_prefix("fs://").unwrap();
             let (_, root) = fs.split_once('@').unwrap();
diff --git a/src/object_store/src/object/opendal_engine/azblob.rs b/src/object_store/src/object/opendal_engine/azblob.rs
new file mode 100644
index 0000000000000..f13075648d109
--- /dev/null
+++ b/src/object_store/src/object/opendal_engine/azblob.rs
@@ -0,0 +1,44 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 opendal::services::Azblob;
+use opendal::Operator;
+
+use super::{EngineType, OpendalObjectStore};
+use crate::object::ObjectResult;
+impl OpendalObjectStore {
+    /// create opendal azblob engine.
+    pub fn new_azblob_engine(container_name: String, root: String) -> ObjectResult<Self> {
+        // Create azblob backend builder.
+        let mut builder = Azblob::default();
+        builder.root(&root);
+        builder.container(&container_name);
+
+        let endpoint = std::env::var("AZBLOB_ENDPOINT")
+            .unwrap_or_else(|_| panic!("AZBLOB_ENDPOINT not found from environment variables"));
+        let account_name = std::env::var("AZBLOB_ACCOUNT_NAME")
+            .unwrap_or_else(|_| panic!("AZBLOB_ACCOUNT_NAME not found from environment variables"));
+        let account_key = std::env::var("AZBLOB_ACCOUNT_KEY")
+            .unwrap_or_else(|_| panic!("AZBLOB_ACCOUNT_KEY not found from environment variables"));
+
+        builder.endpoint(&endpoint);
+        builder.account_name(&account_name);
+        builder.account_key(&account_key);
+        let op: Operator = Operator::new(builder)?.finish();
+        Ok(Self {
+            op,
+            engine_type: EngineType::Azblob,
+        })
+    }
+}
diff --git a/src/object_store/src/object/opendal_engine/mod.rs b/src/object_store/src/object/opendal_engine/mod.rs
index 65f60c6c14727..1e93904eb73b2 100644
--- a/src/object_store/src/object/opendal_engine/mod.rs
+++ b/src/object_store/src/object/opendal_engine/mod.rs
@@ -26,5 +26,7 @@ pub mod gcs;
 pub use gcs::*;
 pub mod oss;
 pub use oss::*;
+pub mod azblob;
+pub use azblob::*;
 pub mod fs;
 pub use fs::*;
diff --git a/src/object_store/src/object/opendal_engine/opendal_object_store.rs b/src/object_store/src/object/opendal_engine/opendal_object_store.rs
index 7b02aba061af5..b5f78d9ef9510 100644
--- a/src/object_store/src/object/opendal_engine/opendal_object_store.rs
+++ b/src/object_store/src/object/opendal_engine/opendal_object_store.rs
@@ -39,6 +39,7 @@ pub enum EngineType {
     Gcs,
     Oss,
     Webhdfs,
+    Azblob,
     Fs,
 }
 
@@ -186,6 +187,7 @@ impl ObjectStore for OpendalObjectStore {
             EngineType::Gcs => "Gcs",
             EngineType::Oss => "Oss",
             EngineType::Webhdfs => "Webhdfs",
+            EngineType::Azblob => "Azblob",
             EngineType::Fs => "Fs",
         }
     }
diff --git a/src/prost/build.rs b/src/prost/build.rs
index 8e832846eee41..05f1d2c4e70f6 100644
--- a/src/prost/build.rs
+++ b/src/prost/build.rs
@@ -65,6 +65,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .type_attribute("expr.FunctionCall", "#[derive(Eq, Hash)]")
         .type_attribute("expr.UserDefinedFunction", "#[derive(Eq, Hash)]")
         .type_attribute("catalog.StreamSourceInfo", "#[derive(Eq, Hash)]")
+        .type_attribute("plan_common.GeneratedColumnDesc", "#[derive(Eq, Hash)]")
         .out_dir(out_dir.as_path())
         .compile(&protos, &[proto_dir.to_string()])
         .expect("Failed to compile grpc!");
diff --git a/src/prost/helpers/src/generate.rs b/src/prost/helpers/src/generate.rs
index 7fe949131ca6f..a689f7e00a0ff 100644
--- a/src/prost/helpers/src/generate.rs
+++ b/src/prost/helpers/src/generate.rs
@@ -93,11 +93,11 @@ pub fn implement(field: &Field) -> TokenStream2 {
     if let Some(enum_type) = extract_enum_type_from_field(field) {
         return quote! {
             #[inline(always)]
-            pub fn #getter_fn_name(&self) -> std::result::Result<#enum_type, crate::ProstFieldNotFound> {
+            pub fn #getter_fn_name(&self) -> std::result::Result<#enum_type, crate::PbFieldNotFound> {
                 if self.#field_name.eq(&0) {
-                    return Err(crate::ProstFieldNotFound(stringify!(#field_name)));
+                    return Err(crate::PbFieldNotFound(stringify!(#field_name)));
                 }
-                #enum_type::from_i32(self.#field_name).ok_or_else(|| crate::ProstFieldNotFound(stringify!(#field_name)))
+                #enum_type::from_i32(self.#field_name).ok_or_else(|| crate::PbFieldNotFound(stringify!(#field_name)))
             }
         };
     };
@@ -110,8 +110,8 @@ pub fn implement(field: &Field) -> TokenStream2 {
             let ty = extract_type_from_option(data_type);
             return quote! {
                 #[inline(always)]
-                pub fn #getter_fn_name(&self) -> std::result::Result<&#ty, crate::ProstFieldNotFound> {
-                    self.#field_name.as_ref().ok_or_else(|| crate::ProstFieldNotFound(stringify!(#field_name)))
+                pub fn #getter_fn_name(&self) -> std::result::Result<&#ty, crate::PbFieldNotFound> {
+                    self.#field_name.as_ref().ok_or_else(|| crate::PbFieldNotFound(stringify!(#field_name)))
                 }
             };
         } else if ["u32", "u64", "f32", "f64", "i32", "i64", "bool"]
diff --git a/src/prost/src/lib.rs b/src/prost/src/lib.rs
index e8ad3c7f770d7..a6669186cd3f9 100644
--- a/src/prost/src/lib.rs
+++ b/src/prost/src/lib.rs
@@ -142,10 +142,10 @@ pub mod backup_service_serde;
 pub mod java_binding_serde;
 
 #[derive(Clone, PartialEq, Eq, Debug)]
-pub struct ProstFieldNotFound(pub &'static str);
+pub struct PbFieldNotFound(pub &'static str);
 
-impl From<ProstFieldNotFound> for tonic::Status {
-    fn from(e: ProstFieldNotFound) -> Self {
+impl From<PbFieldNotFound> for tonic::Status {
+    fn from(e: PbFieldNotFound) -> Self {
         tonic::Status::new(tonic::Code::Internal, e.0)
     }
 }
diff --git a/src/risedevtool/connector.toml b/src/risedevtool/connector.toml
index 55b485412dde1..adb430a159676 100644
--- a/src/risedevtool/connector.toml
+++ b/src/risedevtool/connector.toml
@@ -1,50 +1,13 @@
 extend = "common.toml"
 
 [env]
-RW_CONNECTOR_VERSION = "0.1.17"
-RW_CONNECTOR_DOWNLOAD_PATH = "${PREFIX_TMP}/risingwave-connector-${RW_CONNECTOR_VERSION}.tar.gz"
-RW_CONNECTOR_RELEASE = "risingwave-connector-${RW_CONNECTOR_VERSION}.tar.gz"
-RW_CONNECTOR_BIN_PREFIX = "${PREFIX_BIN}/connector-node"
-
-RW_CONNECTOR_DOWNLOAD_URL = "https://github.com/risingwavelabs/risingwave-connector-release/raw/main/risingwave-connector-${RW_CONNECTOR_VERSION}.tar.gz"
-
 MAVEN_VERSION = "3.9.0"
 MAVEN_DOWNLOAD_PATH = "${PREFIX_TMP}/maven.tar.gz"
 
-[tasks.download-connector]
-category = "RiseDev - Components"
-dependencies = ["prepare"]
-condition = { env_set = [ "ENABLE_RW_CONNECTOR" ] }
-description = "Download RisingWave Connector"
-script = '''
-#!/usr/bin/env bash
-set -e
-if [ -f "${RW_CONNECTOR_BIN_PREFIX}/start-service.sh" ]; then
-    exit 0
-fi
-
-if [ -n "${ENABLE_BUILD_RW_CONNECTOR+x}" ]; then
-    echo "ENABLE_BUILD_RW_CONNECTOR is set, will build RisingWave Connector from source instead"
-    exit 0
-fi
-
-if [ -f "${RW_CONNECTOR_DOWNLOAD_PATH}" ]; then
-    mkdir -p "${PREFIX_BIN}/connector-node"
-    tar xf "${RW_CONNECTOR_DOWNLOAD_PATH}" -C "${PREFIX_BIN}/connector-node"
-    rm "${RW_CONNECTOR_DOWNLOAD_PATH}"
-else
-    echo "RisingWave Connector not found, download ${RW_CONNECTOR_RELEASE}"
-    curl -fL -o "${RW_CONNECTOR_DOWNLOAD_PATH}" "${RW_CONNECTOR_DOWNLOAD_URL}"
-    mkdir -p "${PREFIX_BIN}/connector-node"
-    tar xf "${RW_CONNECTOR_DOWNLOAD_PATH}" -C "${PREFIX_BIN}/connector-node"
-    rm "${RW_CONNECTOR_DOWNLOAD_PATH}"
-fi
-'''
-
 [tasks.download-maven]
 category = "RiseDev - Components"
 dependencies = ["prepare"]
-condition = { env_set = [ "ENABLE_RW_CONNECTOR", "ENABLE_BUILD_RW_CONNECTOR" ] }
+condition = { env_set = [ "ENABLE_BUILD_RW_CONNECTOR" ] }
 description = "Download Maven"
 script = '''
 #!/usr/bin/env bash
@@ -54,7 +17,7 @@ if !(command -v javac &> /dev/null && [[ "$(javac -version 2>&1 | awk '{print $2
   exit 1
 fi
 
-if command -v mvn &> /dev/null; then
+if (command -v mvn &> /dev/null) || [ -d "${PREFIX_BIN}/maven" ]; then
     exit 0
 else
     echo "Maven is not installed. Downloading now..."
diff --git a/src/risedevtool/src/bin/risedev-config.rs b/src/risedevtool/src/bin/risedev-config.rs
index 37f2333e9b531..29549541b6893 100644
--- a/src/risedevtool/src/bin/risedev-config.rs
+++ b/src/risedevtool/src/bin/risedev-config.rs
@@ -65,10 +65,9 @@ pub enum Components {
     Kafka,
     Pubsub,
     Redis,
-    ConnectorNode,
-    BuildConnectorNode,
     Tracing,
     RustComponents,
+    BuildConnectorNode,
     Dashboard,
     Release,
     AllInOne,
@@ -85,8 +84,7 @@ impl Components {
             Self::Kafka => "[Component] Kafka",
             Self::Pubsub => "[Component] Google Pubsub",
             Self::Redis => "[Component] Redis",
-            Self::ConnectorNode => "[Component] RisingWave Connector",
-            Self::BuildConnectorNode => "[Build] Build RisingWave Connector from source",
+            Self::BuildConnectorNode => "[Build] Build RisingWave Connector (Java)",
             Self::RustComponents => "[Build] Rust components",
             Self::Dashboard => "[Build] Dashboard v2",
             Self::Tracing => "[Component] Tracing: Jaeger",
@@ -165,11 +163,6 @@ a dev cluster.
 Required if you want to sink data to redis.
                 "
             }
-            Self::ConnectorNode => {
-                "
-Required if you want to create CDC source from external Databases.
-                "
-            }
             Self::BuildConnectorNode => {
                 "
 Required if you want to build Connector Node from source locally.
@@ -194,7 +187,6 @@ Required if you want to build Connector Node from source locally.
             "ENABLE_ALL_IN_ONE" => Some(Self::AllInOne),
             "ENABLE_SANITIZER" => Some(Self::Sanitizer),
             "ENABLE_REDIS" => Some(Self::Redis),
-            "ENABLE_RW_CONNECTOR" => Some(Self::ConnectorNode),
             "ENABLE_BUILD_RW_CONNECTOR" => Some(Self::BuildConnectorNode),
             _ => None,
         }
@@ -215,7 +207,6 @@ Required if you want to build Connector Node from source locally.
             Self::Release => "ENABLE_RELEASE_PROFILE",
             Self::AllInOne => "ENABLE_ALL_IN_ONE",
             Self::Sanitizer => "ENABLE_SANITIZER",
-            Self::ConnectorNode => "ENABLE_RW_CONNECTOR",
             Self::BuildConnectorNode => "ENABLE_BUILD_RW_CONNECTOR",
         }
         .into()
diff --git a/src/risedevtool/src/compose.rs b/src/risedevtool/src/compose.rs
index 73271c9c34718..afeb67d1b4b76 100644
--- a/src/risedevtool/src/compose.rs
+++ b/src/risedevtool/src/compose.rs
@@ -154,11 +154,7 @@ fn health_check_port(port: u16) -> HealthCheck {
 impl Compose for ComputeNodeConfig {
     fn compose(&self, config: &ComposeConfig) -> Result<ComposeService> {
         let mut command = Command::new("compute-node");
-        ComputeNodeService::apply_command_args(
-            &mut command,
-            self,
-            HummockInMemoryStrategy::Disallowed,
-        )?;
+        ComputeNodeService::apply_command_args(&mut command, self)?;
         if self.enable_tiered_cache {
             command.arg("--file-cache-dir").arg("/filecache");
         }
@@ -201,7 +197,11 @@ impl Compose for ComputeNodeConfig {
 impl Compose for MetaNodeConfig {
     fn compose(&self, config: &ComposeConfig) -> Result<ComposeService> {
         let mut command = Command::new("meta-node");
-        MetaNodeService::apply_command_args(&mut command, self)?;
+        MetaNodeService::apply_command_args(
+            &mut command,
+            self,
+            HummockInMemoryStrategy::Disallowed,
+        )?;
 
         if let Some(c) = &config.rw_config_path {
             let target = Path::new(&config.config_directory).join("risingwave.toml");
@@ -264,11 +264,7 @@ impl Compose for FrontendConfig {
 impl Compose for CompactorConfig {
     fn compose(&self, config: &ComposeConfig) -> Result<ComposeService> {
         let mut command = Command::new("compactor-node");
-        CompactorService::apply_command_args(
-            &mut command,
-            self,
-            HummockInMemoryStrategy::Disallowed,
-        )?;
+        CompactorService::apply_command_args(&mut command, self)?;
 
         if let Some(c) = &config.rw_config_path {
             let target = Path::new(&config.config_directory).join("risingwave.toml");
diff --git a/src/risedevtool/src/config_gen/prometheus_gen.rs b/src/risedevtool/src/config_gen/prometheus_gen.rs
index 6172ffcf1accb..01caa0ca1aa34 100644
--- a/src/risedevtool/src/config_gen/prometheus_gen.rs
+++ b/src/risedevtool/src/config_gen/prometheus_gen.rs
@@ -79,6 +79,14 @@ impl PrometheusGen {
             .map(|node| format!("\"{}:{}\"", node.address, 9644))
             .join(",");
 
+        let connector_node_targets = config
+            .provide_connector_node
+            .as_ref()
+            .unwrap()
+            .iter()
+            .map(|node| format!("\"{}:{}\"", node.address, node.exporter_port))
+            .join(",");
+
         let now = Local::now().format("%Y%m%d-%H%M%S");
 
         let remote_write = if config.remote_write {
@@ -143,6 +151,10 @@ scrape_configs:
   - job_name: redpanda
     static_configs:
       - targets: [{redpanda_targets}]
+
+  - job_name: connector-node
+    static_configs:
+      - targets: [{connector_node_targets}]
 "#,
         )
     }
diff --git a/src/risedevtool/src/service_config.rs b/src/risedevtool/src/service_config.rs
index 1095558919d8d..bcb8c012b7e84 100644
--- a/src/risedevtool/src/service_config.rs
+++ b/src/risedevtool/src/service_config.rs
@@ -36,9 +36,7 @@ pub struct ComputeNodeConfig {
     pub provide_opendal: Option<Vec<OpendalConfig>>,
     pub provide_aws_s3: Option<Vec<AwsS3Config>>,
     pub provide_jaeger: Option<Vec<JaegerConfig>>,
-    pub provide_compactor: Option<Vec<CompactorConfig>>,
     pub user_managed: bool,
-    pub enable_in_memory_kv_state_backend: bool,
     pub connector_rpc_endpoint: String,
 
     pub total_memory_bytes: usize,
@@ -67,6 +65,14 @@ pub struct MetaNodeConfig {
     pub connector_rpc_endpoint: String,
     pub provide_etcd_backend: Option<Vec<EtcdConfig>>,
     pub provide_prometheus: Option<Vec<PrometheusConfig>>,
+
+    pub provide_compute_node: Option<Vec<ComputeNodeConfig>>,
+    pub provide_compactor: Option<Vec<CompactorConfig>>,
+
+    pub provide_aws_s3: Option<Vec<AwsS3Config>>,
+    pub provide_minio: Option<Vec<MinioConfig>>,
+    pub provide_opendal: Option<Vec<OpendalConfig>>,
+    pub enable_in_memory_kv_state_backend: bool,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -103,8 +109,6 @@ pub struct CompactorConfig {
     pub exporter_port: u16,
 
     pub provide_minio: Option<Vec<MinioConfig>>,
-    pub provide_opendal: Option<Vec<OpendalConfig>>,
-    pub provide_aws_s3: Option<Vec<AwsS3Config>>,
 
     pub provide_meta_node: Option<Vec<MetaNodeConfig>>,
     pub user_managed: bool,
@@ -182,6 +186,7 @@ pub struct PrometheusConfig {
     pub provide_etcd: Option<Vec<EtcdConfig>>,
     pub provide_redpanda: Option<Vec<RedPandaConfig>>,
     pub provide_frontend: Option<Vec<FrontendConfig>>,
+    pub provide_connector_node: Option<Vec<ConnectorNodeConfig>>,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -316,6 +321,7 @@ pub struct ConnectorNodeConfig {
     phantom_use: Option<String>,
     pub id: String,
     pub port: u16,
+    pub exporter_port: u16,
     pub address: String,
 }
 
diff --git a/src/risedevtool/src/task/compactor_service.rs b/src/risedevtool/src/task/compactor_service.rs
index 8d11854416f33..76a2b205e6283 100644
--- a/src/risedevtool/src/task/compactor_service.rs
+++ b/src/risedevtool/src/task/compactor_service.rs
@@ -17,13 +17,10 @@ use std::io::Write;
 use std::path::Path;
 use std::process::Command;
 
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 
 use crate::util::{get_program_args, get_program_env_cmd, get_program_name};
-use crate::{
-    add_meta_node, add_storage_backend, CompactorConfig, ExecuteContext, HummockInMemoryStrategy,
-    Task,
-};
+use crate::{add_meta_node, CompactorConfig, ExecuteContext, Task};
 
 pub struct CompactorService {
     config: CompactorConfig,
@@ -45,19 +42,7 @@ impl CompactorService {
     }
 
     /// Apply command args according to config
-    pub fn apply_command_args(
-        cmd: &mut Command,
-        config: &CompactorConfig,
-        hummock_in_memory_strategy: HummockInMemoryStrategy,
-    ) -> Result<()> {
-        if matches!(
-            hummock_in_memory_strategy,
-            HummockInMemoryStrategy::Isolated
-        ) {
-            return Err(anyhow!(
-                "compactor cannot use in-memory hummock if remote object store is not provided"
-            ));
-        }
+    pub fn apply_command_args(cmd: &mut Command, config: &CompactorConfig) -> Result<()> {
         cmd.arg("--listen-addr")
             .arg(format!("{}:{}", config.listen_address, config.port))
             .arg("--prometheus-listener-addr")
@@ -78,18 +63,6 @@ impl CompactorService {
                 .arg(format!("{}", compaction_worker_threads_number));
         }
 
-        let provide_minio = config.provide_minio.as_ref().unwrap();
-        let provide_aws_s3 = config.provide_aws_s3.as_ref().unwrap();
-        let provide_opendal = config.provide_opendal.as_ref().unwrap();
-        add_storage_backend(
-            &config.id,
-            provide_opendal,
-            provide_minio,
-            provide_aws_s3,
-            hummock_in_memory_strategy,
-            cmd,
-        )?;
-
         let provide_meta_node = config.provide_meta_node.as_ref().unwrap();
         add_meta_node(provide_meta_node, cmd)?;
 
@@ -124,7 +97,7 @@ impl Task for CompactorService {
 
         cmd.arg("--config-path")
             .arg(Path::new(&prefix_config).join("risingwave.toml"));
-        Self::apply_command_args(&mut cmd, &self.config, HummockInMemoryStrategy::Disallowed)?;
+        Self::apply_command_args(&mut cmd, &self.config)?;
 
         if !self.config.user_managed {
             ctx.run_command(ctx.tmux_run(cmd)?)?;
diff --git a/src/risedevtool/src/task/compute_node_service.rs b/src/risedevtool/src/task/compute_node_service.rs
index 3d8e8b3dd3866..53db91e40e563 100644
--- a/src/risedevtool/src/task/compute_node_service.rs
+++ b/src/risedevtool/src/task/compute_node_service.rs
@@ -20,7 +20,7 @@ use anyhow::{anyhow, Result};
 
 use super::{ExecuteContext, Task};
 use crate::util::{get_program_args, get_program_env_cmd, get_program_name};
-use crate::{add_meta_node, add_storage_backend, ComputeNodeConfig, HummockInMemoryStrategy};
+use crate::{add_meta_node, ComputeNodeConfig};
 
 pub struct ComputeNodeService {
     config: ComputeNodeConfig,
@@ -42,11 +42,7 @@ impl ComputeNodeService {
     }
 
     /// Apply command args according to config
-    pub fn apply_command_args(
-        cmd: &mut Command,
-        config: &ComputeNodeConfig,
-        hummock_in_memory_strategy: HummockInMemoryStrategy,
-    ) -> Result<()> {
+    pub fn apply_command_args(cmd: &mut Command, config: &ComputeNodeConfig) -> Result<()> {
         cmd.arg("--listen-addr")
             .arg(format!("{}:{}", config.listen_address, config.port))
             .arg("--prometheus-listener-addr")
@@ -85,59 +81,9 @@ impl ComputeNodeService {
             }
         }
 
-        let provide_minio = config.provide_minio.as_ref().unwrap();
-        let provide_opendal = config.provide_opendal.as_ref().unwrap();
-        let provide_aws_s3 = config.provide_aws_s3.as_ref().unwrap();
-
-        let provide_compute_node = config.provide_compute_node.as_ref().unwrap();
-
-        let is_shared_backend = match (
-            config.enable_in_memory_kv_state_backend,
-            provide_minio.as_slice(),
-            provide_aws_s3.as_slice(),
-            provide_opendal.as_slice(),
-        ) {
-            (true, [], [], []) => {
-                cmd.arg("--state-store").arg("in-memory");
-                false
-            }
-            (true, _, _, _) => {
-                return Err(anyhow!(
-                    "When `enable_in_memory_kv_state_backend` is enabled, no minio and aws-s3 should be provided.",
-                ));
-            }
-            (_, provide_minio, provide_aws_s3, provide_opendal) => add_storage_backend(
-                &config.id,
-                provide_opendal,
-                provide_minio,
-                provide_aws_s3,
-                hummock_in_memory_strategy,
-                cmd,
-            )?,
-        };
-
-        if provide_compute_node.len() > 1 && !is_shared_backend {
-            if config.enable_in_memory_kv_state_backend {
-                // Using a non-shared backend with multiple compute nodes will be problematic for
-                // state sharing like scaling. However, for distributed end-to-end tests with
-                // in-memory state store, this is acceptable.
-            } else {
-                return Err(anyhow!(
-                    "Hummock storage may behave incorrectly with in-memory backend for multiple compute-node configuration. Should use a shared backend (e.g. MinIO) instead. Consider adding `use: minio` in risedev config."
-                ));
-            }
-        }
-
         let provide_meta_node = config.provide_meta_node.as_ref().unwrap();
         add_meta_node(provide_meta_node, cmd)?;
 
-        let provide_compactor = config.provide_compactor.as_ref().unwrap();
-        if is_shared_backend && provide_compactor.is_empty() {
-            return Err(anyhow!(
-                "When using a shared backend (minio, aws-s3, or shared in-memory with `risedev playground`), at least one compactor is required. Consider adding `use: compactor` in risedev config."
-            ));
-        }
-
         Ok(())
     }
 }
@@ -172,7 +118,7 @@ impl Task for ComputeNodeService {
 
         cmd.arg("--config-path")
             .arg(Path::new(&prefix_config).join("risingwave.toml"));
-        Self::apply_command_args(&mut cmd, &self.config, HummockInMemoryStrategy::Isolated)?;
+        Self::apply_command_args(&mut cmd, &self.config)?;
         if self.config.enable_tiered_cache {
             let prefix_data = env::var("PREFIX_DATA")?;
             cmd.arg("--file-cache-dir").arg(
diff --git a/src/risedevtool/src/task/connector_service.rs b/src/risedevtool/src/task/connector_service.rs
index 9cc589012a44b..05268db6a43ea 100644
--- a/src/risedevtool/src/task/connector_service.rs
+++ b/src/risedevtool/src/task/connector_service.rs
@@ -44,10 +44,10 @@ impl Task for ConnectorNodeService {
         ctx.pb.set_message("starting");
         let path = self.connector_path()?;
         if !path.exists() {
-            return Err(anyhow!("RisingWave connector binary not found in {:?}\nDid you enable risingwave connector feature in `./risedev configure`?", path));
+            return Err(anyhow!("RisingWave connector binary not found in {:?}\nPlease enable building RisingWave connector in `./risedev configure`?", path));
         }
-        let mut cmd = Command::new("sh");
-        cmd.arg(path).arg("-p").arg(self.config.port.to_string());
+        let mut cmd = Command::new(path);
+        cmd.arg("-p").arg(self.config.port.to_string());
         ctx.run_command(ctx.tmux_run(cmd)?)?;
         ctx.pb.set_message("started");
 
diff --git a/src/risedevtool/src/task/etcd_service.rs b/src/risedevtool/src/task/etcd_service.rs
index d442a45beb542..1912ce58f5b1b 100644
--- a/src/risedevtool/src/task/etcd_service.rs
+++ b/src/risedevtool/src/task/etcd_service.rs
@@ -57,8 +57,6 @@ impl EtcdService {
             .arg(&advertise_peer_urls)
             .arg("--listen-metrics-urls")
             .arg(&exporter_urls)
-            .arg("--name")
-            .arg("risedev-meta")
             .arg("--max-txn-ops")
             .arg("999999")
             .arg("--max-request-bytes")
diff --git a/src/risedevtool/src/task/meta_node_service.rs b/src/risedevtool/src/task/meta_node_service.rs
index a01b917d109ea..535d42fe5b435 100644
--- a/src/risedevtool/src/task/meta_node_service.rs
+++ b/src/risedevtool/src/task/meta_node_service.rs
@@ -21,7 +21,7 @@ use itertools::Itertools;
 
 use super::{ExecuteContext, Task};
 use crate::util::{get_program_args, get_program_env_cmd, get_program_name};
-use crate::MetaNodeConfig;
+use crate::{add_storage_backend, HummockInMemoryStrategy, MetaNodeConfig};
 
 pub struct MetaNodeService {
     config: MetaNodeConfig,
@@ -43,7 +43,11 @@ impl MetaNodeService {
     }
 
     /// Apply command args according to config
-    pub fn apply_command_args(cmd: &mut Command, config: &MetaNodeConfig) -> Result<()> {
+    pub fn apply_command_args(
+        cmd: &mut Command,
+        config: &MetaNodeConfig,
+        hummock_in_memory_strategy: HummockInMemoryStrategy,
+    ) -> Result<()> {
         cmd.arg("--listen-addr")
             .arg(format!("{}:{}", config.listen_address, config.port))
             .arg("--advertise-addr")
@@ -93,6 +97,57 @@ impl MetaNodeService {
             }
         }
 
+        let provide_minio = config.provide_minio.as_ref().unwrap();
+        let provide_opendal = config.provide_opendal.as_ref().unwrap();
+        let provide_aws_s3 = config.provide_aws_s3.as_ref().unwrap();
+
+        let provide_compute_node = config.provide_compute_node.as_ref().unwrap();
+        let provide_compactor = config.provide_compactor.as_ref().unwrap();
+
+        let is_shared_backend = match (
+            config.enable_in_memory_kv_state_backend,
+            provide_minio.as_slice(),
+            provide_aws_s3.as_slice(),
+            provide_opendal.as_slice(),
+        ) {
+            (true, [], [], []) => {
+                cmd.arg("--state-store").arg("in-memory");
+                false
+            }
+            (true, _, _, _) => {
+                return Err(anyhow!(
+                    "When `enable_in_memory_kv_state_backend` is enabled, no minio and aws-s3 should be provided.",
+                ));
+            }
+            (_, provide_minio, provide_aws_s3, provide_opendal) => add_storage_backend(
+                &config.id,
+                provide_opendal,
+                provide_minio,
+                provide_aws_s3,
+                hummock_in_memory_strategy,
+                cmd,
+            )?,
+        };
+
+        if (provide_compute_node.len() > 1 || !provide_compactor.is_empty()) && !is_shared_backend {
+            if config.enable_in_memory_kv_state_backend {
+                // Using a non-shared backend with multiple compute nodes will be problematic for
+                // state sharing like scaling. However, for distributed end-to-end tests with
+                // in-memory state store, this is acceptable.
+            } else {
+                return Err(anyhow!(
+                    "Hummock storage may behave incorrectly with in-memory backend for multiple compute-node or compactor-enabled configuration. Should use a shared backend (e.g. MinIO) instead. Consider adding `use: minio` in risedev config."
+                ));
+            }
+        }
+
+        let provide_compactor = config.provide_compactor.as_ref().unwrap();
+        if is_shared_backend && provide_compactor.is_empty() {
+            return Err(anyhow!(
+                "When using a shared backend (minio, aws-s3, or shared in-memory with `risedev playground`), at least one compactor is required. Consider adding `use: compactor` in risedev config."
+            ));
+        }
+
         Ok(())
     }
 }
@@ -121,7 +176,7 @@ impl Task for MetaNodeService {
             );
         }
 
-        Self::apply_command_args(&mut cmd, &self.config)?;
+        Self::apply_command_args(&mut cmd, &self.config, HummockInMemoryStrategy::Isolated)?;
 
         let prefix_config = env::var("PREFIX_CONFIG")?;
         cmd.arg("--config-path")
diff --git a/src/risedevtool/src/task/utils.rs b/src/risedevtool/src/task/utils.rs
index ad53b579f4d00..a758873044522 100644
--- a/src/risedevtool/src/task/utils.rs
+++ b/src/risedevtool/src/task/utils.rs
@@ -101,30 +101,31 @@ pub fn add_storage_backend(
             if opendal.engine == "hdfs"{
                 cmd.arg("--state-store")
                 .arg(format!("hummock+hdfs://{}@{}", opendal.namenode, opendal.root));
-                true
             }
             else if opendal.engine == "gcs"{
                 cmd.arg("--state-store")
                 .arg(format!("hummock+gcs://{}@{}", opendal.bucket, opendal.root));
-            true}
+            }
             else if opendal.engine == "oss"{
                 cmd.arg("--state-store")
                 .arg(format!("hummock+oss://{}@{}", opendal.bucket, opendal.root));
-                true
             }
             else if opendal.engine == "webhdfs"{
                 cmd.arg("--state-store")
                 .arg(format!("hummock+webhdfs://{}@{}", opendal.namenode, opendal.root));
-                true
+            }
+            else if opendal.engine == "azblob"{
+                cmd.arg("--state-store")
+                .arg(format!("hummock+azblob://{}@{}", opendal.bucket, opendal.root));
             }
             else if opendal.engine == "fs"{
                 cmd.arg("--state-store")
                 .arg(format!("hummock+fs://{}@{}", opendal.namenode, opendal.root));
-                true
             }
             else{
                 unimplemented!()
             }
+            true
         }
 
         (other_minio, other_s3, _) => {
diff --git a/src/rpc_client/src/compute_client.rs b/src/rpc_client/src/compute_client.rs
index d7cff5eb9bc93..a0ad224106290 100644
--- a/src/rpc_client/src/compute_client.rs
+++ b/src/rpc_client/src/compute_client.rs
@@ -30,7 +30,7 @@ use risingwave_pb::monitor_service::{
 use risingwave_pb::task_service::exchange_service_client::ExchangeServiceClient;
 use risingwave_pb::task_service::task_service_client::TaskServiceClient;
 use risingwave_pb::task_service::{
-    AbortTaskRequest, AbortTaskResponse, CreateTaskRequest, ExecuteRequest, GetDataRequest,
+    CancelTaskRequest, CancelTaskResponse, CreateTaskRequest, ExecuteRequest, GetDataRequest,
     GetDataResponse, GetStreamRequest, GetStreamResponse, TaskInfoResponse,
 };
 use tokio::sync::mpsc;
@@ -157,11 +157,11 @@ impl ComputeClient {
         Ok(self.task_client.to_owned().execute(req).await?.into_inner())
     }
 
-    pub async fn abort(&self, req: AbortTaskRequest) -> Result<AbortTaskResponse> {
+    pub async fn cancel(&self, req: CancelTaskRequest) -> Result<CancelTaskResponse> {
         Ok(self
             .task_client
             .to_owned()
-            .abort_task(req)
+            .cancel_task(req)
             .await?
             .into_inner())
     }
diff --git a/src/rpc_client/src/connector_client.rs b/src/rpc_client/src/connector_client.rs
index f05b756b41435..4192ee9d81c2f 100644
--- a/src/rpc_client/src/connector_client.rs
+++ b/src/rpc_client/src/connector_client.rs
@@ -120,6 +120,7 @@ impl ConnectorClient {
         connector_type: String,
         properties: HashMap<String, String>,
         table_schema: Option<TableSchema>,
+        sink_payload_format: SinkPayloadFormat,
     ) -> Result<(UnboundedSender<SinkStreamRequest>, Streaming<SinkResponse>)> {
         let (request_sender, request_receiver) = unbounded_channel::<SinkStreamRequest>();
 
@@ -127,7 +128,7 @@ impl ConnectorClient {
         request_sender
             .send(SinkStreamRequest {
                 request: Some(SinkRequest::Start(StartSink {
-                    format: SinkPayloadFormat::Json as i32,
+                    format: sink_payload_format as i32,
                     sink_config: Some(SinkConfig {
                         connector_type,
                         properties,
diff --git a/src/rpc_client/src/hummock_meta_client.rs b/src/rpc_client/src/hummock_meta_client.rs
index 5f1a181672fb8..827349213a559 100644
--- a/src/rpc_client/src/hummock_meta_client.rs
+++ b/src/rpc_client/src/hummock_meta_client.rs
@@ -19,7 +19,8 @@ use risingwave_hummock_sdk::{
     HummockEpoch, HummockSstableObjectId, HummockVersionId, LocalSstableInfo, SstObjectIdRange,
 };
 use risingwave_pb::hummock::{
-    CompactTask, CompactTaskProgress, HummockSnapshot, HummockVersion, VacuumTask,
+    CompactTask, CompactTaskProgress, CompactorWorkload, HummockSnapshot, HummockVersion,
+    VacuumTask,
 };
 
 use crate::error::Result;
@@ -41,9 +42,10 @@ pub trait HummockMetaClient: Send + Sync + 'static {
         compact_task: CompactTask,
         table_stats_change: TableStatsMap,
     ) -> Result<()>;
-    async fn report_compaction_task_progress(
+    async fn compactor_heartbeat(
         &self,
         progress: Vec<CompactTaskProgress>,
+        workload: CompactorWorkload,
     ) -> Result<()>;
     // We keep `commit_epoch` only for test/benchmark.
     async fn commit_epoch(
@@ -56,6 +58,7 @@ pub trait HummockMetaClient: Send + Sync + 'static {
     async fn subscribe_compact_tasks(
         &self,
         max_concurrent_task_number: u64,
+        cpu_core_num: u32,
     ) -> Result<BoxStream<'static, CompactTaskItem>>;
     async fn report_vacuum_task(&self, vacuum_task: VacuumTask) -> Result<()>;
     async fn trigger_manual_compaction(
diff --git a/src/rpc_client/src/meta_client.rs b/src/rpc_client/src/meta_client.rs
index 77cc767bccfe8..6638b43073601 100644
--- a/src/rpc_client/src/meta_client.rs
+++ b/src/rpc_client/src/meta_client.rs
@@ -27,6 +27,7 @@ use lru::LruCache;
 use risingwave_common::catalog::{CatalogVersion, FunctionId, IndexId, TableId};
 use risingwave_common::config::MAX_CONNECTION_WINDOW_SIZE;
 use risingwave_common::system_param::reader::SystemParamsReader;
+use risingwave_common::telemetry::report::TelemetryInfoFetcher;
 use risingwave_common::util::addr::HostAddr;
 use risingwave_common::util::column_index_mapping::ColIndexMapping;
 use risingwave_hummock_sdk::compact::CompactorRuntimeConfig;
@@ -39,11 +40,10 @@ use risingwave_hummock_sdk::{
 use risingwave_pb::backup_service::backup_service_client::BackupServiceClient;
 use risingwave_pb::backup_service::*;
 use risingwave_pb::catalog::{
-    Connection, Database as ProstDatabase, Function as ProstFunction, Index as ProstIndex,
-    Schema as ProstSchema, Sink as ProstSink, Source as ProstSource, Table as ProstTable,
-    View as ProstView,
+    Connection, PbDatabase, PbFunction, PbIndex, PbSchema, PbSink, PbSource, PbTable, PbView,
 };
 use risingwave_pb::common::{HostAddress, WorkerType};
+use risingwave_pb::ddl_service::alter_relation_name_request::Relation;
 use risingwave_pb::ddl_service::ddl_service_client::DdlServiceClient;
 use risingwave_pb::ddl_service::drop_table_request::SourceId;
 use risingwave_pb::ddl_service::*;
@@ -56,10 +56,11 @@ use risingwave_pb::meta::heartbeat_service_client::HeartbeatServiceClient;
 use risingwave_pb::meta::list_table_fragments_response::TableFragmentInfo;
 use risingwave_pb::meta::meta_member_service_client::MetaMemberServiceClient;
 use risingwave_pb::meta::notification_service_client::NotificationServiceClient;
-use risingwave_pb::meta::reschedule_request::Reschedule as ProstReschedule;
+use risingwave_pb::meta::reschedule_request::PbReschedule;
 use risingwave_pb::meta::scale_service_client::ScaleServiceClient;
 use risingwave_pb::meta::stream_manager_service_client::StreamManagerServiceClient;
 use risingwave_pb::meta::system_params_service_client::SystemParamsServiceClient;
+use risingwave_pb::meta::telemetry_info_service_client::TelemetryInfoServiceClient;
 use risingwave_pb::meta::*;
 use risingwave_pb::stream_plan::StreamFragmentGraph;
 use risingwave_pb::user::update_user_request::UpdateField;
@@ -261,14 +262,14 @@ impl MetaClient {
         Ok(())
     }
 
-    pub async fn create_database(&self, db: ProstDatabase) -> Result<(DatabaseId, CatalogVersion)> {
+    pub async fn create_database(&self, db: PbDatabase) -> Result<(DatabaseId, CatalogVersion)> {
         let request = CreateDatabaseRequest { db: Some(db) };
         let resp = self.inner.create_database(request).await?;
         // TODO: handle error in `resp.status` here
         Ok((resp.database_id, resp.version))
     }
 
-    pub async fn create_schema(&self, schema: ProstSchema) -> Result<(SchemaId, CatalogVersion)> {
+    pub async fn create_schema(&self, schema: PbSchema) -> Result<(SchemaId, CatalogVersion)> {
         let request = CreateSchemaRequest {
             schema: Some(schema),
         };
@@ -279,7 +280,7 @@ impl MetaClient {
 
     pub async fn create_materialized_view(
         &self,
-        table: ProstTable,
+        table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<(TableId, CatalogVersion)> {
         let request = CreateMaterializedViewRequest {
@@ -300,7 +301,7 @@ impl MetaClient {
         Ok(resp.version)
     }
 
-    pub async fn create_source(&self, source: ProstSource) -> Result<(u32, CatalogVersion)> {
+    pub async fn create_source(&self, source: PbSource) -> Result<(u32, CatalogVersion)> {
         let request = CreateSourceRequest {
             source: Some(source),
         };
@@ -311,7 +312,7 @@ impl MetaClient {
 
     pub async fn create_sink(
         &self,
-        sink: ProstSink,
+        sink: PbSink,
         graph: StreamFragmentGraph,
     ) -> Result<(u32, CatalogVersion)> {
         let request = CreateSinkRequest {
@@ -325,7 +326,7 @@ impl MetaClient {
 
     pub async fn create_function(
         &self,
-        function: ProstFunction,
+        function: PbFunction,
     ) -> Result<(FunctionId, CatalogVersion)> {
         let request = CreateFunctionRequest {
             function: Some(function),
@@ -336,8 +337,8 @@ impl MetaClient {
 
     pub async fn create_table(
         &self,
-        source: Option<ProstSource>,
-        table: ProstTable,
+        source: Option<PbSource>,
+        table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<(TableId, CatalogVersion)> {
         let request = CreateTableRequest {
@@ -350,9 +351,22 @@ impl MetaClient {
         Ok((resp.table_id.into(), resp.version))
     }
 
+    pub async fn alter_relation_name(
+        &self,
+        relation: Relation,
+        name: &str,
+    ) -> Result<CatalogVersion> {
+        let request = AlterRelationNameRequest {
+            relation: Some(relation),
+            new_name: name.to_string(),
+        };
+        let resp = self.inner.alter_relation_name(request).await?;
+        Ok(resp.version)
+    }
+
     pub async fn replace_table(
         &self,
-        table: ProstTable,
+        table: PbTable,
         graph: StreamFragmentGraph,
         table_col_index_mapping: ColIndexMapping,
     ) -> Result<CatalogVersion> {
@@ -366,7 +380,7 @@ impl MetaClient {
         Ok(resp.version)
     }
 
-    pub async fn create_view(&self, view: ProstView) -> Result<(u32, CatalogVersion)> {
+    pub async fn create_view(&self, view: PbView) -> Result<(u32, CatalogVersion)> {
         let request = CreateViewRequest { view: Some(view) };
         let resp = self.inner.create_view(request).await?;
         // TODO: handle error in `resp.status` here
@@ -375,8 +389,8 @@ impl MetaClient {
 
     pub async fn create_index(
         &self,
-        index: ProstIndex,
-        table: ProstTable,
+        index: PbIndex,
+        table: PbTable,
         graph: StreamFragmentGraph,
     ) -> Result<(TableId, CatalogVersion)> {
         let request = CreateIndexRequest {
@@ -588,7 +602,7 @@ impl MetaClient {
         (join_handle, shutdown_tx)
     }
 
-    pub async fn risectl_list_state_tables(&self) -> Result<Vec<ProstTable>> {
+    pub async fn risectl_list_state_tables(&self) -> Result<Vec<PbTable>> {
         let request = RisectlListStateTablesRequest {};
         let resp = self.inner.risectl_list_state_tables(request).await?;
         Ok(resp.tables)
@@ -635,7 +649,7 @@ impl MetaClient {
         Ok(resp)
     }
 
-    pub async fn reschedule(&self, reschedules: HashMap<u32, ProstReschedule>) -> Result<bool> {
+    pub async fn reschedule(&self, reschedules: HashMap<u32, PbReschedule>) -> Result<bool> {
         let request = RescheduleRequest { reschedules };
         let resp = self.inner.reschedule(request).await?;
         Ok(resp.success)
@@ -661,7 +675,7 @@ impl MetaClient {
 
     pub async fn init_metadata_for_replay(
         &self,
-        tables: Vec<ProstTable>,
+        tables: Vec<PbTable>,
         compaction_groups: Vec<CompactionGroupInfo>,
     ) -> Result<()> {
         let req = InitMetadataForReplayRequest {
@@ -801,6 +815,12 @@ impl MetaClient {
         Ok(resp.manifest.expect("should exist"))
     }
 
+    pub async fn get_telemetry_info(&self) -> Result<TelemetryInfoResponse> {
+        let req = GetTelemetryInfoRequest {};
+        let resp = self.inner.get_telemetry_info(req).await?;
+        Ok(resp)
+    }
+
     pub async fn get_system_params(&self) -> Result<SystemParamsReader> {
         let req = GetSystemParamsRequest {};
         let resp = self.inner.get_system_params(req).await?;
@@ -926,24 +946,28 @@ impl HummockMetaClient for MetaClient {
     async fn subscribe_compact_tasks(
         &self,
         max_concurrent_task_number: u64,
+        cpu_core_num: u32,
     ) -> Result<BoxStream<'static, CompactTaskItem>> {
         let req = SubscribeCompactTasksRequest {
             context_id: self.worker_id(),
             max_concurrent_task_number,
+            cpu_core_num,
         };
         let stream = self.inner.subscribe_compact_tasks(req).await?;
         Ok(Box::pin(stream))
     }
 
-    async fn report_compaction_task_progress(
+    async fn compactor_heartbeat(
         &self,
         progress: Vec<CompactTaskProgress>,
+        workload: CompactorWorkload,
     ) -> Result<()> {
-        let req = ReportCompactionTaskProgressRequest {
+        let req = CompactorHeartbeatRequest {
             context_id: self.worker_id(),
             progress,
+            workload: Some(workload),
         };
-        self.inner.report_compaction_task_progress(req).await?;
+        self.inner.compactor_heartbeat(req).await?;
         Ok(())
     }
 
@@ -991,6 +1015,17 @@ impl HummockMetaClient for MetaClient {
     }
 }
 
+#[async_trait]
+impl TelemetryInfoFetcher for MetaClient {
+    async fn fetch_telemetry_info(&self) -> anyhow::Result<String> {
+        let resp = self.get_telemetry_info().await?;
+        let tracking_id = resp
+            .get_tracking_id()
+            .map_err(|e| anyhow::format_err!("failed to get tracking_id {:?}", e))?;
+        Ok(tracking_id.to_string())
+    }
+}
+
 #[derive(Debug, Clone)]
 struct GrpcMetaClientCore {
     cluster_client: ClusterServiceClient<Channel>,
@@ -1003,6 +1038,7 @@ struct GrpcMetaClientCore {
     user_client: UserServiceClient<Channel>,
     scale_client: ScaleServiceClient<Channel>,
     backup_client: BackupServiceClient<Channel>,
+    telemetry_client: TelemetryInfoServiceClient<Channel>,
     system_params_client: SystemParamsServiceClient<Channel>,
 }
 
@@ -1018,7 +1054,9 @@ impl GrpcMetaClientCore {
         let user_client = UserServiceClient::new(channel.clone());
         let scale_client = ScaleServiceClient::new(channel.clone());
         let backup_client = BackupServiceClient::new(channel.clone());
+        let telemetry_client = TelemetryInfoServiceClient::new(channel.clone());
         let system_params_client = SystemParamsServiceClient::new(channel);
+
         GrpcMetaClientCore {
             cluster_client,
             meta_member_client,
@@ -1030,6 +1068,7 @@ impl GrpcMetaClientCore {
             user_client,
             scale_client,
             backup_client,
+            telemetry_client,
             system_params_client,
         }
     }
@@ -1323,7 +1362,6 @@ impl GrpcMetaClient {
             )))
         })
         .await?;
-
         Ok(channel)
     }
 
@@ -1358,6 +1396,7 @@ macro_rules! for_all_meta_rpc {
             ,{ stream_client, cancel_creating_jobs, CancelCreatingJobsRequest, CancelCreatingJobsResponse }
             ,{ stream_client, list_table_fragments, ListTableFragmentsRequest, ListTableFragmentsResponse }
             ,{ ddl_client, create_table, CreateTableRequest, CreateTableResponse }
+             ,{ ddl_client, alter_relation_name, AlterRelationNameRequest, AlterRelationNameResponse }
             ,{ ddl_client, create_materialized_view, CreateMaterializedViewRequest, CreateMaterializedViewResponse }
             ,{ ddl_client, create_view, CreateViewRequest, CreateViewResponse }
             ,{ ddl_client, create_source, CreateSourceRequest, CreateSourceResponse }
@@ -1396,7 +1435,7 @@ macro_rules! for_all_meta_rpc {
             ,{ hummock_client, report_compaction_tasks, ReportCompactionTasksRequest, ReportCompactionTasksResponse }
             ,{ hummock_client, get_new_sst_ids, GetNewSstIdsRequest, GetNewSstIdsResponse }
             ,{ hummock_client, subscribe_compact_tasks, SubscribeCompactTasksRequest, Streaming<SubscribeCompactTasksResponse> }
-            ,{ hummock_client, report_compaction_task_progress, ReportCompactionTaskProgressRequest, ReportCompactionTaskProgressResponse }
+            ,{ hummock_client, compactor_heartbeat, CompactorHeartbeatRequest, CompactorHeartbeatResponse }
             ,{ hummock_client, report_vacuum_task, ReportVacuumTaskRequest, ReportVacuumTaskResponse }
             ,{ hummock_client, trigger_manual_compaction, TriggerManualCompactionRequest, TriggerManualCompactionResponse }
             ,{ hummock_client, report_full_scan_task, ReportFullScanTaskRequest, ReportFullScanTaskResponse }
@@ -1422,6 +1461,7 @@ macro_rules! for_all_meta_rpc {
             ,{ backup_client, get_backup_job_status, GetBackupJobStatusRequest, GetBackupJobStatusResponse }
             ,{ backup_client, delete_meta_snapshot, DeleteMetaSnapshotRequest, DeleteMetaSnapshotResponse}
             ,{ backup_client, get_meta_snapshot_manifest, GetMetaSnapshotManifestRequest, GetMetaSnapshotManifestResponse}
+            ,{ telemetry_client, get_telemetry_info, GetTelemetryInfoRequest, TelemetryInfoResponse}
             ,{ system_params_client, get_system_params, GetSystemParamsRequest, GetSystemParamsResponse }
             ,{ system_params_client, set_system_param, SetSystemParamRequest, SetSystemParamResponse }
         }
diff --git a/src/source/benches/json_parser.rs b/src/source/benches/json_parser.rs
index 22d4a1cb94e7f..e26bdbc686086 100644
--- a/src/source/benches/json_parser.rs
+++ b/src/source/benches/json_parser.rs
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
 use rand::distributions::Alphanumeric;
 use rand::prelude::*;
 use risingwave_common::catalog::ColumnId;
-use risingwave_common::types::{DataType, NaiveDateTimeWrapper, NaiveDateWrapper};
+use risingwave_common::types::{DataType, Date, Timestamp};
 use risingwave_connector::parser::{JsonParser, SourceStreamChunkBuilder};
 use risingwave_connector::source::SourceColumnDesc;
 
@@ -34,9 +34,9 @@ fn generate_json(rng: &mut impl Rng) -> String {
             .take(7)
             .map(char::from)
             .collect::<String>(),
-        NaiveDateWrapper::from_num_days_from_ce_uncheck((rng.gen::<u32>() % (1 << 20)) as i32).0,
+        Date::from_num_days_from_ce_uncheck((rng.gen::<u32>() % (1 << 20)) as i32).0,
         {
-            let datetime = NaiveDateTimeWrapper::from_timestamp_uncheck((rng.gen::<u32>() % (1u32 << 28)) as i64, 0).0;
+            let datetime = Timestamp::from_timestamp_uncheck((rng.gen::<u32>() % (1u32 << 28)) as i64, 0).0;
             format!("{:?} {:?}", datetime.date(), datetime.time())
         }
     )
@@ -53,97 +53,39 @@ fn generate_all_json() -> Vec<Vec<u8>> {
 
 fn get_descs() -> Vec<SourceColumnDesc> {
     vec![
-        SourceColumnDesc {
-            name: "i32".to_string(),
-            data_type: DataType::Int32,
-            column_id: ColumnId::from(0),
-            is_row_id: false,
-            is_meta: false,
-            fields: vec![],
-        },
-        SourceColumnDesc {
-            name: "bool".to_string(),
-            data_type: DataType::Boolean,
-            column_id: ColumnId::from(2),
-            is_row_id: false,
-            is_meta: false,
-            fields: vec![],
-        },
-        SourceColumnDesc {
-            name: "i16".to_string(),
-            data_type: DataType::Int16,
-            column_id: ColumnId::from(3),
-            is_row_id: false,
-            is_meta: false,
-            fields: vec![],
-        },
-        SourceColumnDesc {
-            name: "i64".to_string(),
-            data_type: DataType::Int64,
-            column_id: ColumnId::from(4),
-            is_row_id: false,
-            is_meta: false,
-            fields: vec![],
-        },
-        SourceColumnDesc {
-            name: "f32".to_string(),
-            data_type: DataType::Float32,
-            column_id: ColumnId::from(5),
-            is_row_id: false,
-            is_meta: false,
-            fields: vec![],
-        },
-        SourceColumnDesc {
-            name: "f64".to_string(),
-            data_type: DataType::Float64,
-            column_id: ColumnId::from(6),
-            is_row_id: false,
-            is_meta: false,
-            fields: vec![],
-        },
-        SourceColumnDesc {
-            name: "varchar".to_string(),
-            data_type: DataType::Varchar,
-            column_id: ColumnId::from(7),
-            is_row_id: false,
-            is_meta: false,
-            fields: vec![],
-        },
-        SourceColumnDesc {
-            name: "date".to_string(),
-            data_type: DataType::Date,
-            column_id: ColumnId::from(8),
-            is_row_id: false,
-            is_meta: false,
-            fields: vec![],
-        },
-        SourceColumnDesc {
-            name: "timestamp".to_string(),
-            data_type: DataType::Timestamp,
-            column_id: ColumnId::from(9),
-            is_row_id: false,
-            is_meta: false,
-            fields: vec![],
-        },
+        SourceColumnDesc::simple("i32", DataType::Int32, ColumnId::from(0)),
+        SourceColumnDesc::simple("bool", DataType::Boolean, ColumnId::from(2)),
+        SourceColumnDesc::simple("i16", DataType::Int16, ColumnId::from(3)),
+        SourceColumnDesc::simple("i64", DataType::Int64, ColumnId::from(4)),
+        SourceColumnDesc::simple("f32", DataType::Float32, ColumnId::from(5)),
+        SourceColumnDesc::simple("f64", DataType::Float64, ColumnId::from(6)),
+        SourceColumnDesc::simple("varchar", DataType::Varchar, ColumnId::from(7)),
+        SourceColumnDesc::simple("date", DataType::Date, ColumnId::from(8)),
+        SourceColumnDesc::simple("timestamp", DataType::Timestamp, ColumnId::from(9)),
     ]
 }
 
 fn bench_json_parser(c: &mut Criterion) {
     let descs = get_descs();
     let parser = JsonParser::new_for_test(descs.clone()).unwrap();
-    let records = generate_all_json();
     let rt = tokio::runtime::Builder::new_multi_thread()
         .enable_all()
         .build()
         .unwrap();
+    let records = generate_all_json();
     c.bench_function("json_parser", |b| {
-        b.to_async(&rt).iter(|| async {
-            let mut builder = SourceStreamChunkBuilder::with_capacity(descs.clone(), NUM_RECORDS);
-            for record in &records {
-                let writer = builder.row_writer();
-                parser.parse_inner(record, writer).await.unwrap();
-            }
-        })
+        b.to_async(&rt).iter_batched(
+            || records.clone(),
+            |records| async {
+                let mut builder =
+                    SourceStreamChunkBuilder::with_capacity(descs.clone(), NUM_RECORDS);
+                for record in records {
+                    let writer = builder.row_writer();
+                    parser.parse_inner(record, writer).await.unwrap();
+                }
+            },
+            BatchSize::SmallInput,
+        )
     });
 }
 
diff --git a/src/source/src/source_desc.rs b/src/source/src/source_desc.rs
index d6c0036b6fb28..2bcc5bfec1ab8 100644
--- a/src/source/src/source_desc.rs
+++ b/src/source/src/source_desc.rs
@@ -22,10 +22,8 @@ use risingwave_connector::parser::SpecificParserConfig;
 use risingwave_connector::source::monitor::SourceMetrics;
 use risingwave_connector::source::{SourceColumnDesc, SourceFormat};
 use risingwave_connector::ConnectorParams;
-use risingwave_pb::catalog::StreamSourceInfo as ProstStreamSourceInfo;
-use risingwave_pb::plan_common::{
-    ColumnCatalog as ProstColumnCatalog, RowFormatType as ProstRowFormatType,
-};
+use risingwave_pb::catalog::PbStreamSourceInfo;
+use risingwave_pb::plan_common::{PbColumnCatalog, PbRowFormatType};
 
 use crate::connector_source::ConnectorSource;
 use crate::fs_connector_source::FsConnectorSource;
@@ -54,12 +52,12 @@ pub struct FsSourceDesc {
 
 #[derive(Clone)]
 pub struct SourceDescBuilder {
-    columns: Vec<ProstColumnCatalog>,
+    columns: Vec<PbColumnCatalog>,
     metrics: Arc<SourceMetrics>,
     pk_column_ids: Vec<i32>,
     row_id_index: Option<usize>,
     properties: HashMap<String, String>,
-    source_info: ProstStreamSourceInfo,
+    source_info: PbStreamSourceInfo,
     connector_params: ConnectorParams,
     connector_message_buffer_size: usize,
 }
@@ -67,12 +65,12 @@ pub struct SourceDescBuilder {
 impl SourceDescBuilder {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
-        columns: Vec<ProstColumnCatalog>,
+        columns: Vec<PbColumnCatalog>,
         metrics: Arc<SourceMetrics>,
         pk_column_ids: Vec<i32>,
         row_id_index: Option<usize>,
         properties: HashMap<String, String>,
-        source_info: ProstStreamSourceInfo,
+        source_info: PbStreamSourceInfo,
         connector_params: ConnectorParams,
         connector_message_buffer_size: usize,
     ) -> Self {
@@ -90,16 +88,16 @@ impl SourceDescBuilder {
 
     pub async fn build(self) -> Result<SourceDesc> {
         let format = match self.source_info.get_row_format()? {
-            ProstRowFormatType::Json => SourceFormat::Json,
-            ProstRowFormatType::Protobuf => SourceFormat::Protobuf,
-            ProstRowFormatType::DebeziumJson => SourceFormat::DebeziumJson,
-            ProstRowFormatType::Avro => SourceFormat::Avro,
-            ProstRowFormatType::Maxwell => SourceFormat::Maxwell,
-            ProstRowFormatType::CanalJson => SourceFormat::CanalJson,
-            ProstRowFormatType::Native => SourceFormat::Native,
-            ProstRowFormatType::DebeziumAvro => SourceFormat::DebeziumAvro,
-            ProstRowFormatType::UpsertJson => SourceFormat::UpsertJson,
-            ProstRowFormatType::UpsertAvro => SourceFormat::UpsertAvro,
+            PbRowFormatType::Json => SourceFormat::Json,
+            PbRowFormatType::Protobuf => SourceFormat::Protobuf,
+            PbRowFormatType::DebeziumJson => SourceFormat::DebeziumJson,
+            PbRowFormatType::Avro => SourceFormat::Avro,
+            PbRowFormatType::Maxwell => SourceFormat::Maxwell,
+            PbRowFormatType::CanalJson => SourceFormat::CanalJson,
+            PbRowFormatType::Native => SourceFormat::Native,
+            PbRowFormatType::DebeziumAvro => SourceFormat::DebeziumAvro,
+            PbRowFormatType::UpsertJson => SourceFormat::UpsertJson,
+            PbRowFormatType::UpsertAvro => SourceFormat::UpsertAvro,
             _ => unreachable!(),
         };
 
@@ -146,8 +144,8 @@ impl SourceDescBuilder {
 
     pub async fn build_fs_source_desc(&self) -> Result<FsSourceDesc> {
         let format = match self.source_info.get_row_format()? {
-            ProstRowFormatType::Csv => SourceFormat::Csv,
-            ProstRowFormatType::Json => SourceFormat::Json,
+            PbRowFormatType::Csv => SourceFormat::Csv,
+            PbRowFormatType::Json => SourceFormat::Json,
             _ => unreachable!(),
         };
 
@@ -214,6 +212,7 @@ pub mod test_utils {
                         name: f.name.clone(),
                         field_descs: vec![],
                         type_name: "".to_string(),
+                        generated_column: None,
                     }
                     .to_protobuf(),
                 ),
diff --git a/src/source/src/table.rs b/src/source/src/table.rs
index 1e1b9e16f5d70..778b33846d525 100644
--- a/src/source/src/table.rs
+++ b/src/source/src/table.rs
@@ -100,7 +100,9 @@ impl TableDmlHandle {
 
             #[cfg(debug_assertions)]
             risingwave_common::util::schema_check::schema_check(
-                self.column_descs.iter().map(|c| &c.data_type),
+                self.column_descs
+                    .iter()
+                    .filter_map(|c| (!c.is_generated_column()).then_some(&c.data_type)),
                 chunk.columns(),
             )
             .expect("table source write chunk schema check failed");
diff --git a/src/sqlparser/examples/parse.rs b/src/sqlparser/examples/parse.rs
index 73587757de75f..40c9d52a1aeab 100644
--- a/src/sqlparser/examples/parse.rs
+++ b/src/sqlparser/examples/parse.rs
@@ -27,7 +27,7 @@ fn main() {
             continue;
         }
 
-        let tokens = Tokenizer::new(&sql).tokenize().unwrap();
+        let tokens = Tokenizer::new(&sql).tokenize_with_location().unwrap();
         println!("tokens: {:?}", tokens);
         let ast = Parser::parse_sql(&sql).unwrap();
         println!("ast: {:?}", ast);
diff --git a/src/sqlparser/src/ast/ddl.rs b/src/sqlparser/src/ast/ddl.rs
index 21f24bb67e4cb..47ec88350d230 100644
--- a/src/sqlparser/src/ast/ddl.rs
+++ b/src/sqlparser/src/ast/ddl.rs
@@ -77,6 +77,34 @@ pub enum AlterTableOperation {
     },
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub enum AlterIndexOperation {
+    RenameIndex { index_name: ObjectName },
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub enum AlterViewOperation {
+    RenameView { view_name: ObjectName },
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub enum AlterSinkOperation {
+    RenameSink { sink_name: ObjectName },
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub enum AlterSourceOperation {
+    RenameSource { source_name: ObjectName },
+}
+
 impl fmt::Display for AlterTableOperation {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
@@ -133,6 +161,46 @@ impl fmt::Display for AlterTableOperation {
     }
 }
 
+impl fmt::Display for AlterIndexOperation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AlterIndexOperation::RenameIndex { index_name } => {
+                write!(f, "RENAME TO {index_name}")
+            }
+        }
+    }
+}
+
+impl fmt::Display for AlterViewOperation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AlterViewOperation::RenameView { view_name } => {
+                write!(f, "RENAME TO {view_name}")
+            }
+        }
+    }
+}
+
+impl fmt::Display for AlterSinkOperation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AlterSinkOperation::RenameSink { sink_name } => {
+                write!(f, "RENAME TO {sink_name}")
+            }
+        }
+    }
+}
+
+impl fmt::Display for AlterSourceOperation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AlterSourceOperation::RenameSource { source_name } => {
+                write!(f, "RENAME TO {source_name}")
+            }
+        }
+    }
+}
+
 /// An `ALTER COLUMN` (`Statement::AlterTable`) operation
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -371,6 +439,8 @@ pub enum ColumnOption {
     /// - MySQL's `AUTO_INCREMENT` or SQLite's `AUTOINCREMENT`
     /// - ...
     DialectSpecific(Vec<Token>),
+    /// AS ( <generation_expr> )`
+    GeneratedColumns(Expr),
 }
 
 impl fmt::Display for ColumnOption {
@@ -403,6 +473,7 @@ impl fmt::Display for ColumnOption {
             }
             Check(expr) => write!(f, "CHECK ({})", expr),
             DialectSpecific(val) => write!(f, "{}", display_separated(val, " ")),
+            GeneratedColumns(expr) => write!(f, "AS {}", expr),
         }
     }
 }
diff --git a/src/sqlparser/src/ast/mod.rs b/src/sqlparser/src/ast/mod.rs
index 52f591afba58a..79af8fd138e33 100644
--- a/src/sqlparser/src/ast/mod.rs
+++ b/src/sqlparser/src/ast/mod.rs
@@ -43,6 +43,9 @@ pub use self::query::{
 };
 pub use self::statement::*;
 pub use self::value::{DateTimeField, DollarQuotedString, TrimWhereField, Value};
+pub use crate::ast::ddl::{
+    AlterIndexOperation, AlterSinkOperation, AlterSourceOperation, AlterViewOperation,
+};
 use crate::keywords::Keyword;
 use crate::parser::{Parser, ParserError};
 
@@ -991,6 +994,31 @@ pub enum Statement {
         name: ObjectName,
         operation: AlterTableOperation,
     },
+    /// ALTER INDEX
+    AlterIndex {
+        /// Index name
+        name: ObjectName,
+        operation: AlterIndexOperation,
+    },
+    /// ALTER VIEW
+    AlterView {
+        /// View name
+        name: ObjectName,
+        materialized: bool,
+        operation: AlterViewOperation,
+    },
+    /// ALTER SINK
+    AlterSink {
+        /// Sink name
+        name: ObjectName,
+        operation: AlterSinkOperation,
+    },
+    /// ALTER SOURCE
+    AlterSource {
+        /// Source name
+        name: ObjectName,
+        operation: AlterSourceOperation,
+    },
     /// DESCRIBE TABLE OR SOURCE
     Describe {
         /// Table or Source name
@@ -1363,7 +1391,7 @@ impl fmt::Display for Statement {
                 if_not_exists = if *if_not_exists { "IF NOT EXISTS " } else { "" },
                 name = name,
                 table_name = table_name,
-                columns = display_separated(columns, ","),
+                columns = display_comma_separated(columns),
                 include = if include.is_empty() {
                     "".to_string()
                 } else {
@@ -1386,6 +1414,18 @@ impl fmt::Display for Statement {
             Statement::AlterTable { name, operation } => {
                 write!(f, "ALTER TABLE {} {}", name, operation)
             }
+            Statement::AlterIndex { name, operation } => {
+                write!(f, "ALTER INDEX {} {}", name, operation)
+            }
+            Statement::AlterView { materialized, name, operation } => {
+                write!(f, "ALTER {}VIEW {} {}", if *materialized { "MATERIALIZED " } else { "" }, name, operation)
+            }
+            Statement::AlterSink { name, operation } => {
+                write!(f, "ALTER SINK {} {}", name, operation)
+            }
+            Statement::AlterSource { name, operation } => {
+                write!(f, "ALTER SOURCE {} {}", name, operation)
+            }
             Statement::Drop(stmt) => write!(f, "DROP {}", stmt),
             Statement::DropFunction {
                 if_exists,
diff --git a/src/sqlparser/src/ast/statement.rs b/src/sqlparser/src/ast/statement.rs
index 830727495b50c..3494bd9db92e2 100644
--- a/src/sqlparser/src/ast/statement.rs
+++ b/src/sqlparser/src/ast/statement.rs
@@ -710,7 +710,7 @@ impl ParseTo for UserOptions {
                 break;
             }
 
-            if let Token::Word(ref w) = token {
+            if let Token::Word(ref w) = token.token {
                 parser.next_token();
                 let (item_mut_ref, user_option) = match w.keyword {
                     Keyword::SUPERUSER => (&mut builder.super_user, UserOption::SuperUser),
diff --git a/src/sqlparser/src/parser.rs b/src/sqlparser/src/parser.rs
index cd6c7099a6e92..ff784093fb0a3 100644
--- a/src/sqlparser/src/parser.rs
+++ b/src/sqlparser/src/parser.rs
@@ -24,7 +24,9 @@ use core::fmt;
 
 use tracing::{debug, instrument};
 
-use crate::ast::ddl::SourceWatermark;
+use crate::ast::ddl::{
+    AlterIndexOperation, AlterSinkOperation, AlterViewOperation, SourceWatermark,
+};
 use crate::ast::{ParseTo, *};
 use crate::keywords::{self, Keyword};
 use crate::tokenizer::*;
@@ -69,6 +71,7 @@ pub enum IsLateral {
 
 use IsLateral::*;
 
+#[derive(Debug)]
 pub enum WildcardOrExpr {
     Expr(Expr),
     /// Expr is an arbitrary expression, returning either a table or a column.
@@ -141,7 +144,7 @@ pub enum Precedence {
 }
 
 pub struct Parser {
-    tokens: Vec<Token>,
+    tokens: Vec<TokenWithLocation>,
     /// The index of the first unprocessed token in `self.tokens`
     index: usize,
     /// Since we cannot distinguish `>>` and double `>`, so use `angle_brackets_num` to store the
@@ -157,7 +160,7 @@ pub struct Parser {
 
 impl Parser {
     /// Parse the specified tokens
-    pub fn new(tokens: Vec<Token>) -> Self {
+    pub fn new(tokens: Vec<TokenWithLocation>) -> Self {
         Parser {
             tokens,
             index: 0,
@@ -171,7 +174,7 @@ impl Parser {
     #[instrument(level = "debug")]
     pub fn parse_sql(sql: &str) -> Result<Vec<Statement>, ParserError> {
         let mut tokenizer = Tokenizer::new(sql);
-        let tokens = tokenizer.tokenize()?;
+        let tokens = tokenizer.tokenize_with_location()?;
         let mut parser = Parser::new(tokens);
         let mut stmts = Vec::new();
         let mut expecting_statement_delimiter = false;
@@ -199,7 +202,8 @@ impl Parser {
     /// Parse a single top-level statement (such as SELECT, INSERT, CREATE, etc.),
     /// stopping before the statement separator, if any.
     pub fn parse_statement(&mut self) -> Result<Statement, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) => match w.keyword {
                 Keyword::EXPLAIN => Ok(self.parse_explain()?),
                 Keyword::ANALYZE => Ok(self.parse_analyze()?),
@@ -243,13 +247,18 @@ impl Parser {
                 Keyword::PREPARE => Ok(self.parse_prepare()?),
                 Keyword::COMMENT => Ok(self.parse_comment()?),
                 Keyword::FLUSH => Ok(Statement::Flush),
-                _ => self.expected("an SQL statement", Token::Word(w)),
+                _ => self.expected(
+                    "an SQL statement",
+                    Token::Word(w).with_location(token.location),
+                ),
             },
             Token::LParen => {
                 self.prev_token();
                 Ok(Statement::Query(Box::new(self.parse_query()?)))
             }
-            unexpected => self.expected("an SQL statement", unexpected),
+            unexpected => {
+                self.expected("an SQL statement", unexpected.with_location(token.location))
+            }
         }
     }
 
@@ -295,7 +304,7 @@ impl Parser {
     pub fn parse_wildcard_or_expr(&mut self) -> Result<WildcardOrExpr, ParserError> {
         let index = self.index;
 
-        match self.next_token() {
+        match self.next_token().token {
             Token::Word(w) if self.peek_token() == Token::Period => {
                 // Since there's no parenthesis, `w` must be a column or a table
                 // So what follows must be dot-delimited identifiers, e.g. `a.b.c.*`
@@ -362,6 +371,8 @@ impl Parser {
             Expr::CompoundIdentifier(_) => expr,
             // expr is `((1,2,3)::foo)`
             Expr::Cast { .. } => expr,
+            // expr is `(func())`
+            Expr::Function(_) => expr,
             // expr is `((foo.v1).v2)`
             Expr::FieldIdentifier(expr, ids) => {
                 // Put `ids` to the latter part!
@@ -391,7 +402,8 @@ impl Parser {
     ) -> Result<WildcardOrExpr, ParserError> {
         let mut id_parts = vec![];
         while self.consume_token(&Token::Period) {
-            match self.next_token() {
+            let token = self.next_token();
+            match token.token {
                 Token::Word(w) => id_parts.push(w.to_ident()?),
                 Token::Mul => {
                     return if id_parts.is_empty() {
@@ -401,7 +413,10 @@ impl Parser {
                     }
                 }
                 unexpected => {
-                    return self.expected("an identifier or a '*' after '.'", unexpected);
+                    return self.expected(
+                        "an identifier or a '*' after '.'",
+                        unexpected.with_location(token.location),
+                    );
                 }
             }
         }
@@ -468,7 +483,8 @@ impl Parser {
             }
         }));
 
-        let expr = match self.next_token() {
+        let token = self.next_token();
+        let expr = match token.token {
             Token::Word(w) => match w.keyword {
                 Keyword::TRUE | Keyword::FALSE | Keyword::NULL => {
                     self.prev_token();
@@ -497,15 +513,18 @@ impl Parser {
                 }
                 // Here `w` is a word, check if it's a part of a multi-part
                 // identifier, a function call, or a simple identifier:
-                _ => match self.peek_token() {
+                _ => match self.peek_token().token {
                     Token::LParen | Token::Period => {
                         let mut id_parts: Vec<Ident> = vec![w.to_ident()?];
                         while self.consume_token(&Token::Period) {
-                            match self.next_token() {
+                            let token = self.next_token();
+                            match token.token {
                                 Token::Word(w) => id_parts.push(w.to_ident()?),
                                 unexpected => {
-                                    return self
-                                        .expected("an identifier or a '*' after '.'", unexpected);
+                                    return self.expected(
+                                        "an identifier or a '*' after '.'",
+                                        unexpected.with_location(token.location),
+                                    );
                                 }
                             }
                         }
@@ -591,7 +610,7 @@ impl Parser {
                     Ok(expr)
                 }
             }
-            unexpected => self.expected("an expression:", unexpected),
+            unexpected => self.expected("an expression:", unexpected.with_location(token.location)),
         }?;
 
         if self.parse_keyword(Keyword::COLLATE) {
@@ -627,12 +646,16 @@ impl Parser {
     pub fn parse_fields(&mut self) -> Result<Vec<Ident>, ParserError> {
         let mut idents = vec![];
         while self.consume_token(&Token::Period) {
-            match self.next_token() {
+            let token = self.next_token();
+            match token.token {
                 Token::Word(w) => {
                     idents.push(w.to_ident()?);
                 }
                 unexpected => {
-                    return self.expected("an identifier after '.'", unexpected);
+                    return self.expected(
+                        "an identifier after '.'",
+                        unexpected.with_location(token.location),
+                    );
                 }
             }
         }
@@ -695,14 +718,21 @@ impl Parser {
     }
 
     pub fn parse_window_frame_units(&mut self) -> Result<WindowFrameUnits, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) => match w.keyword {
                 Keyword::ROWS => Ok(WindowFrameUnits::Rows),
                 Keyword::RANGE => Ok(WindowFrameUnits::Range),
                 Keyword::GROUPS => Ok(WindowFrameUnits::Groups),
-                _ => self.expected("ROWS, RANGE, GROUPS", Token::Word(w))?,
+                _ => self.expected(
+                    "ROWS, RANGE, GROUPS",
+                    Token::Word(w).with_location(token.location),
+                )?,
             },
-            unexpected => self.expected("ROWS, RANGE, GROUPS", unexpected),
+            unexpected => self.expected(
+                "ROWS, RANGE, GROUPS",
+                unexpected.with_location(token.location),
+            ),
         }
     }
 
@@ -930,7 +960,7 @@ impl Parser {
     pub fn parse_trim_expr(&mut self) -> Result<Expr, ParserError> {
         self.expect_token(&Token::LParen)?;
         let mut where_expr = None;
-        if let Token::Word(word) = self.peek_token() {
+        if let Token::Word(word) = self.peek_token().token {
             if [Keyword::BOTH, Keyword::LEADING, Keyword::TRAILING]
                 .iter()
                 .any(|d| word.keyword == *d)
@@ -951,14 +981,20 @@ impl Parser {
     }
 
     pub fn parse_trim_where(&mut self) -> Result<TrimWhereField, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) => match w.keyword {
                 Keyword::BOTH => Ok(TrimWhereField::Both),
                 Keyword::LEADING => Ok(TrimWhereField::Leading),
                 Keyword::TRAILING => Ok(TrimWhereField::Trailing),
-                _ => self.expected("trim_where field", Token::Word(w))?,
+                _ => self.expected(
+                    "trim_where field",
+                    Token::Word(w).with_location(token.location),
+                )?,
             },
-            unexpected => self.expected("trim_where field", unexpected),
+            unexpected => {
+                self.expected("trim_where field", unexpected.with_location(token.location))
+            }
         }
     }
 
@@ -1007,7 +1043,8 @@ impl Parser {
 
     // This function parses date/time fields for interval qualifiers.
     pub fn parse_date_time_field(&mut self) -> Result<DateTimeField, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) => match w.keyword {
                 Keyword::YEAR => Ok(DateTimeField::Year),
                 Keyword::MONTH => Ok(DateTimeField::Month),
@@ -1015,9 +1052,14 @@ impl Parser {
                 Keyword::HOUR => Ok(DateTimeField::Hour),
                 Keyword::MINUTE => Ok(DateTimeField::Minute),
                 Keyword::SECOND => Ok(DateTimeField::Second),
-                _ => self.expected("date/time field", Token::Word(w))?,
+                _ => self.expected(
+                    "date/time field",
+                    Token::Word(w).with_location(token.location),
+                )?,
             },
-            unexpected => self.expected("date/time field", unexpected),
+            unexpected => {
+                self.expected("date/time field", unexpected.with_location(token.location))
+            }
         }
     }
 
@@ -1031,10 +1073,13 @@ impl Parser {
     //   select extract('invaLId' from null::date);
     // ```
     pub fn parse_date_time_field_in_extract(&mut self) -> Result<String, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) => Ok(w.value.to_uppercase()),
             Token::SingleQuotedString(s) => Ok(s.to_uppercase()),
-            unexpected => self.expected("date/time field", unexpected),
+            unexpected => {
+                self.expected("date/time field", unexpected.with_location(token.location))
+            }
         }
     }
 
@@ -1065,7 +1110,7 @@ impl Parser {
         //
         // Note that PostgreSQL allows omitting the qualifier, so we provide
         // this more general implementation.
-        let leading_field = match self.peek_token() {
+        let leading_field = match self.peek_token().token {
             Token::Word(kw)
                 if [
                     Keyword::YEAR,
@@ -1120,7 +1165,7 @@ impl Parser {
     /// Parse an operator following an expression
     pub fn parse_infix(&mut self, expr: Expr, precedence: Precedence) -> Result<Expr, ParserError> {
         let tok = self.next_token();
-        let regular_binary_operator = match &tok {
+        let regular_binary_operator = match &tok.token {
             Token::Spaceship => Some(BinaryOperator::Spaceship),
             Token::DoubleEq => Some(BinaryOperator::Eq),
             Token::Eq => Some(BinaryOperator::Eq),
@@ -1204,7 +1249,7 @@ impl Parser {
                     right: Box::new(self.parse_subexpr(precedence)?),
                 })
             }
-        } else if let Token::Word(w) = &tok {
+        } else if let Token::Word(w) = &tok.token {
             match w.keyword {
                 Keyword::IS => {
                     if self.parse_keyword(Keyword::TRUE) {
@@ -1235,15 +1280,15 @@ impl Parser {
                 }
                 Keyword::AT => {
                     if self.parse_keywords(&[Keyword::TIME, Keyword::ZONE]) {
-                        let time_zone = self.next_token();
-                        match time_zone {
+                        let token = self.next_token();
+                        match token.token {
                             Token::SingleQuotedString(time_zone) => Ok(Expr::AtTimeZone {
                                 timestamp: Box::new(expr),
                                 time_zone,
                             }),
-                            tok => self.expected(
+                            unexpected => self.expected(
                                 "Expected Token::SingleQuotedString after AT TIME ZONE",
-                                tok,
+                                unexpected.with_location(token.location),
                             ),
                         }
                     } else {
@@ -1348,7 +1393,7 @@ impl Parser {
 
         let token = self.peek_token();
         debug!("get_next_precedence() {:?}", token);
-        match token {
+        match token.token {
             Token::Word(w) if w.keyword == Keyword::OR => Ok(P::LogicalOr),
             Token::Word(w) if w.keyword == Keyword::XOR => Ok(P::LogicalXor),
             Token::Word(w) if w.keyword == Keyword::AND => Ok(P::LogicalAnd),
@@ -1363,7 +1408,7 @@ impl Parser {
             | Token::GtEq
             | Token::DoubleEq
             | Token::Spaceship => Ok(P::Cmp),
-            Token::Word(w) if w.keyword == Keyword::NOT => match self.peek_nth_token(1) {
+            Token::Word(w) if w.keyword == Keyword::NOT => match self.peek_nth_token(1).token {
                 // The precedence of NOT varies depending on keyword that
                 // follows it. If it is followed by IN, BETWEEN, or LIKE,
                 // it takes on the precedence of those tokens. Otherwise it
@@ -1391,7 +1436,7 @@ impl Parser {
             | Token::HashArrow
             | Token::HashLongArrow => Ok(P::Other),
             Token::Word(w) if w.keyword == Keyword::AT => {
-                match (self.peek_nth_token(1), self.peek_nth_token(2)) {
+                match (self.peek_nth_token(1).token, self.peek_nth_token(2).token) {
                     (Token::Word(w), Token::Word(w2))
                         if w.keyword == Keyword::TIME && w2.keyword == Keyword::ZONE =>
                     {
@@ -1419,20 +1464,23 @@ impl Parser {
 
     /// Return the first non-whitespace token that has not yet been processed
     /// (or None if reached end-of-file)
-    pub fn peek_token(&self) -> Token {
+    pub fn peek_token(&self) -> TokenWithLocation {
         self.peek_nth_token(0)
     }
 
     /// Return nth non-whitespace token that has not yet been processed
-    pub fn peek_nth_token(&self, mut n: usize) -> Token {
+    pub fn peek_nth_token(&self, mut n: usize) -> TokenWithLocation {
         let mut index = self.index;
         loop {
             index += 1;
-            match self.tokens.get(index - 1) {
+            let token = self.tokens.get(index - 1);
+            match token.map(|x| &x.token) {
                 Some(Token::Whitespace(_)) => continue,
-                non_whitespace => {
+                _ => {
                     if n == 0 {
-                        return non_whitespace.cloned().unwrap_or(Token::EOF);
+                        return token
+                            .cloned()
+                            .unwrap_or(TokenWithLocation::wrap(Token::EOF));
                     }
                     n -= 1;
                 }
@@ -1443,18 +1491,23 @@ impl Parser {
     /// Return the first non-whitespace token that has not yet been processed
     /// (or None if reached end-of-file) and mark it as processed. OK to call
     /// repeatedly after reaching EOF.
-    pub fn next_token(&mut self) -> Token {
+    pub fn next_token(&mut self) -> TokenWithLocation {
         loop {
             self.index += 1;
-            match self.tokens.get(self.index - 1) {
+            let token = self.tokens.get(self.index - 1);
+            match token.map(|x| &x.token) {
                 Some(Token::Whitespace(_)) => continue,
-                token => return token.cloned().unwrap_or(Token::EOF),
+                _ => {
+                    return token
+                        .cloned()
+                        .unwrap_or(TokenWithLocation::wrap(Token::EOF))
+                }
             }
         }
     }
 
     /// Return the first unprocessed token, possibly whitespace.
-    pub fn next_token_no_skip(&mut self) -> Option<&Token> {
+    pub fn next_token_no_skip(&mut self) -> Option<&TokenWithLocation> {
         self.index += 1;
         self.tokens.get(self.index - 1)
     }
@@ -1466,7 +1519,7 @@ impl Parser {
         loop {
             assert!(self.index > 0);
             self.index -= 1;
-            if let Some(Token::Whitespace(_)) = self.tokens.get(self.index) {
+            if let Some(token) = self.tokens.get(self.index) && let Token::Whitespace(_) = token.token {
                 continue;
             }
             return;
@@ -1474,15 +1527,15 @@ impl Parser {
     }
 
     /// Report unexpected token
-    pub fn expected<T>(&self, expected: &str, found: Token) -> Result<T, ParserError> {
+    pub fn expected<T>(&self, expected: &str, found: TokenWithLocation) -> Result<T, ParserError> {
         let start_off = self.index.saturating_sub(10);
         let end_off = self.index.min(self.tokens.len());
         let near_tokens = &self.tokens[start_off..end_off];
-        struct TokensDisplay<'a>(&'a [Token]);
+        struct TokensDisplay<'a>(&'a [TokenWithLocation]);
         impl<'a> fmt::Display for TokensDisplay<'a> {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
                 for token in self.0 {
-                    write!(f, "{}", token)?;
+                    write!(f, "{}", token.token)?;
                 }
                 Ok(())
             }
@@ -1498,7 +1551,7 @@ impl Parser {
     /// Look for an expected keyword and consume it if it exists
     #[must_use]
     pub fn parse_keyword(&mut self, expected: Keyword) -> bool {
-        match self.peek_token() {
+        match self.peek_token().token {
             Token::Word(w) if expected == w.keyword => {
                 self.next_token();
                 true
@@ -1525,7 +1578,7 @@ impl Parser {
     /// Look for one of the given keywords and return the one that matches.
     #[must_use]
     pub fn parse_one_of_keywords(&mut self, keywords: &[Keyword]) -> Option<Keyword> {
-        match self.peek_token() {
+        match self.peek_token().token {
             Token::Word(w) => {
                 keywords
                     .iter()
@@ -1540,7 +1593,7 @@ impl Parser {
     }
 
     pub fn peek_nth_any_of_keywords(&mut self, n: usize, keywords: &[Keyword]) -> bool {
-        match self.peek_nth_token(n) {
+        match self.peek_nth_token(n).token {
             Token::Word(w) => keywords.iter().any(|keyword| *keyword == w.keyword),
             _ => false,
         }
@@ -1906,7 +1959,7 @@ impl Parser {
             Keyword::LINK => Ok(CreateFunctionUsing::Link(uri)),
             _ => self.expected(
                 "LINK, got {:?}",
-                Token::make_keyword(format!("{keyword:?}").as_str()),
+                TokenWithLocation::wrap(Token::make_keyword(format!("{keyword:?}").as_str())),
             ),
         }
     }
@@ -2114,7 +2167,7 @@ impl Parser {
                         "Only 1 watermark is allowed to be defined on source.".to_string(),
                     ));
                 }
-            } else if let Token::Word(_) = self.peek_token() {
+            } else if let Token::Word(_) = self.peek_token().token {
                 columns.push(self.parse_column_def()?);
             } else {
                 return self.expected("column name or constraint definition", self.peek_token());
@@ -2133,7 +2186,7 @@ impl Parser {
 
     fn parse_column_def(&mut self) -> Result<ColumnDef, ParserError> {
         let name = self.parse_identifier_non_reserved()?;
-        let data_type = if let Token::Word(_) = self.peek_token() {
+        let data_type = if let Token::Word(_) = self.peek_token().token {
             Some(self.parse_data_type()?)
         } else {
             None
@@ -2210,6 +2263,8 @@ impl Parser {
             let expr = self.parse_expr()?;
             self.expect_token(&Token::RParen)?;
             Ok(Some(ColumnOption::Check(expr)))
+        } else if self.parse_keyword(Keyword::AS) {
+            Ok(Some(ColumnOption::GeneratedColumns(self.parse_expr()?)))
         } else {
             Ok(None)
         }
@@ -2254,7 +2309,8 @@ impl Parser {
         } else {
             None
         };
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) if w.keyword == Keyword::PRIMARY || w.keyword == Keyword::UNIQUE => {
                 let is_primary = w.keyword == Keyword::PRIMARY;
                 if is_primary {
@@ -2303,7 +2359,10 @@ impl Parser {
             }
             unexpected => {
                 if name.is_some() {
-                    self.expected("PRIMARY, UNIQUE, FOREIGN, or CHECK", unexpected)
+                    self.expected(
+                        "PRIMARY, UNIQUE, FOREIGN, or CHECK",
+                        unexpected.with_location(token.location),
+                    )
                 } else {
                     self.prev_token();
                     Ok(None)
@@ -2361,12 +2420,25 @@ impl Parser {
     pub fn parse_alter(&mut self) -> Result<Statement, ParserError> {
         if self.parse_keyword(Keyword::TABLE) {
             self.parse_alter_table()
+        } else if self.parse_keyword(Keyword::INDEX) {
+            self.parse_alter_index()
+        } else if self.parse_keyword(Keyword::VIEW) {
+            self.parse_alter_view(false)
+        } else if self.parse_keywords(&[Keyword::MATERIALIZED, Keyword::VIEW]) {
+            self.parse_alter_view(true)
+        } else if self.parse_keyword(Keyword::SINK) {
+            self.parse_alter_sink()
+        } else if self.parse_keyword(Keyword::SOURCE) {
+            self.parse_alter_source()
         } else if self.parse_keyword(Keyword::USER) {
             self.parse_alter_user()
         } else if self.parse_keyword(Keyword::SYSTEM) {
             self.parse_alter_system()
         } else {
-            self.expected("TABLE or USER after ALTER", self.peek_token())
+            self.expected(
+                "TABLE, INDEX, MATERIALIZED, VIEW, SINK, SOURCE, USER or SYSTEM after ALTER",
+                self.peek_token(),
+            )
         }
     }
 
@@ -2461,6 +2533,89 @@ impl Parser {
         })
     }
 
+    pub fn parse_alter_index(&mut self) -> Result<Statement, ParserError> {
+        let index_name = self.parse_object_name()?;
+        let operation = if self.parse_keyword(Keyword::RENAME) {
+            if self.parse_keyword(Keyword::TO) {
+                let index_name = self.parse_object_name()?;
+                AlterIndexOperation::RenameIndex { index_name }
+            } else {
+                return self.expected("TO after RENAME", self.peek_token());
+            }
+        } else {
+            return self.expected("RENAME after ALTER INDEX", self.peek_token());
+        };
+
+        Ok(Statement::AlterIndex {
+            name: index_name,
+            operation,
+        })
+    }
+
+    pub fn parse_alter_view(&mut self, materialized: bool) -> Result<Statement, ParserError> {
+        let view_name = self.parse_object_name()?;
+        let operation = if self.parse_keyword(Keyword::RENAME) {
+            if self.parse_keyword(Keyword::TO) {
+                let view_name = self.parse_object_name()?;
+                AlterViewOperation::RenameView { view_name }
+            } else {
+                return self.expected("TO after RENAME", self.peek_token());
+            }
+        } else {
+            return self.expected(
+                &format!(
+                    "RENAME after ALTER {}VIEW",
+                    if materialized { "MATERIALIZED " } else { "" }
+                ),
+                self.peek_token(),
+            );
+        };
+
+        Ok(Statement::AlterView {
+            materialized,
+            name: view_name,
+            operation,
+        })
+    }
+
+    pub fn parse_alter_sink(&mut self) -> Result<Statement, ParserError> {
+        let sink_name = self.parse_object_name()?;
+        let operation = if self.parse_keyword(Keyword::RENAME) {
+            if self.parse_keyword(Keyword::TO) {
+                let sink_name = self.parse_object_name()?;
+                AlterSinkOperation::RenameSink { sink_name }
+            } else {
+                return self.expected("TO after RENAME", self.peek_token());
+            }
+        } else {
+            return self.expected("RENAME after ALTER SINK", self.peek_token());
+        };
+
+        Ok(Statement::AlterSink {
+            name: sink_name,
+            operation,
+        })
+    }
+
+    pub fn parse_alter_source(&mut self) -> Result<Statement, ParserError> {
+        let source_name = self.parse_object_name()?;
+        let operation = if self.parse_keyword(Keyword::RENAME) {
+            if self.parse_keyword(Keyword::TO) {
+                let source_name = self.parse_object_name()?;
+                AlterSourceOperation::RenameSource { source_name }
+            } else {
+                return self.expected("TO after RENAME", self.peek_token());
+            }
+        } else {
+            return self.expected("RENAME after ALTER SOURCE", self.peek_token());
+        };
+
+        Ok(Statement::AlterSource {
+            name: source_name,
+            operation,
+        })
+    }
+
     pub fn parse_alter_system(&mut self) -> Result<Statement, ParserError> {
         self.expect_keyword(Keyword::SET)?;
         let param = self.parse_identifier()?;
@@ -2495,7 +2650,7 @@ impl Parser {
         let mut values = vec![];
         let mut content = String::from("");
         while let Some(t) = self.next_token_no_skip() {
-            match t {
+            match t.token {
                 Token::Whitespace(Whitespace::Tab) => {
                     values.push(Some(content.to_string()));
                     content.clear();
@@ -2508,7 +2663,7 @@ impl Parser {
                     if self.consume_token(&Token::Period) {
                         return values;
                     }
-                    if let Token::Word(w) = self.next_token() {
+                    if let Token::Word(w) = self.next_token().token {
                         if w.value == "N" {
                             values.push(None);
                         }
@@ -2524,7 +2679,8 @@ impl Parser {
 
     /// Parse a literal value (numbers, strings, date/time, booleans)
     fn parse_value(&mut self) -> Result<Value, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) => match w.keyword {
                 Keyword::TRUE => Ok(Value::Boolean(true)),
                 Keyword::FALSE => Ok(Value::Boolean(false)),
@@ -2532,9 +2688,12 @@ impl Parser {
                 Keyword::NoKeyword if w.quote_style.is_some() => match w.quote_style {
                     Some('"') => Ok(Value::DoubleQuotedString(w.value)),
                     Some('\'') => Ok(Value::SingleQuotedString(w.value)),
-                    _ => self.expected("A value?", Token::Word(w))?,
+                    _ => self.expected("A value?", Token::Word(w).with_location(token.location))?,
                 },
-                _ => self.expected("a concrete value", Token::Word(w)),
+                _ => self.expected(
+                    "a concrete value",
+                    Token::Word(w).with_location(token.location),
+                ),
             },
             Token::Number(ref n) => Ok(Value::Number(n.clone())),
             Token::SingleQuotedString(ref s) => Ok(Value::SingleQuotedString(s.to_string())),
@@ -2542,13 +2701,13 @@ impl Parser {
             Token::CstyleEscapesString(ref s) => Ok(Value::CstyleEscapesString(s.to_string())),
             Token::NationalStringLiteral(ref s) => Ok(Value::NationalStringLiteral(s.to_string())),
             Token::HexStringLiteral(ref s) => Ok(Value::HexStringLiteral(s.to_string())),
-            unexpected => self.expected("a value", unexpected),
+            unexpected => self.expected("a value", unexpected.with_location(token.location)),
         }
     }
 
     fn parse_set_variable(&mut self) -> Result<SetVariableValue, ParserError> {
         let token = self.peek_token();
-        match (self.parse_value(), token) {
+        match (self.parse_value(), token.token) {
             (Ok(value), _) => Ok(SetVariableValue::Literal(value)),
             (Err(_), Token::Word(w)) => {
                 if w.keyword == Keyword::DEFAULT {
@@ -2557,7 +2716,9 @@ impl Parser {
                     Ok(SetVariableValue::Ident(w.to_ident()?))
                 }
             }
-            (Err(_), unexpected) => self.expected("variable value", unexpected),
+            (Err(_), unexpected) => {
+                self.expected("variable value", unexpected.with_location(token.location))
+            }
         }
     }
 
@@ -2573,17 +2734,18 @@ impl Parser {
 
     /// Parse an unsigned literal integer/long
     pub fn parse_literal_uint(&mut self) -> Result<u64, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Number(s) => s.parse::<u64>().map_err(|e| {
                 ParserError::ParserError(format!("Could not parse '{}' as u64: {}", s, e))
             }),
-            unexpected => self.expected("literal int", unexpected),
+            unexpected => self.expected("literal int", unexpected.with_location(token.location)),
         }
     }
 
     pub fn parse_function_definition(&mut self) -> Result<FunctionDefinition, ParserError> {
         let peek_token = self.peek_token();
-        match peek_token {
+        match peek_token.token {
             Token::DollarQuotedString(value) => {
                 self.next_token();
                 Ok(FunctionDefinition::DoubleDollarDef(value.value))
@@ -2596,16 +2758,18 @@ impl Parser {
 
     /// Parse a literal string
     pub fn parse_literal_string(&mut self) -> Result<String, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(Word { value, keyword, .. }) if keyword == Keyword::NoKeyword => Ok(value),
             Token::SingleQuotedString(s) => Ok(s),
-            unexpected => self.expected("literal string", unexpected),
+            unexpected => self.expected("literal string", unexpected.with_location(token.location)),
         }
     }
 
     /// Parse a map key string
     pub fn parse_map_key(&mut self) -> Result<Expr, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(Word { value, keyword, .. }) if keyword == Keyword::NoKeyword => {
                 if self.peek_token() == Token::LParen {
                     return self.parse_function(ObjectName(vec![Ident::new_unchecked(value)]));
@@ -2614,7 +2778,10 @@ impl Parser {
             }
             Token::SingleQuotedString(s) => Ok(Expr::Value(Value::SingleQuotedString(s))),
             Token::Number(s) => Ok(Expr::Value(Value::Number(s))),
-            unexpected => self.expected("literal string, number or function", unexpected),
+            unexpected => self.expected(
+                "literal string, number or function",
+                unexpected.with_location(token.location),
+            ),
         }
     }
 
@@ -2638,7 +2805,7 @@ impl Parser {
         self.angle_brackets_num += 1;
 
         loop {
-            if let Token::Word(_) = self.peek_token() {
+            if let Token::Word(_) = self.peek_token().token {
                 let name = self.parse_identifier_non_reserved()?;
                 let data_type = self.parse_data_type()?;
                 columns.push(StructField { name, data_type })
@@ -2667,7 +2834,8 @@ impl Parser {
 
     /// Parse a SQL datatype
     pub fn parse_data_type_inner(&mut self) -> Result<DataType, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) => match w.keyword {
                 Keyword::BOOLEAN | Keyword::BOOL => Ok(DataType::Boolean),
                 Keyword::FLOAT => {
@@ -2740,7 +2908,9 @@ impl Parser {
                     Ok(DataType::Custom(type_name))
                 }
             },
-            unexpected => self.expected("a data type name", unexpected),
+            unexpected => {
+                self.expected("a data type name", unexpected.with_location(token.location))
+            }
         }
     }
 
@@ -2752,7 +2922,8 @@ impl Parser {
         reserved_kwds: &[Keyword],
     ) -> Result<Option<Ident>, ParserError> {
         let after_as = self.parse_keyword(Keyword::AS);
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             // Accept any identifier after `AS` (though many dialects have restrictions on
             // keywords that may appear here). If there's no `AS`: don't parse keywords,
             // which may start a construct allowed in this position, to be parsed as aliases.
@@ -2763,7 +2934,10 @@ impl Parser {
             }
             not_an_ident => {
                 if after_as {
-                    return self.expected("an identifier after AS", not_an_ident);
+                    return self.expected(
+                        "an identifier after AS",
+                        not_an_ident.with_location(token.location),
+                    );
                 }
                 self.prev_token();
                 Ok(None) // no alias found
@@ -2821,7 +2995,7 @@ impl Parser {
     pub fn parse_identifiers_non_keywords(&mut self) -> Result<Vec<Ident>, ParserError> {
         let mut idents = vec![];
         loop {
-            match self.peek_token() {
+            match self.peek_token().token {
                 Token::Word(w) => {
                     if w.keyword != Keyword::NoKeyword {
                         break;
@@ -2843,7 +3017,8 @@ impl Parser {
     pub fn parse_identifiers(&mut self) -> Result<Vec<Ident>, ParserError> {
         let mut idents = vec![];
         loop {
-            match self.next_token() {
+            let token = self.next_token();
+            match token.token {
                 Token::Word(w) => {
                     idents.push(w.to_ident()?);
                 }
@@ -2857,22 +3032,24 @@ impl Parser {
 
     /// Parse a simple one-word identifier (possibly quoted, possibly a keyword)
     pub fn parse_identifier(&mut self) -> Result<Ident, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) => Ok(w.to_ident()?),
-            unexpected => self.expected("identifier", unexpected),
+            unexpected => self.expected("identifier", unexpected.with_location(token.location)),
         }
     }
 
     /// Parse a simple one-word identifier (possibly quoted, possibly a non-reserved keyword)
     pub fn parse_identifier_non_reserved(&mut self) -> Result<Ident, ParserError> {
-        match self.next_token() {
+        let token = self.next_token();
+        match token.token {
             Token::Word(w) => {
                 match keywords::RESERVED_FOR_COLUMN_OR_TABLE_NAME.contains(&w.keyword) {
                     true => parser_err!(format!("syntax error at or near \"{w}\"")),
                     false => Ok(w.to_ident()?),
                 }
             }
-            unexpected => self.expected("identifier", unexpected),
+            unexpected => self.expected("identifier", unexpected.with_location(token.location)),
         }
     }
 
@@ -3170,7 +3347,7 @@ impl Parser {
 
         loop {
             // The query can be optionally followed by a set operator:
-            let op = self.parse_set_operator(&self.peek_token());
+            let op = self.parse_set_operator(&self.peek_token().token);
             let next_precedence = match op {
                 // UNION and EXCEPT have the same binding power and evaluate left-to-right
                 Some(SetOperator::Union) | Some(SetOperator::Except) => 10,
@@ -3345,7 +3522,7 @@ impl Parser {
     /// otherwise, return `Statement::ShowVariable`.
     pub fn parse_show(&mut self) -> Result<Statement, ParserError> {
         let index = self.index;
-        if let Token::Word(w) = self.next_token() {
+        if let Token::Word(w) = self.next_token().token {
             match w.keyword {
                 Keyword::TABLES => {
                     return Ok(Statement::ShowObjects(ShowObject::Table {
@@ -3418,7 +3595,7 @@ impl Parser {
 
     /// Parse object type and name after `show create`.
     pub fn parse_show_create(&mut self) -> Result<Statement, ParserError> {
-        if let Token::Word(w) = self.next_token() {
+        if let Token::Word(w) = self.next_token().token {
             let show_type = match w.keyword {
                 Keyword::TABLE => ShowCreateType::Table,
                 Keyword::MATERIALIZED => {
@@ -3471,7 +3648,7 @@ impl Parser {
                 }
             } else {
                 let natural = self.parse_keyword(Keyword::NATURAL);
-                let peek_keyword = if let Token::Word(w) = self.peek_token() {
+                let peek_keyword = if let Token::Word(w) = self.peek_token().token {
                     w.keyword
                 } else {
                     Keyword::NoKeyword
@@ -3546,7 +3723,7 @@ impl Parser {
 
             // It can only be a subquery. We don't use `maybe_parse` so that a meaningful error can
             // be returned.
-            match self.peek_token() {
+            match self.peek_token().token {
                 Token::Word(w)
                     if [Keyword::SELECT, Keyword::WITH, Keyword::VALUES].contains(&w.keyword) =>
                 {
@@ -4101,7 +4278,7 @@ impl Parser {
         self.expect_keyword(Keyword::ON)?;
         let token = self.next_token();
 
-        let (object_type, object_name) = match token {
+        let (object_type, object_name) = match token.token {
             Token::Word(w) if w.keyword == Keyword::COLUMN => {
                 let object_name = self.parse_object_name()?;
                 (CommentObject::Column, object_name)
diff --git a/src/sqlparser/src/test_utils.rs b/src/sqlparser/src/test_utils.rs
index 92c79f1e256a4..00d454a2fc992 100644
--- a/src/sqlparser/src/test_utils.rs
+++ b/src/sqlparser/src/test_utils.rs
@@ -34,7 +34,7 @@ where
     F: Fn(&mut Parser) -> T,
 {
     let mut tokenizer = Tokenizer::new(sql);
-    let tokens = tokenizer.tokenize().unwrap();
+    let tokens = tokenizer.tokenize_with_location().unwrap();
     f(&mut Parser::new(tokens))
 }
 
diff --git a/src/sqlparser/src/tokenizer.rs b/src/sqlparser/src/tokenizer.rs
index ed1e1ef4831d2..dbef78d14e98b 100644
--- a/src/sqlparser/src/tokenizer.rs
+++ b/src/sqlparser/src/tokenizer.rs
@@ -25,6 +25,7 @@ use alloc::{
     vec::Vec,
 };
 use core::fmt;
+use core::fmt::Debug;
 use core::iter::Peekable;
 use core::str::Chars;
 
@@ -237,6 +238,10 @@ impl Token {
             },
         })
     }
+
+    pub fn with_location(self, location: Location) -> TokenWithLocation {
+        TokenWithLocation::new(self, location.line, location.column)
+    }
 }
 
 /// A keyword (like SELECT) or an optionally quoted SQL identifier
@@ -300,6 +305,61 @@ impl fmt::Display for Whitespace {
     }
 }
 
+/// Location in input string
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct Location {
+    /// Line number, starting from 1
+    pub line: u64,
+    /// Line column, starting from 1
+    pub column: u64,
+}
+
+/// A [Token] with [Location] attached to it
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct TokenWithLocation {
+    pub token: Token,
+    pub location: Location,
+}
+
+impl TokenWithLocation {
+    pub fn new(token: Token, line: u64, column: u64) -> TokenWithLocation {
+        TokenWithLocation {
+            token,
+            location: Location { line, column },
+        }
+    }
+
+    pub fn wrap(token: Token) -> TokenWithLocation {
+        TokenWithLocation::new(token, 0, 0)
+    }
+}
+
+impl PartialEq<Token> for TokenWithLocation {
+    fn eq(&self, other: &Token) -> bool {
+        &self.token == other
+    }
+}
+
+impl PartialEq<TokenWithLocation> for Token {
+    fn eq(&self, other: &TokenWithLocation) -> bool {
+        self == &other.token
+    }
+}
+
+impl fmt::Display for TokenWithLocation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.token == Token::EOF {
+            write!(f, "EOF at the end")
+        } else {
+            write!(
+                f,
+                "{} at line:{}, column:{}",
+                self.token, self.location.line, self.location.column
+            )
+        }
+    }
+}
+
 /// Tokenizer error
 #[derive(Debug, PartialEq)]
 pub struct TokenizerError {
@@ -338,11 +398,11 @@ impl<'a> Tokenizer<'a> {
         }
     }
 
-    /// Tokenize the statement and produce a vector of tokens
-    pub fn tokenize(&mut self) -> Result<Vec<Token>, TokenizerError> {
+    /// Tokenize the statement and produce a vector of tokens with locations.
+    pub fn tokenize_with_location(&mut self) -> Result<Vec<TokenWithLocation>, TokenizerError> {
         let mut peekable = self.query.chars().peekable();
 
-        let mut tokens: Vec<Token> = vec![];
+        let mut tokens: Vec<TokenWithLocation> = vec![];
 
         while let Some(token) = self.next_token(&mut peekable)? {
             match &token {
@@ -359,11 +419,20 @@ impl<'a> Tokenizer<'a> {
                 _ => self.col += 1,
             }
 
-            tokens.push(token);
+            let token_with_location = TokenWithLocation::new(token, self.line, self.col);
+
+            tokens.push(token_with_location);
         }
         Ok(tokens)
     }
 
+    /// Tokenize the statement and produce a vector of tokens without locations.
+    #[allow(dead_code)]
+    fn tokenize(&mut self) -> Result<Vec<Token>, TokenizerError> {
+        self.tokenize_with_location()
+            .map(|v| v.into_iter().map(|t| t.token).collect())
+    }
+
     /// Get the next token or return None
     fn next_token(&self, chars: &mut Peekable<Chars<'_>>) -> Result<Option<Token>, TokenizerError> {
         match chars.peek() {
diff --git a/src/sqlparser/tests/sqlparser_common.rs b/src/sqlparser/tests/sqlparser_common.rs
index 1d3d280d3e567..361940cc3d0b0 100644
--- a/src/sqlparser/tests/sqlparser_common.rs
+++ b/src/sqlparser/tests/sqlparser_common.rs
@@ -3514,7 +3514,7 @@ fn parse_rollback() {
 
 #[test]
 fn parse_create_index() {
-    let sql = "CREATE UNIQUE INDEX IF NOT EXISTS idx_name ON test(name,age DESC) INCLUDE(other) DISTRIBUTED BY(name)";
+    let sql = "CREATE UNIQUE INDEX IF NOT EXISTS idx_name ON test(name, age DESC) INCLUDE(other) DISTRIBUTED BY(name)";
     let indexed_columns = vec![
         OrderByExpr {
             expr: Expr::Identifier(Ident::new_unchecked("name")),
diff --git a/src/sqlparser/tests/sqlparser_postgres.rs b/src/sqlparser/tests/sqlparser_postgres.rs
index e13ae03cc04a5..d78e71d99e080 100644
--- a/src/sqlparser/tests/sqlparser_postgres.rs
+++ b/src/sqlparser/tests/sqlparser_postgres.rs
@@ -1021,7 +1021,7 @@ fn parse_array() {
     assert_eq!(
         parse_sql_statements(sql),
         Err(ParserError::ParserError(
-            "syntax error at or near '['".to_string()
+            "syntax error at or near '[ at line:1, column:28'".to_string()
         ))
     );
 
@@ -1029,7 +1029,7 @@ fn parse_array() {
     assert_eq!(
         parse_sql_statements(sql),
         Err(ParserError::ParserError(
-            "syntax error at or near '['".to_string()
+            "syntax error at or near '[ at line:1, column:24'".to_string()
         ))
     );
 
@@ -1037,7 +1037,7 @@ fn parse_array() {
     assert_eq!(
         parse_sql_statements(sql),
         Err(ParserError::ParserError(
-            "syntax error at or near 'ARRAY'".to_string()
+            "syntax error at or near 'ARRAY at line:1, column:27'".to_string()
         ))
     );
 
@@ -1045,7 +1045,7 @@ fn parse_array() {
     assert_eq!(
         parse_sql_statements(sql),
         Err(ParserError::ParserError(
-            "syntax error at or near 'ARRAY'".to_string()
+            "syntax error at or near 'ARRAY at line:1, column:23'".to_string()
         ))
     );
 
diff --git a/src/sqlparser/tests/testdata/array.yaml b/src/sqlparser/tests/testdata/array.yaml
index be97042cfa0c0..aa655652b2b7f 100644
--- a/src/sqlparser/tests/testdata/array.yaml
+++ b/src/sqlparser/tests/testdata/array.yaml
@@ -7,15 +7,15 @@
   formatted_sql: CREATE TABLE t (a INT[][][])
 - input: CREATE TABLE t(a int[);
   error_msg: |-
-    sql parser error: Expected ], found: )
+    sql parser error: Expected ], found: ) at line:1, column:23
     Near "CREATE TABLE t(a int["
 - input: CREATE TABLE t(a int[[]);
   error_msg: |-
-    sql parser error: Expected ], found: [
+    sql parser error: Expected ], found: [ at line:1, column:23
     Near "CREATE TABLE t(a int["
 - input: CREATE TABLE t(a int]);
   error_msg: |-
-    sql parser error: Expected ',' or ')' after column definition, found: ]
+    sql parser error: Expected ',' or ')' after column definition, found: ] at line:1, column:22
     Near "CREATE TABLE t(a int"
 - input: SELECT foo[0] FROM foos
   formatted_sql: SELECT foo[0] FROM foos
diff --git a/src/sqlparser/tests/testdata/create.yaml b/src/sqlparser/tests/testdata/create.yaml
index b3d573ad79ba3..c6ff608bd682e 100644
--- a/src/sqlparser/tests/testdata/create.yaml
+++ b/src/sqlparser/tests/testdata/create.yaml
@@ -17,7 +17,7 @@
   formatted_sql: CREATE TABLE t (a INT, b INT) AS SELECT 1 AS b, 2 AS a
 - input: CREATE SOURCE src
   error_msg: |-
-    sql parser error: Expected ROW, found: EOF
+    sql parser error: Expected ROW, found: EOF at the end
     Near "CREATE SOURCE src"
 - input: CREATE SOURCE src ROW FORMAT JSON
   formatted_sql: CREATE SOURCE src ROW FORMAT JSON
@@ -44,7 +44,7 @@
   formatted_sql: CREATE USER user WITH SUPERUSER CREATEDB PASSWORD 'password'
 - input: CREATE SINK snk
   error_msg: |-
-    sql parser error: Expected FROM or AS after CREATE SINK sink_name, found: EOF
+    sql parser error: Expected FROM or AS after CREATE SINK sink_name, found: EOF at the end
     Near "CREATE SINK snk"
 - input: CREATE SINK IF NOT EXISTS snk FROM mv WITH (connector = 'mysql', mysql.endpoint = '127.0.0.1:3306', mysql.table = '<table_name>', mysql.database = '<database_name>', mysql.user = '<user_name>', mysql.password = '<password>')
   formatted_sql: CREATE SINK IF NOT EXISTS snk FROM mv WITH (connector = 'mysql', mysql.endpoint = '127.0.0.1:3306', mysql.table = '<table_name>', mysql.database = '<database_name>', mysql.user = '<user_name>', mysql.password = '<password>')
@@ -60,5 +60,5 @@
   error_msg: 'sql parser error: conflicting or redundant options'
 - input: create user tmp with encrypted password null
   error_msg: |-
-    sql parser error: Expected literal string, found: null
+    sql parser error: Expected literal string, found: null at line:1, column:45
     Near " tmp with encrypted password null"
diff --git a/src/sqlparser/tests/testdata/insert.yaml b/src/sqlparser/tests/testdata/insert.yaml
index 553d05052d4cb..4d1bb445d0027 100644
--- a/src/sqlparser/tests/testdata/insert.yaml
+++ b/src/sqlparser/tests/testdata/insert.yaml
@@ -1,7 +1,7 @@
 # This file is automatically generated. See `src/sqlparser/test_runner/src/bin/apply.rs` for more information.
 - input: INSERT public.customer (id, name, active) VALUES (1, 2, 3)
   error_msg: |-
-    sql parser error: Expected INTO, found: public
+    sql parser error: Expected INTO, found: public at line:1, column:14
     Near "INSERT"
 - input: INSERT INTO t VALUES(1,3), (2,4) RETURNING *, a, a as aaa
   formatted_sql: INSERT INTO t VALUES (1, 3), (2, 4) RETURNING (*, a, a AS aaa)
diff --git a/src/sqlparser/tests/testdata/select.yaml b/src/sqlparser/tests/testdata/select.yaml
index f60c44b083ff3..0ac9f0addae87 100644
--- a/src/sqlparser/tests/testdata/select.yaml
+++ b/src/sqlparser/tests/testdata/select.yaml
@@ -43,11 +43,11 @@
   error_msg: 'sql parser error: WITH TIES cannot be specified without ORDER BY clause'
 - input: select * from (select 1 from 1);
   error_msg: |-
-    sql parser error: Expected identifier, found: 1
+    sql parser error: Expected identifier, found: 1 at line:1, column:31
     Near "from (select 1 from 1"
 - input: select * from (select * from tumble(t, x, interval '10' minutes))
   error_msg: |-
-    sql parser error: Expected ), found: minutes
+    sql parser error: Expected ), found: minutes at line:1, column:62
     Near "(t, x, interval '10'"
 - input: SELECT 1, FROM t
   error_msg: 'sql parser error: syntax error at or near "FROM"'
@@ -74,7 +74,7 @@
   error_msg: 'sql parser error: precision for type float must be less than 54 bits'
 - input: SELECT 1::int(2)
   error_msg: |-
-    sql parser error: Expected end of statement, found: (
+    sql parser error: Expected end of statement, found: ( at line:1, column:14
     Near "SELECT 1::int"
 - input: select id1, a1, id2, a2 from stream as S join version FOR SYSTEM_TIME AS OF NOW() AS V on id1= id2
   formatted_sql: SELECT id1, a1, id2, a2 FROM stream AS S JOIN version FOR SYSTEM_TIME AS OF NOW() AS V ON id1 = id2
diff --git a/src/sqlparser/tests/testdata/set.yaml b/src/sqlparser/tests/testdata/set.yaml
index d990a05e49e69..88aaa61949606 100644
--- a/src/sqlparser/tests/testdata/set.yaml
+++ b/src/sqlparser/tests/testdata/set.yaml
@@ -7,7 +7,7 @@
   formatted_sql: SET TIME ZONE "Asia/Shanghai"
 - input: SET TIME ZONE 'Asia/Shanghai'
   error_msg: |-
-    sql parser error: Expected a value, found: EOF
+    sql parser error: Expected a value, found: EOF at the end
     Near "SET TIME ZONE 'Asia/Shanghai'"
 - input: SET TIME ZONE "UTC"
   formatted_sql: SET TIME ZONE "UTC"
diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml
index 458fddc776fbf..ce12fee5e50bc 100644
--- a/src/storage/Cargo.toml
+++ b/src/storage/Cargo.toml
@@ -16,7 +16,7 @@ normal = ["workspace-hack"]
 [dependencies]
 arc-swap = "1"
 async-trait = "0.1"
-auto_enums = { version = "0.7", features = ["futures"] }
+auto_enums = { version = "0.8", features = ["futures03"] }
 await-tree = "0.1.1"
 bytes = { version = "1", features = ["serde"] }
 crossbeam = "0.8.1"
@@ -26,6 +26,7 @@ enum-as-inner = "0.5"
 fail = "0.5"
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
 futures-async-stream = "0.2"
+hex = "0.4"
 itertools = "0.10"
 libc = "0.2"
 lz4 = "1.23.1"
@@ -48,6 +49,7 @@ scopeguard = "1"
 sled = "0.34.7"
 spin = "0.9"
 sync-point = { path = "../utils/sync-point" }
+sysinfo = { version = "0.26", default-features = false }
 tempfile = "3"
 thiserror = "1"
 # tikv-client = { git = "https://github.com/tikv/client-rust", rev = "5714b2", optional = true }
@@ -67,8 +69,15 @@ xxhash-rust = { version = "0.8.5", features = ["xxh32", "xxh64"] }
 zstd = "0.11.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
+procfs = { version = "0.12", default-features = false }
+libc = "0.2"
 nix = { version = "0.25", features = ["fs", "mman"] }
 
+[target.'cfg(target_os = "macos")'.dependencies]
+darwin-libproc = { git = "https://github.com/risingwavelabs/darwin-libproc.git", rev = "a502be24bd0971463f5bcbfe035a248d8ba503b7" }
+libc = "0.2.72"
+mach = "0.3.2"
+
 [target.'cfg(not(madsim))'.dependencies]
 workspace-hack = { path = "../workspace-hack" }
 
diff --git a/src/storage/backup/integration_tests/common.sh b/src/storage/backup/integration_tests/common.sh
index 8b4048776d118..163f4736f3abc 100644
--- a/src/storage/backup/integration_tests/common.sh
+++ b/src/storage/backup/integration_tests/common.sh
@@ -19,9 +19,6 @@ function clean_etcd_data() {
 
 function start_cluster() {
   cargo make d ci-meta-backup-test 1>/dev/null 2>&1
-  execute_sql_and_expect \
-  "alter system set  backup_storage_url to \"minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001\";" \
-  "ALTER_SYSTEM"
   sleep 5
 }
 
diff --git a/src/storage/backup/src/lib.rs b/src/storage/backup/src/lib.rs
index b2d371431f6cf..ab85d68095216 100644
--- a/src/storage/backup/src/lib.rs
+++ b/src/storage/backup/src/lib.rs
@@ -41,10 +41,7 @@ use std::hash::Hasher;
 use itertools::Itertools;
 use risingwave_hummock_sdk::compaction_group::hummock_version_ext::HummockVersionExt;
 use risingwave_hummock_sdk::{HummockSstableObjectId, HummockVersionId};
-use risingwave_pb::backup_service::{
-    MetaSnapshotManifest as ProstMetaSnapshotManifest,
-    MetaSnapshotMetadata as ProstMetaSnapshotMetadata,
-};
+use risingwave_pb::backup_service::{PbMetaSnapshotManifest, PbMetaSnapshotMetadata};
 use risingwave_pb::hummock::HummockVersion;
 use serde::{Deserialize, Serialize};
 
@@ -102,7 +99,7 @@ pub fn xxhash64_verify(data: &[u8], checksum: u64) -> BackupResult<()> {
     Ok(())
 }
 
-impl From<&MetaSnapshotMetadata> for ProstMetaSnapshotMetadata {
+impl From<&MetaSnapshotMetadata> for PbMetaSnapshotMetadata {
     fn from(m: &MetaSnapshotMetadata) -> Self {
         Self {
             id: m.id,
@@ -113,7 +110,7 @@ impl From<&MetaSnapshotMetadata> for ProstMetaSnapshotMetadata {
     }
 }
 
-impl From<&MetaSnapshotManifest> for ProstMetaSnapshotManifest {
+impl From<&MetaSnapshotManifest> for PbMetaSnapshotManifest {
     fn from(m: &MetaSnapshotManifest) -> Self {
         Self {
             manifest_id: m.manifest_id,
diff --git a/src/storage/benches/bench_compactor.rs b/src/storage/benches/bench_compactor.rs
index 89a8a16e87956..fbea87203d51d 100644
--- a/src/storage/benches/bench_compactor.rs
+++ b/src/storage/benches/bench_compactor.rs
@@ -17,6 +17,7 @@ use std::sync::Arc;
 
 use criterion::async_executor::FuturesExecutor;
 use criterion::{criterion_group, criterion_main, Criterion};
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::TableId;
 use risingwave_hummock_sdk::key::FullKey;
 use risingwave_hummock_sdk::key_range::KeyRange;
@@ -50,6 +51,7 @@ pub fn mock_sstable_store() -> SstableStoreRef {
         path,
         64 << 20,
         128 << 20,
+        0,
         TieredCache::none(),
     ))
 }
@@ -58,7 +60,7 @@ pub fn default_writer_opts() -> SstableWriterOptions {
     SstableWriterOptions {
         capacity_hint: None,
         tracker: None,
-        policy: CachePolicy::Fill,
+        policy: CachePolicy::Fill(CachePriority::High),
     }
 }
 
@@ -90,7 +92,7 @@ async fn build_table(
         SstableWriterOptions {
             capacity_hint: None,
             tracker: None,
-            policy: CachePolicy::Fill,
+            policy: CachePolicy::Fill(CachePriority::High),
         },
     );
     let mut builder = SstableBuilder::for_test(sstable_object_id, writer, opt);
@@ -214,7 +216,7 @@ fn bench_merge_iterator_compactor(c: &mut Criterion) {
         .block_on(async { build_table(sstable_store.clone(), 4, 0..test_key_size, 2).await });
     let level2 = vec![info1, info2];
     let read_options = Arc::new(SstableIteratorReadOptions {
-        prefetch: true,
+        cache_policy: CachePolicy::Fill(CachePriority::High),
         must_iterated_end_user_key: None,
     });
     c.bench_function("bench_union_merge_iterator", |b| {
@@ -231,8 +233,18 @@ fn bench_merge_iterator_compactor(c: &mut Criterion) {
     c.bench_function("bench_merge_iterator", |b| {
         b.to_async(&runtime).iter(|| {
             let sub_iters = vec![
-                ConcatSstableIterator::new(level1.clone(), KeyRange::inf(), sstable_store.clone()),
-                ConcatSstableIterator::new(level2.clone(), KeyRange::inf(), sstable_store.clone()),
+                ConcatSstableIterator::new(
+                    vec![0],
+                    level1.clone(),
+                    KeyRange::inf(),
+                    sstable_store.clone(),
+                ),
+                ConcatSstableIterator::new(
+                    vec![0],
+                    level2.clone(),
+                    KeyRange::inf(),
+                    sstable_store.clone(),
+                ),
             ];
             let iter = UnorderedMergeIteratorInner::for_compactor(sub_iters);
             let sstable_store1 = sstable_store.clone();
diff --git a/src/storage/benches/bench_lru_cache.rs b/src/storage/benches/bench_lru_cache.rs
index 2fbd3f0a97121..f89567c7fef4e 100644
--- a/src/storage/benches/bench_lru_cache.rs
+++ b/src/storage/benches/bench_lru_cache.rs
@@ -24,6 +24,7 @@ use criterion::{criterion_group, criterion_main, Criterion};
 use moka::future::Cache;
 use rand::rngs::SmallRng;
 use rand::{RngCore, SeedableRng};
+use risingwave_common::cache::CachePriority;
 use risingwave_storage::hummock::{HummockError, HummockResult, LruCache};
 use tokio::runtime::{Builder, Runtime};
 
@@ -87,7 +88,7 @@ pub struct LruCacheImpl {
 impl LruCacheImpl {
     pub fn new(capacity: usize, fake_io_latency: Duration) -> Self {
         Self {
-            inner: Arc::new(LruCache::new(3, capacity)),
+            inner: Arc::new(LruCache::new(3, capacity, 0)),
             fake_io_latency,
         }
     }
@@ -104,7 +105,7 @@ impl CacheBase for LruCacheImpl {
         let latency = self.fake_io_latency;
         let entry = self
             .inner
-            .lookup_with_request_dedup(h, key, || async move {
+            .lookup_with_request_dedup(h, key, CachePriority::High, || async move {
                 get_fake_block(sst_object_id, block_idx, latency)
                     .await
                     .map(|block| (Arc::new(block), 1))
diff --git a/src/storage/benches/bench_multi_builder.rs b/src/storage/benches/bench_multi_builder.rs
index efbe441e0f272..a7a162cf213c0 100644
--- a/src/storage/benches/bench_multi_builder.rs
+++ b/src/storage/benches/bench_multi_builder.rs
@@ -140,6 +140,7 @@ fn bench_builder(
         "test".to_string(),
         64 << 20,
         128 << 20,
+        0,
         TieredCache::none(),
     ));
 
diff --git a/src/storage/compactor/Cargo.toml b/src/storage/compactor/Cargo.toml
index e52bdb1c275c6..d66648e8f316a 100644
--- a/src/storage/compactor/Cargo.toml
+++ b/src/storage/compactor/Cargo.toml
@@ -15,6 +15,7 @@ ignored = ["workspace-hack"]
 normal = ["workspace-hack"]
 
 [dependencies]
+anyhow = "1"
 async-trait = "0.1"
 clap = { version = "4", features = ["derive"] }
 prometheus = { version = "0.13" }
@@ -26,6 +27,8 @@ risingwave_object_store = { path = "../../object_store" }
 risingwave_pb = { path = "../../prost" }
 risingwave_rpc_client = { path = "../../rpc_client" }
 risingwave_storage = { path = "../../storage" }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "fs",
     "rt",
diff --git a/src/storage/compactor/src/compactor_observer/observer_manager.rs b/src/storage/compactor/src/compactor_observer/observer_manager.rs
index 2e9996ffaa699..6b539ecadfa27 100644
--- a/src/storage/compactor/src/compactor_observer/observer_manager.rs
+++ b/src/storage/compactor/src/compactor_observer/observer_manager.rs
@@ -21,6 +21,7 @@ use risingwave_hummock_sdk::filter_key_extractor::{
     FilterKeyExtractorImpl, FilterKeyExtractorManagerRef,
 };
 use risingwave_pb::catalog::Table;
+use risingwave_pb::meta::relation::RelationInfo;
 use risingwave_pb::meta::subscribe_response::{Info, Operation};
 use risingwave_pb::meta::SubscribeResponse;
 
@@ -39,17 +40,24 @@ impl ObserverState for CompactorObserverNode {
         };
 
         match info.to_owned() {
-            Info::Table(table_catalog) => {
-                assert!(
-                    resp.version > self.version,
-                    "resp version={:?}, current version={:?}",
-                    resp.version,
-                    self.version
-                );
+            Info::RelationGroup(relation_group) => {
+                for relation in relation_group.relations {
+                    match relation.relation_info.unwrap() {
+                        RelationInfo::Table(table_catalog) => {
+                            assert!(
+                                resp.version > self.version,
+                                "resp version={:?}, current version={:?}",
+                                resp.version,
+                                self.version
+                            );
 
-                self.handle_catalog_notification(resp.operation(), table_catalog);
+                            self.handle_catalog_notification(resp.operation(), table_catalog);
 
-                self.version = resp.version;
+                            self.version = resp.version;
+                        }
+                        _ => panic!("error type notification"),
+                    };
+                }
             }
             Info::HummockVersionDeltas(_) => {}
             Info::SystemParams(p) => {
diff --git a/src/storage/compactor/src/lib.rs b/src/storage/compactor/src/lib.rs
index df5984254799f..5ad04828b4815 100644
--- a/src/storage/compactor/src/lib.rs
+++ b/src/storage/compactor/src/lib.rs
@@ -15,6 +15,7 @@
 mod compactor_observer;
 mod rpc;
 mod server;
+mod telemetry;
 
 use clap::Parser;
 use risingwave_common_proc_macro::OverrideConfig;
@@ -51,12 +52,6 @@ pub struct CompactorOpts {
     #[clap(long, env = "RW_META_ADDR", default_value = "http://127.0.0.1:5690")]
     pub meta_address: String,
 
-    /// Of the form `hummock+{object_store}` where `object_store`
-    /// is one of `s3://{path}`, `s3-compatible://{path}`, `minio://{path}`, `disk://{path}`,
-    /// `memory` or `memory-shared`.
-    #[clap(long, env = "RW_STATE_STORE")]
-    pub state_store: Option<String>,
-
     #[clap(long, env = "RW_COMPACTION_WORKER_THREADS_NUMBER")]
     pub compaction_worker_threads_number: Option<usize>,
 
@@ -94,7 +89,6 @@ pub fn start(opts: CompactorOpts) -> Pin<Box<dyn Future<Output = ()> + Send>> {
     // slow compile in release mode.
     Box::pin(async move {
         tracing::info!("Compactor node options: {:?}", opts);
-        warn_future_deprecate_options(&opts);
         tracing::info!("meta address: {}", opts.meta_address.clone());
 
         let listen_addr = opts.listen_addr.parse().unwrap();
@@ -118,9 +112,3 @@ pub fn start(opts: CompactorOpts) -> Pin<Box<dyn Future<Output = ()> + Send>> {
         observer_join_handle.abort();
     })
 }
-
-fn warn_future_deprecate_options(opts: &CompactorOpts) {
-    if opts.state_store.is_some() {
-        tracing::warn!("`--state-store` will not be accepted by compactor node in the next release. Please consider moving this argument to the meta node.");
-    }
-}
diff --git a/src/storage/compactor/src/server.rs b/src/storage/compactor/src/server.rs
index a1296a55999d0..d22e1b2c9fb03 100644
--- a/src/storage/compactor/src/server.rs
+++ b/src/storage/compactor/src/server.rs
@@ -16,9 +16,11 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::Duration;
 
-use risingwave_common::config::load_config;
+use risingwave_common::config::{extract_storage_memory_config, load_config};
 use risingwave_common::monitor::process_linux::monitor_process;
 use risingwave_common::system_param::local_manager::LocalSystemParamsManager;
+use risingwave_common::telemetry::manager::TelemetryManager;
+use risingwave_common::telemetry::telemetry_env_enabled;
 use risingwave_common::util::addr::HostAddr;
 use risingwave_common::{GIT_SHA, RW_VERSION};
 use risingwave_common_service::metrics_manager::MetricsManager;
@@ -44,6 +46,7 @@ use tracing::info;
 
 use super::compactor_observer::observer_manager::CompactorObserverNode;
 use crate::rpc::CompactorServiceImpl;
+use crate::telemetry::CompactorTelemetryCreator;
 use crate::CompactorOpts;
 
 /// Fetches and runs compaction tasks.
@@ -85,12 +88,14 @@ pub async fn compactor_serve(
         hummock_metrics.clone(),
     ));
 
-    let state_store_url = {
-        let from_local = opts.state_store.unwrap_or("".to_string());
-        system_params_reader.state_store(from_local)
-    };
+    let state_store_url = system_params_reader.state_store();
 
-    let storage_opts = Arc::new(StorageOpts::from((&config, &system_params_reader)));
+    let storage_memory_config = extract_storage_memory_config(&config);
+    let storage_opts = Arc::new(StorageOpts::from((
+        &config,
+        &system_params_reader,
+        &storage_memory_config,
+    )));
     let object_store = Arc::new(
         parse_remote_object_store(
             state_store_url
@@ -108,10 +113,14 @@ pub async fn compactor_serve(
         storage_opts.meta_cache_capacity_mb * (1 << 20),
     ));
 
+    let telemetry_enabled = system_params_reader.telemetry_enabled();
+
     let filter_key_extractor_manager = Arc::new(FilterKeyExtractorManager::default());
     let system_params_manager = Arc::new(LocalSystemParamsManager::new(system_params_reader));
-    let compactor_observer_node =
-        CompactorObserverNode::new(filter_key_extractor_manager.clone(), system_params_manager);
+    let compactor_observer_node = CompactorObserverNode::new(
+        filter_key_extractor_manager.clone(),
+        system_params_manager.clone(),
+    );
     let observer_manager =
         ObserverManager::new_with_meta_client(meta_client.clone(), compactor_observer_node).await;
 
@@ -149,7 +158,7 @@ pub async fn compactor_serve(
             max_concurrent_task_number,
         })),
     });
-    let sub_tasks = vec![
+    let mut sub_tasks = vec![
         MetaClient::start_heartbeat_loop(
             meta_client.clone(),
             Duration::from_millis(config.server.heartbeat_interval_ms as u64),
@@ -162,6 +171,22 @@ pub async fn compactor_serve(
         ),
     ];
 
+    let telemetry_manager = TelemetryManager::new(
+        system_params_manager.watch_params(),
+        Arc::new(meta_client.clone()),
+        Arc::new(CompactorTelemetryCreator::new()),
+    );
+    // if the toml config file or env variable disables telemetry, do not watch system params change
+    // because if any of configs disable telemetry, we should never start it
+    if config.server.telemetry_enabled && telemetry_env_enabled() {
+        if telemetry_enabled {
+            telemetry_manager.start_telemetry_reporting();
+        }
+        sub_tasks.push(telemetry_manager.watch_params_change());
+    } else {
+        tracing::info!("Telemetry didn't start due to config");
+    }
+
     let (shutdown_send, mut shutdown_recv) = tokio::sync::oneshot::channel();
     let join_handle = tokio::spawn(async move {
         tonic::transport::Server::builder()
diff --git a/src/storage/compactor/src/telemetry.rs b/src/storage/compactor/src/telemetry.rs
new file mode 100644
index 0000000000000..a2014959c61de
--- /dev/null
+++ b/src/storage/compactor/src/telemetry.rs
@@ -0,0 +1,75 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 risingwave_common::telemetry::report::TelemetryReportCreator;
+use risingwave_common::telemetry::{
+    current_timestamp, SystemData, TelemetryNodeType, TelemetryReport, TelemetryReportBase,
+};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy)]
+pub(crate) struct CompactorTelemetryCreator {}
+
+impl CompactorTelemetryCreator {
+    pub(crate) fn new() -> Self {
+        Self {}
+    }
+}
+
+impl TelemetryReportCreator for CompactorTelemetryCreator {
+    fn create_report(
+        &self,
+        tracking_id: String,
+        session_id: String,
+        up_time: u64,
+    ) -> anyhow::Result<CompactorTelemetryReport> {
+        Ok(CompactorTelemetryReport::new(
+            tracking_id,
+            session_id,
+            up_time,
+        ))
+    }
+
+    fn report_type(&self) -> &str {
+        "compactor"
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+pub(crate) struct CompactorTelemetryReport {
+    #[serde(flatten)]
+    base: TelemetryReportBase,
+}
+
+impl TelemetryReport for CompactorTelemetryReport {
+    fn to_json(&self) -> anyhow::Result<String> {
+        let json = serde_json::to_string(self)?;
+        Ok(json)
+    }
+}
+
+impl CompactorTelemetryReport {
+    pub(crate) fn new(tracking_id: String, session_id: String, up_time: u64) -> Self {
+        Self {
+            base: TelemetryReportBase {
+                tracking_id,
+                session_id,
+                system_data: SystemData::new(),
+                up_time,
+                time_stamp: current_timestamp(),
+                node_type: TelemetryNodeType::Compactor,
+            },
+        }
+    }
+}
diff --git a/src/storage/hummock_sdk/src/compaction_group/hummock_version_ext.rs b/src/storage/hummock_sdk/src/compaction_group/hummock_version_ext.rs
index 9426925d3469e..46f06521e80fe 100644
--- a/src/storage/hummock_sdk/src/compaction_group/hummock_version_ext.rs
+++ b/src/storage/hummock_sdk/src/compaction_group/hummock_version_ext.rs
@@ -20,8 +20,8 @@ use risingwave_pb::hummock::group_delta::DeltaType;
 use risingwave_pb::hummock::hummock_version::Levels;
 use risingwave_pb::hummock::hummock_version_delta::GroupDeltas;
 use risingwave_pb::hummock::{
-    CompactionConfig, GroupConstruct, GroupDestroy, GroupMetaChange, HummockVersion,
-    HummockVersionDelta, Level, LevelType, OverlappingLevel, SstableInfo,
+    CompactionConfig, GroupConstruct, GroupDestroy, GroupMetaChange, GroupTableChange,
+    HummockVersion, HummockVersionDelta, Level, LevelType, OverlappingLevel, SstableInfo,
 };
 
 use super::StateTableId;
@@ -38,6 +38,7 @@ pub struct GroupDeltasSummary {
     pub group_construct: Option<GroupConstruct>,
     pub group_destroy: Option<GroupDestroy>,
     pub group_meta_changes: Vec<GroupMetaChange>,
+    pub group_table_change: Option<GroupTableChange>,
 }
 
 pub fn summarize_group_deltas(group_deltas: &GroupDeltas) -> GroupDeltasSummary {
@@ -49,6 +50,8 @@ pub fn summarize_group_deltas(group_deltas: &GroupDeltas) -> GroupDeltasSummary
     let mut group_construct = None;
     let mut group_destroy = None;
     let mut group_meta_changes = vec![];
+    let mut group_table_change = None;
+
     for group_delta in &group_deltas.group_deltas {
         match group_delta.get_delta_type().unwrap() {
             DeltaType::IntraLevel(intra_level) => {
@@ -73,6 +76,9 @@ pub fn summarize_group_deltas(group_deltas: &GroupDeltas) -> GroupDeltasSummary
             DeltaType::GroupMetaChange(meta_delta) => {
                 group_meta_changes.push(meta_delta.clone());
             }
+            DeltaType::GroupTableChange(meta_delta) => {
+                group_table_change = Some(meta_delta.clone());
+            }
         }
     }
 
@@ -85,6 +91,7 @@ pub fn summarize_group_deltas(group_deltas: &GroupDeltas) -> GroupDeltasSummary
         group_construct,
         group_destroy,
         group_meta_changes,
+        group_table_change,
     }
 }
 
@@ -106,25 +113,25 @@ pub trait HummockVersionExt {
     fn get_object_ids(&self) -> Vec<u64>;
 }
 
+pub type BranchedSstInfo = HashMap<CompactionGroupId, /* SST Id */ HummockSstableId>;
+
 pub trait HummockVersionUpdateExt {
     fn count_new_ssts_in_group_split(
-        &mut self,
+        &self,
         parent_group_id: CompactionGroupId,
-        member_table_ids: &HashSet<StateTableId>,
+        member_table_ids: HashSet<StateTableId>,
     ) -> u64;
     fn init_with_parent_group(
         &mut self,
         parent_group_id: CompactionGroupId,
         group_id: CompactionGroupId,
-        member_table_ids: &HashSet<StateTableId>,
+        member_table_ids: HashSet<StateTableId>,
         new_sst_start_id: u64,
     ) -> Vec<SstSplitInfo>;
     fn apply_version_delta(&mut self, version_delta: &HummockVersionDelta) -> Vec<SstSplitInfo>;
 
     fn build_compaction_group_info(&self) -> HashMap<TableId, CompactionGroupId>;
-    fn build_branched_sst_info(
-        &self,
-    ) -> BTreeMap<HummockSstableObjectId, BTreeMap<CompactionGroupId, Vec<HummockSstableId>>>;
+    fn build_branched_sst_info(&self) -> BTreeMap<HummockSstableObjectId, BranchedSstInfo>;
 }
 
 impl HummockVersionExt for HummockVersion {
@@ -206,9 +213,9 @@ pub type SstSplitInfo = (
 
 impl HummockVersionUpdateExt for HummockVersion {
     fn count_new_ssts_in_group_split(
-        &mut self,
+        &self,
         parent_group_id: CompactionGroupId,
-        member_table_ids: &HashSet<StateTableId>,
+        member_table_ids: HashSet<StateTableId>,
     ) -> u64 {
         self.levels
             .get(&parent_group_id)
@@ -246,7 +253,7 @@ impl HummockVersionUpdateExt for HummockVersion {
         &mut self,
         parent_group_id: CompactionGroupId,
         group_id: CompactionGroupId,
-        member_table_ids: &HashSet<StateTableId>,
+        member_table_ids: HashSet<StateTableId>,
         new_sst_start_id: u64,
     ) -> Vec<SstSplitInfo> {
         let mut new_sst_id = new_sst_start_id;
@@ -260,107 +267,69 @@ impl HummockVersionUpdateExt for HummockVersion {
             .levels
             .get_many_mut([&parent_group_id, &group_id])
             .unwrap();
-        let remove_sst_stat_from_level = |level: &mut Level, sst: &SstableInfo| {
-            level.total_file_size -= sst.file_size;
-            level.uncompressed_file_size -= sst.uncompressed_file_size;
-        };
         if let Some(ref mut l0) = parent_levels.l0 {
             for sub_level in &mut l0.sub_levels {
-                let mut insert_table_infos = vec![];
-                for sst_info in &mut sub_level.table_infos {
-                    if sst_info
-                        .get_table_ids()
-                        .iter()
-                        .any(|table_id| member_table_ids.contains(table_id))
-                    {
-                        let is_trivial = sst_info
-                            .get_table_ids()
-                            .iter()
-                            .all(|table_id| member_table_ids.contains(table_id));
-                        let mut branch_table_info = sst_info.clone();
-                        branch_table_info.sst_id = new_sst_id;
-                        new_sst_id += 1;
-                        let parent_old_sst_id = sst_info.get_sst_id();
-                        split_id_vers.push((
-                            branch_table_info.get_object_id(),
-                            branch_table_info.get_sst_id(),
-                            parent_old_sst_id,
-                            if is_trivial {
-                                None
-                            } else {
-                                sst_info.sst_id = new_sst_id;
-                                new_sst_id += 1;
-                                Some(sst_info.get_sst_id())
-                            },
-                        ));
-                        branch_table_info.table_ids = sst_info
-                            .table_ids
-                            .drain_filter(|table_id| member_table_ids.contains(table_id))
-                            .collect_vec();
-                        insert_table_infos.push(branch_table_info);
+                let target_l0 = cur_levels.l0.as_mut().unwrap();
+                let mut target_level_idx = target_l0.sub_levels.len();
+                for (idx, other) in target_l0.sub_levels.iter_mut().enumerate() {
+                    if other.sub_level_id == sub_level.sub_level_id {
+                        target_level_idx = idx;
                     }
                 }
                 // Remove SST from sub level may result in empty sub level. It will be purged
                 // whenever another compaction task is finished.
-                let removed = sub_level
+                let insert_table_infos = split_sst_info_for_level(
+                    sub_level,
+                    &mut split_id_vers,
+                    &member_table_ids,
+                    &mut new_sst_id,
+                );
+                sub_level
                     .table_infos
                     .drain_filter(|sst_info| sst_info.table_ids.is_empty())
-                    .collect_vec();
-                for removed_sst in removed {
-                    remove_sst_stat_from_level(sub_level, &removed_sst);
-                }
-                add_new_sub_level(
-                    cur_levels.l0.as_mut().unwrap(),
-                    sub_level.get_sub_level_id(),
+                    .for_each(|sst_info| {
+                        sub_level.total_file_size -= sst_info.file_size;
+                        sub_level.uncompressed_file_size -= sst_info.uncompressed_file_size;
+                        l0.total_file_size -= sst_info.file_size;
+                        l0.uncompressed_file_size -= sst_info.uncompressed_file_size;
+                    });
+                add_ssts_to_sub_level(
+                    target_l0,
+                    target_level_idx,
+                    sub_level.sub_level_id,
                     sub_level.level_type(),
                     insert_table_infos,
                 );
             }
         }
         for (z, level) in parent_levels.levels.iter_mut().enumerate() {
-            for sst_info in &mut level.table_infos {
-                if sst_info
-                    .get_table_ids()
-                    .iter()
-                    .any(|table_id| member_table_ids.contains(table_id))
-                {
-                    let is_trivial = sst_info
-                        .get_table_ids()
-                        .iter()
-                        .all(|table_id| member_table_ids.contains(table_id));
-                    let mut branch_table_info = sst_info.clone();
-                    branch_table_info.sst_id = new_sst_id;
-                    new_sst_id += 1;
-                    let parent_old_sst_id = sst_info.get_sst_id();
-                    split_id_vers.push((
-                        branch_table_info.get_object_id(),
-                        branch_table_info.get_sst_id(),
-                        parent_old_sst_id,
-                        if is_trivial {
-                            None
-                        } else {
-                            sst_info.sst_id = new_sst_id;
-                            new_sst_id += 1;
-                            Some(sst_info.get_sst_id())
-                        },
-                    ));
-                    branch_table_info.table_ids = sst_info
-                        .table_ids
-                        .drain_filter(|table_id| member_table_ids.contains(table_id))
-                        .collect_vec();
-                    cur_levels.levels[z].total_file_size += branch_table_info.file_size;
-                    cur_levels.levels[z].uncompressed_file_size +=
-                        branch_table_info.uncompressed_file_size;
-                    cur_levels.levels[z].table_infos.push(branch_table_info);
-                }
-            }
-            let removed = level
+            let insert_table_infos = split_sst_info_for_level(
+                level,
+                &mut split_id_vers,
+                &member_table_ids,
+                &mut new_sst_id,
+            );
+            cur_levels.levels[z].total_file_size += insert_table_infos
+                .iter()
+                .map(|sst| sst.file_size)
+                .sum::<u64>();
+            cur_levels.levels[z].uncompressed_file_size += insert_table_infos
+                .iter()
+                .map(|sst| sst.uncompressed_file_size)
+                .sum::<u64>();
+            cur_levels.levels[z].table_infos.extend(insert_table_infos);
+            cur_levels.levels[z].table_infos.sort_by(|sst1, sst2| {
+                let a = sst1.key_range.as_ref().unwrap();
+                let b = sst2.key_range.as_ref().unwrap();
+                a.compare(b)
+            });
+            level
                 .table_infos
                 .drain_filter(|sst_info| sst_info.table_ids.is_empty())
-                .collect_vec();
-            for removed_sst in removed {
-                remove_sst_stat_from_level(level, &removed_sst);
-            }
+                .for_each(|sst_info| {
+                    level.total_file_size -= sst_info.file_size;
+                    level.uncompressed_file_size -= sst_info.uncompressed_file_size;
+                });
         }
         split_id_vers
     }
@@ -381,9 +350,24 @@ impl HummockVersionUpdateExt for HummockVersion {
                 sst_split_info.extend(self.init_with_parent_group(
                     parent_group_id,
                     *compaction_group_id,
-                    &HashSet::from_iter(group_construct.get_table_ids().iter().cloned()),
+                    HashSet::from_iter(group_construct.table_ids.clone()),
                     group_construct.get_new_sst_start_id(),
                 ));
+            } else if let Some(group_change) = &summary.group_table_change {
+                sst_split_info.extend(self.init_with_parent_group(
+                    group_change.origin_group_id,
+                    group_change.target_group_id,
+                    HashSet::from_iter(group_change.table_ids.clone()),
+                    group_change.new_sst_start_id,
+                ));
+
+                let levels = self
+                    .levels
+                    .get_mut(&group_change.origin_group_id)
+                    .expect("compaction group should exist");
+                levels
+                    .member_table_ids
+                    .drain_filter(|t| group_change.table_ids.contains(t));
             }
             let has_destroy = summary.group_destroy.is_some();
             let levels = self
@@ -398,6 +382,7 @@ impl HummockVersionUpdateExt for HummockVersion {
                 levels
                     .member_table_ids
                     .drain_filter(|t| group_meta_delta.table_ids_remove.contains(t));
+                levels.member_table_ids.sort();
             }
 
             assert!(
@@ -456,29 +441,26 @@ impl HummockVersionUpdateExt for HummockVersion {
         ret
     }
 
-    fn build_branched_sst_info(
-        &self,
-    ) -> BTreeMap<HummockSstableObjectId, BTreeMap<CompactionGroupId, Vec<HummockSstableId>>> {
-        let mut ret: BTreeMap<_, BTreeMap<_, Vec<_>>> = BTreeMap::new();
-        for compaction_group_id in self.get_levels().keys() {
-            self.level_iter(*compaction_group_id, |level| {
-                for table_info in level.get_table_infos() {
+    fn build_branched_sst_info(&self) -> BTreeMap<HummockSstableObjectId, BranchedSstInfo> {
+        let mut ret: BTreeMap<_, _> = BTreeMap::new();
+        for (compaction_group_id, group) in &self.levels {
+            let mut levels = vec![];
+            levels.extend(group.l0.as_ref().unwrap().sub_levels.iter());
+            levels.extend(group.levels.iter());
+            for level in levels {
+                for table_info in &level.table_infos {
+                    if table_info.sst_id == table_info.object_id {
+                        continue;
+                    }
                     let object_id = table_info.get_object_id();
-                    ret.entry(object_id)
-                        .or_default()
-                        .entry(*compaction_group_id)
-                        .or_default()
-                        .push(table_info.get_sst_id());
+                    let entry: &mut BranchedSstInfo = ret.entry(object_id).or_default();
+                    if let Some(exist_sst_id) = entry.get(compaction_group_id) {
+                        panic!("we do not allow more than one sst with the same object id in one grou. object-id: {}, duplicated sst id: {:?} and {}", object_id, exist_sst_id, table_info.sst_id);
+                    }
+                    entry.insert(*compaction_group_id, table_info.sst_id);
                 }
-                true
-            });
-        }
-        ret.retain(|object_id, v| {
-            v.len() != 1 || {
-                let sst_id_vec = v.values().next().unwrap();
-                sst_id_vec.len() != 1 || sst_id_vec[0] != *object_id
             }
-        });
+        }
         ret
     }
 }
@@ -604,6 +586,51 @@ pub fn build_initial_compaction_group_levels(
     }
 }
 
+fn split_sst_info_for_level(
+    level: &mut Level,
+    split_id_vers: &mut Vec<SstSplitInfo>,
+    member_table_ids: &HashSet<u32>,
+    new_sst_id: &mut u64,
+) -> Vec<SstableInfo> {
+    // Remove SST from sub level may result in empty sub level. It will be purged
+    // whenever another compaction task is finished.
+    let mut removed = vec![];
+    let mut insert_table_infos = vec![];
+    for sst_info in &mut level.table_infos {
+        let removed_table_ids = sst_info
+            .table_ids
+            .iter()
+            .filter(|table_id| member_table_ids.contains(table_id))
+            .cloned()
+            .collect_vec();
+        if !removed_table_ids.is_empty() {
+            let is_trivial = removed_table_ids.len() == sst_info.table_ids.len();
+            let mut branch_table_info = sst_info.clone();
+            branch_table_info.sst_id = *new_sst_id;
+            *new_sst_id += 1;
+            let parent_old_sst_id = sst_info.get_sst_id();
+            split_id_vers.push((
+                branch_table_info.get_object_id(),
+                branch_table_info.get_sst_id(),
+                parent_old_sst_id,
+                if is_trivial {
+                    None
+                } else {
+                    sst_info.sst_id = *new_sst_id;
+                    *new_sst_id += 1;
+                    Some(sst_info.get_sst_id())
+                },
+            ));
+            if is_trivial {
+                sst_info.table_ids.clear();
+                removed.push(sst_info.clone());
+            }
+            insert_table_infos.push(branch_table_info);
+        }
+    }
+    insert_table_infos
+}
+
 pub fn try_get_compaction_group_id_by_table_id(
     version: &HummockVersion,
     table_id: StateTableId,
@@ -680,6 +707,37 @@ pub fn new_sub_level(
     }
 }
 
+pub fn add_ssts_to_sub_level(
+    l0: &mut OverlappingLevel,
+    sub_level_idx: usize,
+    insert_sub_level_id: u64,
+    level_type: LevelType,
+    insert_table_infos: Vec<SstableInfo>,
+) {
+    if sub_level_idx < l0.sub_levels.len() {
+        insert_table_infos.iter().for_each(|sst| {
+            l0.sub_levels[sub_level_idx].total_file_size += sst.file_size;
+            l0.sub_levels[sub_level_idx].uncompressed_file_size += sst.uncompressed_file_size;
+            l0.total_file_size += sst.file_size;
+            l0.uncompressed_file_size += sst.uncompressed_file_size;
+        });
+        l0.sub_levels[sub_level_idx]
+            .table_infos
+            .extend(insert_table_infos);
+        if l0.sub_levels[sub_level_idx].level_type == LevelType::Nonoverlapping as i32 {
+            l0.sub_levels[sub_level_idx]
+                .table_infos
+                .sort_by(|sst1, sst2| {
+                    let a = sst1.key_range.as_ref().unwrap();
+                    let b = sst2.key_range.as_ref().unwrap();
+                    a.compare(b)
+                });
+        }
+        return;
+    }
+    add_new_sub_level(l0, insert_sub_level_id, level_type, insert_table_infos);
+}
+
 pub fn add_new_sub_level(
     l0: &mut OverlappingLevel,
     insert_sub_level_id: u64,
diff --git a/src/storage/hummock_sdk/src/filter_key_extractor.rs b/src/storage/hummock_sdk/src/filter_key_extractor.rs
index 15527fc48e6d9..e3e81e681beaa 100644
--- a/src/storage/hummock_sdk/src/filter_key_extractor.rs
+++ b/src/storage/hummock_sdk/src/filter_key_extractor.rs
@@ -338,7 +338,7 @@ mod tests {
 
     use bytes::{BufMut, BytesMut};
     use itertools::Itertools;
-    use risingwave_common::catalog::{ColumnDesc, ColumnId};
+    use risingwave_common::catalog::ColumnDesc;
     use risingwave_common::constants::hummock::PROPERTIES_RETENTION_SECOND_KEY;
     use risingwave_common::hash::VirtualNode;
     use risingwave_common::row::OwnedRow;
@@ -347,9 +347,9 @@ mod tests {
     use risingwave_common::util::ordered::OrderedRowSerde;
     use risingwave_common::util::sort_util::OrderType;
     use risingwave_pb::catalog::table::TableType;
-    use risingwave_pb::catalog::Table as ProstTable;
-    use risingwave_pb::common::{PbColumnOrder, PbDirection, PbOrderType};
-    use risingwave_pb::plan_common::ColumnCatalog as ProstColumnCatalog;
+    use risingwave_pb::catalog::PbTable;
+    use risingwave_pb::common::{PbColumnOrder, PbDirection, PbNullsAre, PbOrderType};
+    use risingwave_pb::plan_common::PbColumnCatalog;
     use tokio::task;
 
     use super::{DummyFilterKeyExtractor, FilterKeyExtractor, SchemaFilterKeyExtractor};
@@ -377,63 +377,35 @@ mod tests {
         assert_eq!(full_key, output_key);
     }
 
-    fn build_table_with_prefix_column_num(column_count: u32) -> ProstTable {
-        ProstTable {
+    fn build_table_with_prefix_column_num(column_count: u32) -> PbTable {
+        PbTable {
             id: 0,
             schema_id: 0,
             database_id: 0,
             name: "test".to_string(),
             table_type: TableType::Table as i32,
             columns: vec![
-                ProstColumnCatalog {
+                PbColumnCatalog {
                     column_desc: Some(
-                        (&ColumnDesc {
-                            data_type: DataType::Int64,
-                            column_id: ColumnId::new(0),
-                            name: "_row_id".to_string(),
-                            field_descs: vec![],
-                            type_name: "".to_string(),
-                        })
-                            .into(),
+                        (&ColumnDesc::new_atomic(DataType::Int64, "_row_id", 0)).into(),
                     ),
                     is_hidden: true,
                 },
-                ProstColumnCatalog {
+                PbColumnCatalog {
                     column_desc: Some(
-                        (&ColumnDesc {
-                            data_type: DataType::Int64,
-                            column_id: ColumnId::new(0),
-                            name: "col_1".to_string(),
-                            field_descs: vec![],
-                            type_name: "Int64".to_string(),
-                        })
-                            .into(),
+                        (&ColumnDesc::new_atomic(DataType::Int64, "col_1", 0)).into(),
                     ),
                     is_hidden: false,
                 },
-                ProstColumnCatalog {
+                PbColumnCatalog {
                     column_desc: Some(
-                        (&ColumnDesc {
-                            data_type: DataType::Float64,
-                            column_id: ColumnId::new(0),
-                            name: "col_2".to_string(),
-                            field_descs: vec![],
-                            type_name: "Float64".to_string(),
-                        })
-                            .into(),
+                        (&ColumnDesc::new_atomic(DataType::Float64, "col_2", 0)).into(),
                     ),
                     is_hidden: false,
                 },
-                ProstColumnCatalog {
+                PbColumnCatalog {
                     column_desc: Some(
-                        (&ColumnDesc {
-                            data_type: DataType::Varchar,
-                            column_id: ColumnId::new(0),
-                            name: "col_3".to_string(),
-                            field_descs: vec![],
-                            type_name: "Varchar".to_string(),
-                        })
-                            .into(),
+                        (&ColumnDesc::new_atomic(DataType::Varchar, "col_3", 0)).into(),
                     ),
                     is_hidden: false,
                 },
@@ -443,12 +415,14 @@ mod tests {
                     column_index: 1,
                     order_type: Some(PbOrderType {
                         direction: PbDirection::Ascending as _,
+                        nulls_are: PbNullsAre::Largest as _,
                     }),
                 },
                 PbColumnOrder {
                     column_index: 3,
                     order_type: Some(PbOrderType {
                         direction: PbDirection::Ascending as _,
+                        nulls_are: PbNullsAre::Largest as _,
                     }),
                 },
             ],
diff --git a/src/storage/hummock_sdk/src/key.rs b/src/storage/hummock_sdk/src/key.rs
index 41086f90222bf..a2dee8ea7940a 100644
--- a/src/storage/hummock_sdk/src/key.rs
+++ b/src/storage/hummock_sdk/src/key.rs
@@ -372,9 +372,7 @@ pub struct TableKey<T: AsRef<[u8]>>(pub T);
 
 impl<T: AsRef<[u8]>> Debug for TableKey<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("TableKey")
-            .field("table_key", &self.0.as_ref().to_vec())
-            .finish()
+        write!(f, "TableKey {{ {} }}", hex::encode(self.0.as_ref()))
     }
 }
 
@@ -408,7 +406,7 @@ pub fn map_table_key_range(range: (Bound<KeyPayloadType>, Bound<KeyPayloadType>)
 /// will group these two values into one struct for convenient filtering.
 ///
 /// The encoded format is | `table_id` | `table_key` |.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
 pub struct UserKey<T: AsRef<[u8]>> {
     // When comparing `UserKey`, we first compare `table_id`, then `table_key`. So the order of
     // declaration matters.
@@ -416,6 +414,16 @@ pub struct UserKey<T: AsRef<[u8]>> {
     pub table_key: TableKey<T>,
 }
 
+impl<T: AsRef<[u8]>> Debug for UserKey<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "UserKey {{ {}, {:?} }}",
+            self.table_id.table_id, self.table_key
+        )
+    }
+}
+
 impl<T: AsRef<[u8]>> UserKey<T> {
     pub fn new(table_id: TableId, table_key: TableKey<T>) -> Self {
         Self {
@@ -547,12 +555,18 @@ impl UserKey<Vec<u8>> {
 /// [`FullKey`] is an internal concept in storage. It associates [`UserKey`] with an epoch.
 ///
 /// The encoded format is | `user_key` | `epoch` |.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Default)]
 pub struct FullKey<T: AsRef<[u8]>> {
     pub user_key: UserKey<T>,
     pub epoch: HummockEpoch,
 }
 
+impl<T: AsRef<[u8]>> Debug for FullKey<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "FullKey {{ {:?}, {} }}", self.user_key, self.epoch)
+    }
+}
+
 impl<T: AsRef<[u8]>> FullKey<T> {
     pub fn new(table_id: TableId, table_key: TableKey<T>, epoch: HummockEpoch) -> Self {
         Self {
diff --git a/src/storage/hummock_sdk/src/lib.rs b/src/storage/hummock_sdk/src/lib.rs
index 6db409280e401..4a6bc7012a5b1 100644
--- a/src/storage/hummock_sdk/src/lib.rs
+++ b/src/storage/hummock_sdk/src/lib.rs
@@ -32,7 +32,7 @@ use risingwave_pb::hummock::SstableInfo;
 
 use crate::compaction_group::StaticCompactionGroupId;
 use crate::key_range::KeyRangeCommon;
-use crate::table_stats::{to_prost_table_stats_map, ProstTableStatsMap, TableStatsMap};
+use crate::table_stats::{to_prost_table_stats_map, PbTableStatsMap, TableStatsMap};
 
 pub mod compact;
 pub mod compaction_group;
@@ -52,6 +52,8 @@ pub type HummockCompactionTaskId = u64;
 pub type CompactionGroupId = u64;
 pub const INVALID_VERSION_ID: HummockVersionId = 0;
 pub const FIRST_VERSION_ID: HummockVersionId = 1;
+pub const SPLIT_TABLE_COMPACTION_GROUP_ID_HEAD: u64 = 1u64 << 56;
+pub const SINGLE_TABLE_COMPACTION_GROUP_ID_HEAD: u64 = 2u64 << 56;
 
 #[macro_export]
 /// This is wrapper for `info` log.
@@ -131,14 +133,14 @@ impl LocalSstableInfo {
 pub struct ExtendedSstableInfo {
     pub compaction_group_id: CompactionGroupId,
     pub sst_info: SstableInfo,
-    pub table_stats: ProstTableStatsMap,
+    pub table_stats: PbTableStatsMap,
 }
 
 impl ExtendedSstableInfo {
     pub fn new(
         compaction_group_id: CompactionGroupId,
         sst_info: SstableInfo,
-        table_stats: ProstTableStatsMap,
+        table_stats: PbTableStatsMap,
     ) -> Self {
         Self {
             compaction_group_id,
@@ -151,7 +153,7 @@ impl ExtendedSstableInfo {
         compaction_group_id: CompactionGroupId,
         sst_info: SstableInfo,
     ) -> Self {
-        Self::new(compaction_group_id, sst_info, ProstTableStatsMap::default())
+        Self::new(compaction_group_id, sst_info, PbTableStatsMap::default())
     }
 }
 
diff --git a/src/storage/hummock_sdk/src/table_stats.rs b/src/storage/hummock_sdk/src/table_stats.rs
index 19732e30cba13..02da4999bebc3 100644
--- a/src/storage/hummock_sdk/src/table_stats.rs
+++ b/src/storage/hummock_sdk/src/table_stats.rs
@@ -15,13 +15,13 @@
 use std::borrow::Borrow;
 use std::collections::{HashMap, HashSet};
 
-use risingwave_pb::hummock::{HummockVersion, TableStats as ProstTableStats};
+use risingwave_pb::hummock::{HummockVersion, PbTableStats};
 
 use crate::compaction_group::hummock_version_ext::HummockVersionExt;
 
 pub type TableStatsMap = HashMap<u32, TableStats>;
 
-pub type ProstTableStatsMap = HashMap<u32, ProstTableStats>;
+pub type PbTableStatsMap = HashMap<u32, PbTableStats>;
 
 #[derive(Default, Debug, Clone)]
 pub struct TableStats {
@@ -30,7 +30,7 @@ pub struct TableStats {
     pub total_key_count: i64,
 }
 
-impl From<&TableStats> for ProstTableStats {
+impl From<&TableStats> for PbTableStats {
     fn from(value: &TableStats) -> Self {
         Self {
             total_key_size: value.total_key_size,
@@ -40,14 +40,14 @@ impl From<&TableStats> for ProstTableStats {
     }
 }
 
-impl From<TableStats> for ProstTableStats {
+impl From<TableStats> for PbTableStats {
     fn from(value: TableStats) -> Self {
         (&value).into()
     }
 }
 
-impl From<&ProstTableStats> for TableStats {
-    fn from(value: &ProstTableStats) -> Self {
+impl From<&PbTableStats> for TableStats {
+    fn from(value: &PbTableStats) -> Self {
         Self {
             total_key_size: value.total_key_size,
             total_value_size: value.total_value_size,
@@ -64,13 +64,13 @@ impl TableStats {
     }
 }
 
-pub fn add_prost_table_stats(this: &mut ProstTableStats, other: &ProstTableStats) {
+pub fn add_prost_table_stats(this: &mut PbTableStats, other: &PbTableStats) {
     this.total_key_size += other.total_key_size;
     this.total_value_size += other.total_value_size;
     this.total_key_count += other.total_key_count;
 }
 
-pub fn add_prost_table_stats_map(this: &mut ProstTableStatsMap, other: &ProstTableStatsMap) {
+pub fn add_prost_table_stats_map(this: &mut PbTableStatsMap, other: &PbTableStatsMap) {
     for (table_id, stats) in other {
         add_prost_table_stats(this.entry(*table_id).or_default(), stats);
     }
@@ -84,7 +84,7 @@ pub fn add_table_stats_map(this: &mut TableStatsMap, other: &TableStatsMap) {
 
 pub fn to_prost_table_stats_map(
     table_stats: impl Borrow<TableStatsMap>,
-) -> HashMap<u32, ProstTableStats> {
+) -> HashMap<u32, PbTableStats> {
     table_stats
         .borrow()
         .iter()
@@ -93,7 +93,7 @@ pub fn to_prost_table_stats_map(
 }
 
 pub fn from_prost_table_stats_map(
-    table_stats: impl Borrow<HashMap<u32, ProstTableStats>>,
+    table_stats: impl Borrow<HashMap<u32, PbTableStats>>,
 ) -> HashMap<u32, TableStats> {
     table_stats
         .borrow()
@@ -103,7 +103,7 @@ pub fn from_prost_table_stats_map(
 }
 
 pub fn purge_prost_table_stats(
-    table_stats: &mut ProstTableStatsMap,
+    table_stats: &mut PbTableStatsMap,
     hummock_version: &HummockVersion,
 ) {
     let mut all_tables_in_version: HashSet<u32> = HashSet::default();
diff --git a/src/storage/hummock_test/benches/bench_hummock_iter.rs b/src/storage/hummock_test/benches/bench_hummock_iter.rs
index 5240c6f7b0771..80b2672079a50 100644
--- a/src/storage/hummock_test/benches/bench_hummock_iter.rs
+++ b/src/storage/hummock_test/benches/bench_hummock_iter.rs
@@ -18,13 +18,14 @@ use std::sync::Arc;
 use bytes::Bytes;
 use criterion::{criterion_group, criterion_main, Criterion};
 use futures::{pin_mut, TryStreamExt};
+use risingwave_common::cache::CachePriority;
 use risingwave_hummock_test::get_notification_client_for_test;
 use risingwave_hummock_test::test_utils::TestIngestBatch;
 use risingwave_meta::hummock::test_utils::setup_compute_env;
 use risingwave_meta::hummock::MockHummockMetaClient;
 use risingwave_storage::hummock::iterator::test_utils::mock_sstable_store;
 use risingwave_storage::hummock::test_utils::default_opts_for_test;
-use risingwave_storage::hummock::HummockStorage;
+use risingwave_storage::hummock::{CachePolicy, HummockStorage};
 use risingwave_storage::storage_value::StorageValue;
 use risingwave_storage::store::*;
 use risingwave_storage::StateStore;
@@ -106,6 +107,7 @@ fn criterion_benchmark(c: &mut Criterion) {
                         table_id: Default::default(),
                         read_version_from_backup: false,
                         prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 ))
                 .unwrap();
diff --git a/src/storage/hummock_test/src/compactor_tests.rs b/src/storage/hummock_test/src/compactor_tests.rs
index 7ee1b780e75fc..076d6622ca28e 100644
--- a/src/storage/hummock_test/src/compactor_tests.rs
+++ b/src/storage/hummock_test/src/compactor_tests.rs
@@ -22,6 +22,7 @@ pub(crate) mod tests {
     use bytes::Bytes;
     use itertools::Itertools;
     use rand::Rng;
+    use risingwave_common::cache::CachePriority;
     use risingwave_common::catalog::TableId;
     use risingwave_common::constants::hummock::CompactionFilterFlag;
     use risingwave_common::util::epoch::Epoch;
@@ -47,7 +48,7 @@ pub(crate) mod tests {
     use risingwave_storage::hummock::iterator::test_utils::mock_sstable_store;
     use risingwave_storage::hummock::sstable_store::SstableStoreRef;
     use risingwave_storage::hummock::{
-        HummockStorage as GlobalHummockStorage, HummockStorage, MemoryLimiter,
+        CachePolicy, HummockStorage as GlobalHummockStorage, HummockStorage, MemoryLimiter,
         SstableObjectIdManager,
     };
     use risingwave_storage::monitor::{CompactorMetrics, StoreLocalStatistic};
@@ -254,7 +255,7 @@ pub(crate) mod tests {
         val.extend_from_slice(&compact_task.watermark.to_be_bytes());
 
         let compactor_manager = hummock_manager_ref.compactor_manager_ref_for_test();
-        compactor_manager.add_compactor(worker_node.id, u64::MAX);
+        compactor_manager.add_compactor(worker_node.id, u64::MAX, 16);
         let compactor = hummock_manager_ref.get_idle_compactor().await.unwrap();
         hummock_manager_ref
             .assign_compaction_task(&compact_task, compactor.context_id())
@@ -305,6 +306,7 @@ pub(crate) mod tests {
                     retention_seconds: None,
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -324,6 +326,7 @@ pub(crate) mod tests {
                     retention_seconds: None,
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await;
@@ -379,7 +382,7 @@ pub(crate) mod tests {
         compact_task.current_epoch_time = 0;
 
         let compactor_manager = hummock_manager_ref.compactor_manager_ref_for_test();
-        compactor_manager.add_compactor(worker_node.id, u64::MAX);
+        compactor_manager.add_compactor(worker_node.id, u64::MAX, 16);
         let compactor = hummock_manager_ref.get_idle_compactor().await.unwrap();
         hummock_manager_ref
             .assign_compaction_task(&compact_task, compactor.context_id())
@@ -440,6 +443,7 @@ pub(crate) mod tests {
                     retention_seconds: None,
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -729,13 +733,12 @@ pub(crate) mod tests {
             .await
             .unwrap()
             .unwrap();
-        compact_task.existing_table_ids.push(2);
         let compaction_filter_flag = CompactionFilterFlag::STATE_CLEAN | CompactionFilterFlag::TTL;
         compact_task.compaction_filter_mask = compaction_filter_flag.bits();
 
         // 3. pick compactor and assign
         let compactor_manager = hummock_manager_ref.compactor_manager_ref_for_test();
-        compactor_manager.add_compactor(worker_node.id, u64::MAX);
+        compactor_manager.add_compactor(worker_node.id, u64::MAX, 16);
         let compactor = hummock_manager_ref.get_idle_compactor().await.unwrap();
         hummock_manager_ref
             .assign_compaction_task(&compact_task, compactor.context_id())
@@ -806,6 +809,7 @@ pub(crate) mod tests {
                     retention_seconds: None,
                     read_version_from_backup: false,
                     prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -903,7 +907,6 @@ pub(crate) mod tests {
             .unwrap()
             .unwrap();
 
-        compact_task.existing_table_ids.push(existing_table_id);
         let compaction_filter_flag = CompactionFilterFlag::STATE_CLEAN | CompactionFilterFlag::TTL;
         compact_task.compaction_filter_mask = compaction_filter_flag.bits();
         let retention_seconds_expire_second = 1;
@@ -916,7 +919,7 @@ pub(crate) mod tests {
         compact_task.current_epoch_time = epoch;
 
         let compactor_manager = hummock_manager_ref.compactor_manager_ref_for_test();
-        compactor_manager.add_compactor(worker_node.id, u64::MAX);
+        compactor_manager.add_compactor(worker_node.id, u64::MAX, 16);
         let compactor = hummock_manager_ref.get_idle_compactor().await.unwrap();
         hummock_manager_ref
             .assign_compaction_task(&compact_task, compactor.context_id())
@@ -988,6 +991,7 @@ pub(crate) mod tests {
                     retention_seconds: None,
                     read_version_from_backup: false,
                     prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -1092,7 +1096,6 @@ pub(crate) mod tests {
             kv_count,
         );
 
-        compact_task.existing_table_ids.push(existing_table_id);
         let compaction_filter_flag = CompactionFilterFlag::STATE_CLEAN | CompactionFilterFlag::TTL;
         compact_task.compaction_filter_mask = compaction_filter_flag.bits();
         // compact_task.table_options =
@@ -1100,7 +1103,7 @@ pub(crate) mod tests {
         compact_task.current_epoch_time = epoch;
 
         let compactor_manager = hummock_manager_ref.compactor_manager_ref_for_test();
-        compactor_manager.add_compactor(worker_node.id, u64::MAX);
+        compactor_manager.add_compactor(worker_node.id, u64::MAX, 16);
         let compactor = hummock_manager_ref.get_idle_compactor().await.unwrap();
         hummock_manager_ref
             .assign_compaction_task(&compact_task, compactor.context_id())
@@ -1172,6 +1175,7 @@ pub(crate) mod tests {
                     retention_seconds: None,
                     read_version_from_backup: false,
                     prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -1224,7 +1228,7 @@ pub(crate) mod tests {
 
         flush_and_commit(&hummock_meta_client, &storage, 130).await;
         let compactor_manager = hummock_manager_ref.compactor_manager_ref_for_test();
-        compactor_manager.add_compactor(worker_node.id, u64::MAX);
+        compactor_manager.add_compactor(worker_node.id, u64::MAX, 16);
 
         // 2. get compact task
         let manual_compcation_option = ManualCompactionOption {
diff --git a/src/storage/hummock_test/src/failpoint_tests.rs b/src/storage/hummock_test/src/failpoint_tests.rs
index 69914073166cd..edd80efec11f5 100644
--- a/src/storage/hummock_test/src/failpoint_tests.rs
+++ b/src/storage/hummock_test/src/failpoint_tests.rs
@@ -16,6 +16,7 @@ use std::ops::Bound;
 use std::sync::Arc;
 
 use bytes::{BufMut, Bytes};
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::TableId;
 use risingwave_hummock_sdk::key::TABLE_PREFIX_LEN;
 use risingwave_hummock_sdk::HummockReadEpoch;
@@ -24,7 +25,7 @@ use risingwave_meta::hummock::MockHummockMetaClient;
 use risingwave_rpc_client::HummockMetaClient;
 use risingwave_storage::hummock::iterator::test_utils::mock_sstable_store;
 use risingwave_storage::hummock::test_utils::{count_stream, default_opts_for_test};
-use risingwave_storage::hummock::HummockStorage;
+use risingwave_storage::hummock::{CachePolicy, HummockStorage};
 use risingwave_storage::storage_value::StorageValue;
 use risingwave_storage::store::{
     LocalStateStore, NewLocalOptions, PrefetchOptions, ReadOptions, StateStoreRead, WriteOptions,
@@ -106,6 +107,7 @@ async fn test_failpoints_state_store_read_upload() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -160,6 +162,7 @@ async fn test_failpoints_state_store_read_upload() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await;
@@ -175,6 +178,7 @@ async fn test_failpoints_state_store_read_upload() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await;
@@ -197,6 +201,7 @@ async fn test_failpoints_state_store_read_upload() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -238,6 +243,7 @@ async fn test_failpoints_state_store_read_upload() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -255,6 +261,7 @@ async fn test_failpoints_state_store_read_upload() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
diff --git a/src/storage/hummock_test/src/hummock_storage_tests.rs b/src/storage/hummock_test/src/hummock_storage_tests.rs
index e76e9e3a10bda..17d1101dccf24 100644
--- a/src/storage/hummock_test/src/hummock_storage_tests.rs
+++ b/src/storage/hummock_test/src/hummock_storage_tests.rs
@@ -18,10 +18,12 @@ use std::sync::Arc;
 use bytes::{BufMut, Bytes};
 use futures::TryStreamExt;
 use parking_lot::RwLock;
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::TableId;
 use risingwave_hummock_sdk::key::{map_table_key_range, FullKey, UserKey, TABLE_PREFIX_LEN};
 use risingwave_rpc_client::HummockMetaClient;
 use risingwave_storage::hummock::store::version::{read_filter_for_batch, read_filter_for_local};
+use risingwave_storage::hummock::CachePolicy;
 use risingwave_storage::storage_value::StorageValue;
 use risingwave_storage::store::*;
 use risingwave_storage::StateStore;
@@ -97,6 +99,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -116,6 +119,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -137,6 +141,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -171,6 +176,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -207,6 +213,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -227,6 +234,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -247,6 +255,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -282,6 +291,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -303,6 +313,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -323,6 +334,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -365,6 +377,7 @@ async fn test_storage_basic() {
                 prefix_hint: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -511,6 +524,7 @@ async fn test_state_store_sync() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -557,6 +571,7 @@ async fn test_state_store_sync() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -581,6 +596,7 @@ async fn test_state_store_sync() {
                     prefix_hint: None,
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -623,6 +639,7 @@ async fn test_state_store_sync() {
                     prefix_hint: None,
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -726,6 +743,7 @@ async fn test_delete_get() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             }
         )
         .await
@@ -815,6 +833,7 @@ async fn test_multiple_epoch_sync() {
                             prefix_hint: None,
                             read_version_from_backup: false,
                             prefetch_options: Default::default(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         },
                     )
                     .await
@@ -834,6 +853,7 @@ async fn test_multiple_epoch_sync() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -852,6 +872,7 @@ async fn test_multiple_epoch_sync() {
                             prefix_hint: None,
                             read_version_from_backup: false,
                             prefetch_options: Default::default(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         },
                     )
                     .await
@@ -960,6 +981,7 @@ async fn test_iter_with_min_epoch() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -984,6 +1006,7 @@ async fn test_iter_with_min_epoch() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1006,6 +1029,7 @@ async fn test_iter_with_min_epoch() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1048,6 +1072,7 @@ async fn test_iter_with_min_epoch() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1072,6 +1097,7 @@ async fn test_iter_with_min_epoch() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1096,6 +1122,7 @@ async fn test_iter_with_min_epoch() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1219,6 +1246,7 @@ async fn test_hummock_version_reader() {
                             prefix_hint: None,
                             read_version_from_backup: false,
                             prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         },
                         read_snapshot,
                     )
@@ -1249,6 +1277,7 @@ async fn test_hummock_version_reader() {
                             prefix_hint: None,
                             read_version_from_backup: false,
                             prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         },
                         read_snapshot,
                     )
@@ -1279,6 +1308,7 @@ async fn test_hummock_version_reader() {
                             prefix_hint: None,
                             read_version_from_backup: false,
                             prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         },
                         read_snapshot,
                     )
@@ -1351,6 +1381,7 @@ async fn test_hummock_version_reader() {
                             prefix_hint: None,
                             read_version_from_backup: false,
                             prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         },
                         read_snapshot,
                     )
@@ -1390,6 +1421,7 @@ async fn test_hummock_version_reader() {
                             prefix_hint: None,
                             read_version_from_backup: false,
                             prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         },
                         read_snapshot,
                     )
@@ -1429,6 +1461,7 @@ async fn test_hummock_version_reader() {
                             prefix_hint: None,
                             read_version_from_backup: false,
                             prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         },
                         read_snapshot,
                     )
@@ -1468,6 +1501,7 @@ async fn test_hummock_version_reader() {
                             prefix_hint: None,
                             read_version_from_backup: false,
                             prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         },
                         read_snapshot,
                     )
@@ -1513,6 +1547,7 @@ async fn test_hummock_version_reader() {
                                 prefix_hint: None,
                                 read_version_from_backup: false,
                                 prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                                cache_policy: CachePolicy::Fill(CachePriority::High),
                             },
                             read_snapshot,
                         )
@@ -1552,6 +1587,7 @@ async fn test_hummock_version_reader() {
                                 prefix_hint: None,
                                 read_version_from_backup: false,
                                 prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                                cache_policy: CachePolicy::Fill(CachePriority::High),
                             },
                             read_snapshot,
                         )
@@ -1653,6 +1689,7 @@ async fn test_get_with_min_epoch() {
                         prefix_hint: None,
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1673,6 +1710,7 @@ async fn test_get_with_min_epoch() {
                         prefix_hint: Some(Bytes::from(prefix_hint.clone())),
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1693,6 +1731,7 @@ async fn test_get_with_min_epoch() {
                         prefix_hint: Some(Bytes::from(prefix_hint.clone())),
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1713,6 +1752,7 @@ async fn test_get_with_min_epoch() {
                         prefix_hint: Some(Bytes::from(prefix_hint.clone())),
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1759,6 +1799,7 @@ async fn test_get_with_min_epoch() {
                     prefix_hint: None,
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -1780,6 +1821,7 @@ async fn test_get_with_min_epoch() {
                     prefix_hint: Some(Bytes::from(prefix_hint.clone())),
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -1803,6 +1845,7 @@ async fn test_get_with_min_epoch() {
                     prefix_hint: Some(Bytes::from(prefix_hint.clone())),
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -1825,6 +1868,7 @@ async fn test_get_with_min_epoch() {
                     prefix_hint: Some(Bytes::from(prefix_hint.clone())),
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
diff --git a/src/storage/hummock_test/src/snapshot_tests.rs b/src/storage/hummock_test/src/snapshot_tests.rs
index 51d9527c5541f..a345ec3e0f1ea 100644
--- a/src/storage/hummock_test/src/snapshot_tests.rs
+++ b/src/storage/hummock_test/src/snapshot_tests.rs
@@ -17,9 +17,11 @@ use std::sync::Arc;
 
 use bytes::Bytes;
 use futures::TryStreamExt;
+use risingwave_common::cache::CachePriority;
 use risingwave_hummock_sdk::HummockReadEpoch;
 use risingwave_meta::hummock::MockHummockMetaClient;
 use risingwave_rpc_client::HummockMetaClient;
+use risingwave_storage::hummock::CachePolicy;
 use risingwave_storage::storage_value::StorageValue;
 use risingwave_storage::store::{
     LocalStateStore, NewLocalOptions, PrefetchOptions, ReadOptions, WriteOptions,
@@ -46,6 +48,7 @@ macro_rules! assert_count_range_scan {
                     retention_seconds: None,
                     read_version_from_backup: false,
                     prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
diff --git a/src/storage/hummock_test/src/state_store_tests.rs b/src/storage/hummock_test/src/state_store_tests.rs
index 076ebffe69cbe..807bbe3b1bc85 100644
--- a/src/storage/hummock_test/src/state_store_tests.rs
+++ b/src/storage/hummock_test/src/state_store_tests.rs
@@ -18,6 +18,7 @@ use std::sync::Arc;
 
 use bytes::Bytes;
 use futures::{pin_mut, TryStreamExt};
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::TableId;
 use risingwave_hummock_sdk::key::FullKey;
 use risingwave_hummock_sdk::{
@@ -28,7 +29,7 @@ use risingwave_meta::hummock::MockHummockMetaClient;
 use risingwave_rpc_client::HummockMetaClient;
 use risingwave_storage::hummock::iterator::test_utils::mock_sstable_store;
 use risingwave_storage::hummock::test_utils::{count_stream, default_opts_for_test};
-use risingwave_storage::hummock::HummockStorage;
+use risingwave_storage::hummock::{CachePolicy, HummockStorage};
 use risingwave_storage::storage_value::StorageValue;
 use risingwave_storage::store::*;
 
@@ -49,6 +50,7 @@ async fn test_empty_read_v2() {
                 table_id: TableId { table_id: 2333 },
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -65,6 +67,7 @@ async fn test_empty_read_v2() {
                 table_id: TableId { table_id: 2333 },
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -163,6 +166,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -181,6 +185,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -201,6 +206,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -236,6 +242,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -272,6 +279,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -291,6 +299,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -310,6 +319,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -330,6 +340,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -350,6 +361,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -369,6 +381,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -389,6 +402,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -417,6 +431,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -435,6 +450,7 @@ async fn test_basic_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -617,6 +633,7 @@ async fn test_reload_storage() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -637,6 +654,7 @@ async fn test_reload_storage() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -671,6 +689,7 @@ async fn test_reload_storage() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -691,6 +710,7 @@ async fn test_reload_storage() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -711,6 +731,7 @@ async fn test_reload_storage() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -731,6 +752,7 @@ async fn test_reload_storage() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -750,6 +772,7 @@ async fn test_reload_storage() {
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             },
         )
         .await
@@ -790,6 +813,7 @@ async fn test_write_anytime_inner(
                             retention_seconds: None,
                             read_version_from_backup: false,
                             prefetch_options: Default::default(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         }
                     )
                     .await
@@ -810,6 +834,7 @@ async fn test_write_anytime_inner(
                             retention_seconds: None,
                             read_version_from_backup: false,
                             prefetch_options: Default::default(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         }
                     )
                     .await
@@ -830,6 +855,7 @@ async fn test_write_anytime_inner(
                             retention_seconds: None,
                             read_version_from_backup: false,
                             prefetch_options: Default::default(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         }
                     )
                     .await
@@ -852,6 +878,7 @@ async fn test_write_anytime_inner(
                         retention_seconds: None,
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -922,6 +949,7 @@ async fn test_write_anytime_inner(
                             retention_seconds: None,
                             read_version_from_backup: false,
                             prefetch_options: Default::default(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         }
                     )
                     .await
@@ -941,6 +969,7 @@ async fn test_write_anytime_inner(
                         retention_seconds: None,
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     }
                 )
                 .await
@@ -960,6 +989,7 @@ async fn test_write_anytime_inner(
                             retention_seconds: None,
                             read_version_from_backup: false,
                             prefetch_options: Default::default(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         }
                     )
                     .await
@@ -981,6 +1011,7 @@ async fn test_write_anytime_inner(
                         retention_seconds: None,
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -1138,6 +1169,7 @@ async fn test_delete_get_inner(
                 retention_seconds: None,
                 read_version_from_backup: false,
                 prefetch_options: Default::default(),
+                cache_policy: CachePolicy::Fill(CachePriority::High),
             }
         )
         .await
@@ -1225,6 +1257,7 @@ async fn test_multiple_epoch_sync_inner(
                             retention_seconds: None,
                             read_version_from_backup: false,
                             prefetch_options: Default::default(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         }
                     )
                     .await
@@ -1244,6 +1277,7 @@ async fn test_multiple_epoch_sync_inner(
                         retention_seconds: None,
                         read_version_from_backup: false,
                         prefetch_options: Default::default(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     }
                 )
                 .await
@@ -1262,6 +1296,7 @@ async fn test_multiple_epoch_sync_inner(
                             retention_seconds: None,
                             read_version_from_backup: false,
                             prefetch_options: Default::default(),
+                            cache_policy: CachePolicy::Fill(CachePriority::High),
                         }
                     )
                     .await
diff --git a/src/storage/hummock_test/src/sync_point_tests.rs b/src/storage/hummock_test/src/sync_point_tests.rs
index 3211721b48e53..51ac3d46fa5c1 100644
--- a/src/storage/hummock_test/src/sync_point_tests.rs
+++ b/src/storage/hummock_test/src/sync_point_tests.rs
@@ -17,6 +17,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use bytes::Bytes;
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::hummock::CompactionFilterFlag;
 use risingwave_common::catalog::TableId;
 use risingwave_hummock_sdk::compaction_group::hummock_version_ext::HummockVersionExt;
@@ -34,7 +35,7 @@ use risingwave_meta::storage::MemStore;
 use risingwave_pb::hummock::compact_task::TaskStatus;
 use risingwave_rpc_client::HummockMetaClient;
 use risingwave_storage::hummock::compactor::{Compactor, CompactorContext};
-use risingwave_storage::hummock::SstableObjectIdManager;
+use risingwave_storage::hummock::{CachePolicy, SstableObjectIdManager};
 use risingwave_storage::store::{LocalStateStore, NewLocalOptions, ReadOptions};
 use risingwave_storage::StateStore;
 use serial_test::serial;
@@ -278,7 +279,7 @@ async fn test_syncpoints_get_in_delete_range_boundary() {
     ));
 
     let compactor_manager = hummock_manager_ref.compactor_manager_ref_for_test();
-    compactor_manager.add_compactor(worker_node.id, u64::MAX);
+    compactor_manager.add_compactor(worker_node.id, u64::MAX, 16);
 
     let mut local = storage
         .new_local(NewLocalOptions::for_test(existing_table_id.into()))
@@ -387,6 +388,7 @@ async fn test_syncpoints_get_in_delete_range_boundary() {
         retention_seconds: None,
         read_version_from_backup: false,
         prefetch_options: Default::default(),
+        cache_policy: CachePolicy::Fill(CachePriority::High),
     };
     let get_result = storage
         .get(Bytes::from("hhh"), 120, read_options.clone())
diff --git a/src/storage/hummock_test/src/test_utils.rs b/src/storage/hummock_test/src/test_utils.rs
index 465e4654c15c1..da2763ca6cef1 100644
--- a/src/storage/hummock_test/src/test_utils.rs
+++ b/src/storage/hummock_test/src/test_utils.rs
@@ -29,7 +29,7 @@ use risingwave_meta::hummock::test_utils::{
 use risingwave_meta::hummock::{HummockManagerRef, MockHummockMetaClient};
 use risingwave_meta::manager::MetaSrvEnv;
 use risingwave_meta::storage::{MemStore, MetaStore};
-use risingwave_pb::catalog::Table as ProstTable;
+use risingwave_pb::catalog::PbTable;
 use risingwave_pb::common::WorkerNode;
 use risingwave_pb::hummock::version_update_payload;
 use risingwave_rpc_client::HummockMetaClient;
@@ -179,7 +179,7 @@ pub async fn register_tables_with_id_for_test<S: MetaStore>(
 pub async fn register_tables_with_catalog_for_test<S: MetaStore>(
     filter_key_extractor_manager: &FilterKeyExtractorManagerRef,
     hummock_manager_ref: &HummockManagerRef<S>,
-    tables: &[ProstTable],
+    tables: &[PbTable],
 ) {
     update_filter_key_extractor_for_tables(filter_key_extractor_manager, tables);
     let table_ids = tables.iter().map(|t| t.id).collect_vec();
@@ -207,7 +207,7 @@ impl HummockTestEnv {
         .await;
     }
 
-    pub async fn register_table(&self, table: ProstTable) {
+    pub async fn register_table(&self, table: PbTable) {
         register_tables_with_catalog_for_test(
             self.storage.filter_key_extractor_manager(),
             &self.manager,
diff --git a/src/storage/src/hummock/block_cache.rs b/src/storage/src/hummock/block_cache.rs
index d012e8be3014a..61dd21c64f13a 100644
--- a/src/storage/src/hummock/block_cache.rs
+++ b/src/storage/src/hummock/block_cache.rs
@@ -18,7 +18,9 @@ use std::ops::Deref;
 use std::sync::Arc;
 
 use futures::Future;
-use risingwave_common::cache::{CacheableEntry, LookupResponse, LruCache, LruCacheEventListener};
+use risingwave_common::cache::{
+    CachePriority, CacheableEntry, LookupResponse, LruCache, LruCacheEventListener,
+};
 use risingwave_hummock_sdk::HummockSstableObjectId;
 use tokio::sync::oneshot::Receiver;
 use tokio::task::JoinHandle;
@@ -118,21 +120,28 @@ impl BlockResponse {
 }
 
 impl BlockCache {
-    pub fn new(capacity: usize, max_shard_bits: usize) -> Self {
-        Self::new_inner(capacity, max_shard_bits, None)
+    pub fn new(capacity: usize, max_shard_bits: usize, high_priority_ratio: usize) -> Self {
+        Self::new_inner(capacity, max_shard_bits, high_priority_ratio, None)
     }
 
     pub fn with_event_listener(
         capacity: usize,
         max_shard_bits: usize,
+        high_priority_ratio: usize,
         listener: BlockCacheEventListener,
     ) -> Self {
-        Self::new_inner(capacity, max_shard_bits, Some(listener))
+        Self::new_inner(
+            capacity,
+            max_shard_bits,
+            high_priority_ratio,
+            Some(listener),
+        )
     }
 
     fn new_inner(
         capacity: usize,
         mut max_shard_bits: usize,
+        high_priority_ratio: usize,
         listener: Option<BlockCacheEventListener>,
     ) -> Self {
         if capacity == 0 {
@@ -143,8 +152,13 @@ impl BlockCache {
         }
 
         let cache = match listener {
-            Some(listener) => LruCache::with_event_listener(max_shard_bits, capacity, listener),
-            None => LruCache::new(max_shard_bits, capacity),
+            Some(listener) => LruCache::with_event_listener(
+                max_shard_bits,
+                capacity,
+                high_priority_ratio,
+                listener,
+            ),
+            None => LruCache::new(max_shard_bits, capacity, high_priority_ratio),
         };
 
         Self {
@@ -163,12 +177,14 @@ impl BlockCache {
         object_id: HummockSstableObjectId,
         block_idx: u64,
         block: Box<Block>,
+        priority: CachePriority,
     ) -> BlockHolder {
         BlockHolder::from_cached_block(self.inner.insert(
             (object_id, block_idx),
             Self::hash(object_id, block_idx),
             block.capacity(),
             block,
+            priority,
         ))
     }
 
@@ -176,6 +192,7 @@ impl BlockCache {
         &self,
         object_id: HummockSstableObjectId,
         block_idx: u64,
+        priority: CachePriority,
         mut fetch_block: F,
     ) -> BlockResponse
     where
@@ -186,7 +203,7 @@ impl BlockCache {
         let key = (object_id, block_idx);
         match self
             .inner
-            .lookup_with_request_dedup::<_, HummockError, _>(h, key, || {
+            .lookup_with_request_dedup::<_, HummockError, _>(h, key, priority, || {
                 let f = fetch_block();
                 async move {
                     let block = f.await?;
diff --git a/src/storage/src/hummock/compactor/compaction_utils.rs b/src/storage/src/hummock/compactor/compaction_utils.rs
index da8307896e188..8aa2a0ce19d14 100644
--- a/src/storage/src/hummock/compactor/compaction_utils.rs
+++ b/src/storage/src/hummock/compactor/compaction_utils.rs
@@ -127,8 +127,9 @@ pub struct TaskConfig {
     pub split_by_table: bool,
 }
 
-pub fn estimate_memory_use_for_compaction(task: &CompactTask) -> u64 {
+pub fn estimate_state_for_compaction(task: &CompactTask) -> (u64, usize) {
     let mut total_memory_size = 0;
+    let mut total_file_count = 0;
     for level in &task.input_ssts {
         if level.level_type == LevelType::Nonoverlapping as i32 {
             if let Some(table) = level.table_infos.first() {
@@ -139,8 +140,11 @@ pub fn estimate_memory_use_for_compaction(task: &CompactTask) -> u64 {
                 total_memory_size += table.file_size;
             }
         }
+
+        total_file_count += level.table_infos.len();
     }
-    total_memory_size
+
+    (total_memory_size, total_file_count)
 }
 
 pub fn build_multi_compaction_filter(compact_task: &CompactTask) -> MultiCompactionFilter {
diff --git a/src/storage/src/hummock/compactor/compactor_runner.rs b/src/storage/src/hummock/compactor/compactor_runner.rs
index 2064b0844888c..61a81ea3c1f48 100644
--- a/src/storage/src/hummock/compactor/compactor_runner.rs
+++ b/src/storage/src/hummock/compactor/compactor_runner.rs
@@ -53,17 +53,6 @@ impl CompactorRunner {
             .map(|table| table.file_size)
             .sum::<u64>();
 
-        let stats_target_table_ids: HashSet<u32> = task
-            .input_ssts
-            .iter()
-            .flat_map(|i| {
-                i.table_infos
-                    .iter()
-                    .flat_map(|t| t.table_ids.clone())
-                    .collect_vec()
-            })
-            .collect();
-
         let mut options: SstableBuilderOptions = context.storage_opts.as_ref().into();
         options.capacity = std::cmp::min(task.target_file_size as usize, max_target_file_size);
         options.compression_algorithm = match task.compression_algorithm {
@@ -89,7 +78,7 @@ impl CompactorRunner {
                 cache_policy: CachePolicy::NotFill,
                 gc_delete_keys: task.gc_delete_keys,
                 watermark: task.watermark,
-                stats_target_table_ids: Some(stats_target_table_ids),
+                stats_target_table_ids: Some(HashSet::from_iter(task.existing_table_ids.clone())),
                 task_type: task.task_type(),
                 split_by_table: task.split_by_state_table,
             },
@@ -181,6 +170,7 @@ impl CompactorRunner {
                     .cloned()
                     .collect_vec();
                 table_iters.push(ConcatSstableIterator::new(
+                    self.compact_task.existing_table_ids.clone(),
                     tables,
                     self.compactor.task_config.key_range.clone(),
                     self.sstable_store.clone(),
@@ -192,6 +182,7 @@ impl CompactorRunner {
                         continue;
                     }
                     table_iters.push(ConcatSstableIterator::new(
+                        self.compact_task.existing_table_ids.clone(),
                         vec![table_info.clone()],
                         self.compactor.task_config.key_range.clone(),
                         self.sstable_store.clone(),
diff --git a/src/storage/src/hummock/compactor/iterator.rs b/src/storage/src/hummock/compactor/iterator.rs
index fc1bee3f96e14..070546f0a5bef 100644
--- a/src/storage/src/hummock/compactor/iterator.rs
+++ b/src/storage/src/hummock/compactor/iterator.rs
@@ -13,11 +13,13 @@
 // limitations under the License.
 
 use std::cmp::Ordering;
+use std::collections::HashSet;
 use std::future::Future;
 use std::sync::atomic::AtomicU64;
 use std::sync::{atomic, Arc};
 use std::time::Instant;
 
+use risingwave_hummock_sdk::compaction_group::StateTableId;
 use risingwave_hummock_sdk::key::FullKey;
 use risingwave_hummock_sdk::key_range::KeyRange;
 use risingwave_hummock_sdk::KeyComparator;
@@ -45,6 +47,7 @@ struct SstableStreamIterator {
 
     /// For key sanity check of divided SST and debugging
     sstable_info: SstableInfo,
+    existing_table_ids: HashSet<StateTableId>,
 }
 
 impl SstableStreamIterator {
@@ -64,6 +67,7 @@ impl SstableStreamIterator {
     /// The iterator reads at most `max_block_count` from the stream.
     pub fn new(
         sstable_info: &SstableInfo,
+        existing_table_ids: HashSet<StateTableId>,
         block_stream: BlockStream,
         max_block_count: usize,
         stats: &StoreLocalStatistic,
@@ -73,6 +77,7 @@ impl SstableStreamIterator {
             block_iter: None,
             remaining_blocks: max_block_count,
             stats_ptr: stats.remote_io_time.clone(),
+            existing_table_ids,
             sstable_info: sstable_info.clone(),
         }
     }
@@ -80,10 +85,8 @@ impl SstableStreamIterator {
     async fn prune_from_valid_block_iter(&mut self) -> HummockResult<()> {
         while let Some(block_iter) = self.block_iter.as_mut() {
             if self
-                .sstable_info
-                .get_table_ids()
-                .binary_search(&block_iter.table_id().table_id)
-                .is_ok()
+                .existing_table_ids
+                .contains(&block_iter.table_id().table_id)
             {
                 return Ok(());
             } else {
@@ -111,6 +114,7 @@ impl SstableStreamIterator {
             if !block_iter.is_valid() {
                 // `seek_key` is larger than everything in the first block.
                 self.next_block().await?;
+            } else {
             }
         }
 
@@ -214,7 +218,9 @@ pub struct ConcatSstableIterator {
     cur_idx: usize,
 
     /// All non-overlapping tables.
-    tables: Vec<SstableInfo>,
+    sstables: Vec<SstableInfo>,
+
+    existing_table_ids: HashSet<StateTableId>,
 
     sstable_store: SstableStoreRef,
 
@@ -226,7 +232,8 @@ impl ConcatSstableIterator {
     /// arranged in ascending order when it serves as a forward iterator,
     /// and arranged in descending order when it serves as a backward iterator.
     pub fn new(
-        tables: Vec<SstableInfo>,
+        existing_table_ids: Vec<StateTableId>,
+        sst_infos: Vec<SstableInfo>,
         key_range: KeyRange,
         sstable_store: SstableStoreRef,
     ) -> Self {
@@ -234,7 +241,8 @@ impl ConcatSstableIterator {
             key_range,
             sstable_iter: None,
             cur_idx: 0,
-            tables,
+            sstables: sst_infos,
+            existing_table_ids: HashSet::from_iter(existing_table_ids),
             sstable_store,
             stats: StoreLocalStatistic::default(),
         }
@@ -243,7 +251,7 @@ impl ConcatSstableIterator {
     /// Resets the iterator, loads the specified SST, and seeks in that SST to `seek_key` if given.
     async fn seek_idx(
         &mut self,
-        mut idx: usize,
+        idx: usize,
         seek_key: Option<FullKey<&[u8]>>,
     ) -> HummockResult<()> {
         self.sstable_iter.take();
@@ -257,14 +265,25 @@ impl ConcatSstableIterator {
             (None, true) => None,
             (None, false) => Some(FullKey::decode(&self.key_range.left)),
         };
-
-        while idx < self.tables.len() {
-            let table_info = &self.tables[idx];
-            let table = self
+        self.cur_idx = idx;
+        while self.cur_idx < self.sstables.len() {
+            let table_info = &self.sstables[self.cur_idx];
+            let mut found = table_info
+                .table_ids
+                .iter()
+                .any(|table_id| self.existing_table_ids.contains(table_id));
+            if !found {
+                self.cur_idx += 1;
+                seek_key = None;
+                continue;
+            }
+            let sstable = self
                 .sstable_store
                 .sstable(table_info, &mut self.stats)
                 .await?;
-            let block_metas = &table.value().meta.block_metas;
+            let stats_ptr = self.stats.remote_io_time.clone();
+            let now = Instant::now();
+            let block_metas = &sstable.value().meta.block_metas;
             let mut start_index = match seek_key {
                 None => 0,
                 Some(seek_key) => {
@@ -286,32 +305,24 @@ impl ConcatSstableIterator {
                     ) != Ordering::Greater
                 })
             };
-
             while start_index < end_index {
                 let start_block_table_id = block_metas[start_index].table_id();
-                if table_info
-                    .get_table_ids()
-                    .binary_search(&start_block_table_id.table_id)
-                    .is_ok()
+                if self
+                    .existing_table_ids
+                    .contains(&block_metas[start_index].table_id().table_id)
                 {
                     break;
-                } else {
-                    start_index +=
-                        &block_metas[(start_index + 1)..].partition_point(|block_meta| {
-                            block_meta.table_id() == start_block_table_id
-                        }) + 1;
                 }
+                start_index += &block_metas[(start_index + 1)..]
+                    .partition_point(|block_meta| block_meta.table_id() == start_block_table_id)
+                    + 1;
             }
-
-            let found = if end_index <= start_index {
-                false
+            if start_index >= end_index {
+                found = false;
             } else {
-                let stats_ptr = self.stats.remote_io_time.clone();
-                let now = Instant::now();
-
                 let block_stream = self
                     .sstable_store
-                    .get_stream(table.value(), Some(start_index))
+                    .get_stream(sstable.value(), Some(start_index))
                     .await?;
 
                 // Determine time needed to open stream.
@@ -320,6 +331,7 @@ impl ConcatSstableIterator {
 
                 let mut sstable_iter = SstableStreamIterator::new(
                     table_info,
+                    self.existing_table_ids.clone(),
                     block_stream,
                     end_index - start_index,
                     &self.stats,
@@ -328,17 +340,14 @@ impl ConcatSstableIterator {
 
                 if sstable_iter.is_valid() {
                     self.sstable_iter = Some(sstable_iter);
-                    true
                 } else {
-                    false
+                    found = false;
                 }
-            };
-            self.cur_idx = idx;
-
+            }
             if found {
                 return Ok(());
             } else {
-                idx += 1;
+                self.cur_idx += 1;
                 seek_key = None;
             }
         }
@@ -396,7 +405,7 @@ impl HummockIterator for ConcatSstableIterator {
                     Ordering::Greater => key,
                 }
             };
-            let table_idx = self.tables.partition_point(|table| {
+            let table_idx = self.sstables.partition_point(|table| {
                 // We use the maximum key of an SST for the search. That way, we guarantee that the
                 // resulting SST contains either that key or the next-larger KV-pair. Subsequently,
                 // we avoid calling `seek_idx()` twice if the determined SST does not contain `key`.
@@ -456,8 +465,12 @@ mod tests {
             test_key_of(start_index).encode().into(),
             test_key_of(end_index).encode().into(),
         );
-        let mut iter =
-            ConcatSstableIterator::new(table_infos.clone(), kr.clone(), sstable_store.clone());
+        let mut iter = ConcatSstableIterator::new(
+            vec![0],
+            table_infos.clone(),
+            kr.clone(),
+            sstable_store.clone(),
+        );
         iter.seek(FullKey::decode(&kr.left)).await.unwrap();
 
         for idx in start_index..end_index {
@@ -476,16 +489,24 @@ mod tests {
             test_key_of(30000).encode().into(),
             test_key_of(40000).encode().into(),
         );
-        let mut iter =
-            ConcatSstableIterator::new(table_infos.clone(), kr.clone(), sstable_store.clone());
+        let mut iter = ConcatSstableIterator::new(
+            vec![0],
+            table_infos.clone(),
+            kr.clone(),
+            sstable_store.clone(),
+        );
         iter.seek(FullKey::decode(&kr.left)).await.unwrap();
         assert!(!iter.is_valid());
         let kr = KeyRange::new(
             test_key_of(start_index).encode().into(),
             test_key_of(40000).encode().into(),
         );
-        let mut iter =
-            ConcatSstableIterator::new(table_infos.clone(), kr.clone(), sstable_store.clone());
+        let mut iter = ConcatSstableIterator::new(
+            vec![0],
+            table_infos.clone(),
+            kr.clone(),
+            sstable_store.clone(),
+        );
         iter.seek(FullKey::decode(&kr.left)).await.unwrap();
         for idx in start_index..30000 {
             let key = iter.key();
@@ -504,8 +525,12 @@ mod tests {
             test_key_of(0).encode().into(),
             test_key_of(40000).encode().into(),
         );
-        let mut iter =
-            ConcatSstableIterator::new(table_infos.clone(), kr.clone(), sstable_store.clone());
+        let mut iter = ConcatSstableIterator::new(
+            vec![0],
+            table_infos.clone(),
+            kr.clone(),
+            sstable_store.clone(),
+        );
         iter.seek(test_key_of(10000).to_ref()).await.unwrap();
         assert!(iter.is_valid() && iter.cur_idx == 1 && iter.key() == test_key_of(10000).to_ref());
         iter.seek(test_key_of(10001).to_ref()).await.unwrap();
@@ -524,8 +549,12 @@ mod tests {
             test_key_of(6000).encode().into(),
             test_key_of(16000).encode().into(),
         );
-        let mut iter =
-            ConcatSstableIterator::new(table_infos.clone(), kr.clone(), sstable_store.clone());
+        let mut iter = ConcatSstableIterator::new(
+            vec![0],
+            table_infos.clone(),
+            kr.clone(),
+            sstable_store.clone(),
+        );
         iter.seek(test_key_of(17000).to_ref()).await.unwrap();
         assert!(!iter.is_valid());
         iter.seek(test_key_of(1).to_ref()).await.unwrap();
@@ -555,10 +584,14 @@ mod tests {
             test_key_of(0).encode().into(),
             test_key_of(40000).encode().into(),
         );
-        let mut iter =
-            ConcatSstableIterator::new(table_infos.clone(), kr.clone(), sstable_store.clone());
+        let mut iter = ConcatSstableIterator::new(
+            vec![0],
+            table_infos.clone(),
+            kr.clone(),
+            sstable_store.clone(),
+        );
         let sst = sstable_store
-            .sstable(&iter.tables[0], &mut iter.stats)
+            .sstable(&iter.sstables[0], &mut iter.stats)
             .await
             .unwrap();
         let block_metas = &sst.value().meta.block_metas;
@@ -591,8 +624,12 @@ mod tests {
             next_full_key(&block_1_smallest_key).into(),
             prev_full_key(&block_2_smallest_key).into(),
         );
-        let mut iter =
-            ConcatSstableIterator::new(table_infos.clone(), kr.clone(), sstable_store.clone());
+        let mut iter = ConcatSstableIterator::new(
+            vec![0],
+            table_infos.clone(),
+            kr.clone(),
+            sstable_store.clone(),
+        );
         // Use block_2_smallest_key as seek key and result in invalid iterator.
         let seek_key = FullKey::decode(&block_2_smallest_key);
         assert!(seek_key.cmp(&FullKey::decode(&kr.right)) == Ordering::Greater);
diff --git a/src/storage/src/hummock/compactor/mod.rs b/src/storage/src/hummock/compactor/mod.rs
index 99ea00f9eaf39..6b241ccc32373 100644
--- a/src/storage/src/hummock/compactor/mod.rs
+++ b/src/storage/src/hummock/compactor/mod.rs
@@ -23,6 +23,7 @@ pub(super) mod task_progress;
 
 use std::collections::{HashMap, HashSet};
 use std::marker::PhantomData;
+use std::ops::Div;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
@@ -37,6 +38,7 @@ use futures::future::try_join_all;
 use futures::{stream, StreamExt};
 pub use iterator::ConcatSstableIterator;
 use itertools::Itertools;
+use risingwave_common::util::resource_util;
 use risingwave_hummock_sdk::compact::compact_task_to_string;
 use risingwave_hummock_sdk::filter_key_extractor::FilterKeyExtractorImpl;
 use risingwave_hummock_sdk::key::FullKey;
@@ -44,9 +46,12 @@ use risingwave_hummock_sdk::table_stats::{add_table_stats_map, TableStats, Table
 use risingwave_hummock_sdk::LocalSstableInfo;
 use risingwave_pb::hummock::compact_task::TaskStatus;
 use risingwave_pb::hummock::subscribe_compact_tasks_response::Task;
-use risingwave_pb::hummock::{CompactTask, CompactTaskProgress, SubscribeCompactTasksResponse};
+use risingwave_pb::hummock::{
+    CompactTask, CompactTaskProgress, CompactorWorkload, SubscribeCompactTasksResponse,
+};
 use risingwave_rpc_client::HummockMetaClient;
 pub use shared_buffer_compact::compact;
+use sysinfo::{CpuRefreshKind, ProcessExt, ProcessRefreshKind, RefreshKind, System, SystemExt};
 use tokio::sync::oneshot::{Receiver, Sender};
 use tokio::task::JoinHandle;
 
@@ -55,7 +60,7 @@ use self::task_progress::TaskProgress;
 use super::multi_builder::CapacitySplitTableBuilder;
 use super::{HummockResult, SstableBuilderOptions, XorFilterBuilder};
 use crate::hummock::compactor::compaction_utils::{
-    build_multi_compaction_filter, estimate_memory_use_for_compaction, generate_splits,
+    build_multi_compaction_filter, estimate_state_for_compaction, generate_splits,
 };
 use crate::hummock::compactor::compactor_runner::CompactorRunner;
 use crate::hummock::compactor::task_progress::TaskProgressGuard;
@@ -157,11 +162,12 @@ impl Compactor {
             .with_label_values(&[compact_task.input_ssts[0].level_idx.to_string().as_str()])
             .start_timer();
 
-        let need_quota = estimate_memory_use_for_compaction(&compact_task);
+        let (need_quota, file_counts) = estimate_state_for_compaction(&compact_task);
         tracing::info!(
-            "Ready to handle compaction task: {} need memory: {} target_level {} compression_algorithm {:?}",
+            "Ready to handle compaction task: {} need memory: {} input_file_counts {} target_level {} compression_algorithm {:?}",
             compact_task.task_id,
             need_quota,
+            file_counts,
             compact_task.target_level,
             compact_task.compression_algorithm,
         );
@@ -337,13 +343,21 @@ impl Compactor {
     ) -> (JoinHandle<()>, Sender<()>) {
         type CompactionShutdownMap = Arc<Mutex<HashMap<u64, Sender<()>>>>;
         let (shutdown_tx, mut shutdown_rx) = tokio::sync::oneshot::channel();
-        let stream_retry_interval = Duration::from_secs(60);
+        let stream_retry_interval = Duration::from_secs(30);
         let task_progress = compactor_context.task_progress_manager.clone();
         let task_progress_update_interval = Duration::from_millis(1000);
+        let cpu_core_num = resource_util::cpu::total_cpu_available() as u32;
+
+        let mut system =
+            System::new_with_specifics(RefreshKind::new().with_cpu(CpuRefreshKind::everything()));
+        let pid = sysinfo::get_current_pid().unwrap();
+
         let join_handle = tokio::spawn(async move {
             let shutdown_map = CompactionShutdownMap::default();
             let mut min_interval = tokio::time::interval(stream_retry_interval);
             let mut task_progress_interval = tokio::time::interval(task_progress_update_interval);
+            let mut workload_collect_interval = tokio::time::interval(Duration::from_secs(60));
+
             // This outer loop is to recreate stream.
             'start_stream: loop {
                 tokio::select! {
@@ -358,7 +372,7 @@ impl Compactor {
 
                 let config = compactor_context.lock_config().await;
                 let mut stream = match hummock_meta_client
-                    .subscribe_compact_tasks(config.max_concurrent_task_number)
+                    .subscribe_compact_tasks(config.max_concurrent_task_number, cpu_core_num)
                     .await
                 {
                     Ok(stream) => {
@@ -376,6 +390,8 @@ impl Compactor {
                 drop(config);
 
                 let executor = compactor_context.compaction_executor.clone();
+                let mut last_workload = CompactorWorkload::default();
+
                 // This inner loop is to consume stream or report task progress.
                 'consume_stream: loop {
                     let message = tokio::select! {
@@ -388,12 +404,34 @@ impl Compactor {
                                     num_ssts_uploaded: progress.num_ssts_uploaded.load(Ordering::Relaxed),
                                 });
                             }
-                            if let Err(e) = hummock_meta_client.report_compaction_task_progress(progress_list).await {
+
+                            if let Err(e) = hummock_meta_client.compactor_heartbeat(progress_list, last_workload.clone()).await {
                                 // ignore any errors while trying to report task progress
                                 tracing::warn!("Failed to report task progress. {e:?}");
                             }
                             continue;
                         }
+
+                        _ = workload_collect_interval.tick() => {
+                            let refresh_result = system.refresh_process_specifics(pid, ProcessRefreshKind::new().with_cpu());
+                            debug_assert!(refresh_result);
+                            let cpu = if let Some(process) = system.process(pid) {
+                                process.cpu_usage().div(cpu_core_num as f32) as u32
+                            } else {
+                                tracing::warn!("fail to get process pid {:?}", pid);
+                                0
+                            };
+
+                            tracing::debug!("compactor cpu usage {cpu}");
+                            let workload = CompactorWorkload {
+                                cpu,
+                            };
+
+                            last_workload = workload.clone();
+
+                            continue;
+                        }
+
                         message = stream.next() => {
                             message
                         },
@@ -412,15 +450,13 @@ impl Compactor {
                             let shutdown = shutdown_map.clone();
                             let context = compactor_context.clone();
                             let meta_client = hummock_meta_client.clone();
+
                             executor.spawn(async move {
                                 match task {
                                     Task::CompactTask(compact_task) => {
                                         let (tx, rx) = tokio::sync::oneshot::channel();
                                         let task_id = compact_task.task_id;
-                                        shutdown
-                                            .lock()
-                                            .unwrap()
-                                            .insert(task_id, tx);
+                                        shutdown.lock().unwrap().insert(task_id, tx);
                                         Compactor::compact(context, compact_task, rx).await;
                                         shutdown.lock().unwrap().remove(&task_id);
                                     }
@@ -458,15 +494,15 @@ impl Compactor {
                                                     "Cancellation of compaction task failed. task_id: {}",
                                                     cancel_compact_task.task_id
                                                 );
-                                            }
-                                        } else {
-                                            tracing::warn!(
+                                        }
+                                    } else {
+                                        tracing::warn!(
                                                 "Attempting to cancel non-existent compaction task. task_id: {}",
                                                 cancel_compact_task.task_id
                                             );
-                                        }
                                     }
                                 }
+                            }
                             });
                         }
                         Some(Err(e)) => {
diff --git a/src/storage/src/hummock/compactor/shared_buffer_compact.rs b/src/storage/src/hummock/compactor/shared_buffer_compact.rs
index 89a3109fdebcd..a6a189d0033f8 100644
--- a/src/storage/src/hummock/compactor/shared_buffer_compact.rs
+++ b/src/storage/src/hummock/compactor/shared_buffer_compact.rs
@@ -19,6 +19,7 @@ use bytes::Bytes;
 use futures::future::try_join_all;
 use futures::{stream, StreamExt, TryFutureExt};
 use itertools::Itertools;
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::TableId;
 use risingwave_hummock_sdk::compaction_group::StaticCompactionGroupId;
 use risingwave_hummock_sdk::filter_key_extractor::FilterKeyExtractorImpl;
@@ -256,7 +257,7 @@ impl SharedBufferCompactRunner {
             options,
             super::TaskConfig {
                 key_range,
-                cache_policy: CachePolicy::Fill,
+                cache_policy: CachePolicy::Fill(CachePriority::High),
                 gc_delete_keys: GC_DELETE_KEYS_FOR_FLUSH,
                 watermark: GC_WATERMARK_FOR_FLUSH,
                 stats_target_table_ids: None,
diff --git a/src/storage/src/hummock/file_cache/buffer.rs b/src/storage/src/hummock/file_cache/buffer.rs
index b44d07889e759..5514ef241c96c 100644
--- a/src/storage/src/hummock/file_cache/buffer.rs
+++ b/src/storage/src/hummock/file_cache/buffer.rs
@@ -15,7 +15,7 @@
 use std::sync::Arc;
 
 use parking_lot::RwLock;
-use risingwave_common::cache::LruCache;
+use risingwave_common::cache::{CachePriority, LruCache};
 
 use super::LRU_SHARD_BITS;
 use crate::hummock::{TieredCacheEntryHolder, TieredCacheKey, TieredCacheValue};
@@ -73,15 +73,16 @@ where
         Self {
             capacity,
             core: Arc::new(RwLock::new(TwoLevelBufferCore {
-                active_buffer: Arc::new(LruCache::new(LRU_SHARD_BITS, capacity)),
-                frozen_buffer: Arc::new(LruCache::new(LRU_SHARD_BITS, capacity)),
+                active_buffer: Arc::new(LruCache::new(LRU_SHARD_BITS, capacity, 0)),
+                frozen_buffer: Arc::new(LruCache::new(LRU_SHARD_BITS, capacity, 0)),
             })),
         }
     }
 
     pub fn insert(&self, hash: u64, key: K, charge: usize, value: V) {
         let core = self.core.read();
-        core.active_buffer.insert(key, hash, charge, value);
+        core.active_buffer
+            .insert(key, hash, charge, value, CachePriority::High);
     }
 
     pub fn get(&self, hash: u64, key: &K) -> Option<TieredCacheEntryHolder<K, V>> {
@@ -114,7 +115,7 @@ where
     }
 
     pub fn rotate(&self) -> Buffer<K, V> {
-        let mut buffer = Arc::new(LruCache::new(LRU_SHARD_BITS, self.capacity));
+        let mut buffer = Arc::new(LruCache::new(LRU_SHARD_BITS, self.capacity, 0));
         let mut core = self.core.write();
         std::mem::swap(&mut buffer, &mut core.active_buffer);
         std::mem::swap(&mut buffer, &mut core.frozen_buffer);
diff --git a/src/storage/src/hummock/file_cache/cache.rs b/src/storage/src/hummock/file_cache/cache.rs
index 20967aae95815..ced1684fa4f72 100644
--- a/src/storage/src/hummock/file_cache/cache.rs
+++ b/src/storage/src/hummock/file_cache/cache.rs
@@ -16,7 +16,7 @@ use std::collections::hash_map::RandomState;
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use risingwave_common::cache::LruCache;
+use risingwave_common::cache::{CachePriority, LruCache};
 use risingwave_common::util::iter_util::ZipEqFast;
 use tokio::sync::Notify;
 
@@ -110,6 +110,7 @@ where
                         hash,
                         utils::align_up(self.store.block_size(), encoded_value_len),
                         slot,
+                        CachePriority::High,
                     );
                     bytes += utils::align_up(self.store.block_size(), encoded_value_len);
                 }
@@ -198,6 +199,7 @@ where
         let indices = Arc::new(LruCache::with_event_listener(
             LRU_SHARD_BITS,
             options.capacity,
+            0,
             store.clone(),
         ));
         store.restore(&indices, &hash_builder).await?;
diff --git a/src/storage/src/hummock/file_cache/store.rs b/src/storage/src/hummock/file_cache/store.rs
index a4836936f20cc..aa9193d629793 100644
--- a/src/storage/src/hummock/file_cache/store.rs
+++ b/src/storage/src/hummock/file_cache/store.rs
@@ -20,7 +20,7 @@ use nix::sys::statfs::{
     statfs, FsType as NixFsType, BTRFS_SUPER_MAGIC, EXT4_SUPER_MAGIC, TMPFS_MAGIC,
 };
 use parking_lot::RwLock;
-use risingwave_common::cache::{LruCache, LruCacheEventListener};
+use risingwave_common::cache::{CachePriority, LruCache, LruCacheEventListener};
 use risingwave_common::util::iter_util::ZipEqFast;
 use tokio::sync::RwLock as AsyncRwLock;
 use tracing::Instrument;
@@ -355,6 +355,7 @@ where
                     hash_builder.hash_one(&key),
                     utils::align_up(self.block_size, block_loc.len as usize),
                     slot,
+                    CachePriority::High,
                 );
             }
         }
diff --git a/src/storage/src/hummock/hummock_meta_client.rs b/src/storage/src/hummock/hummock_meta_client.rs
index bc17505bc0d51..b91cfc03f246d 100644
--- a/src/storage/src/hummock/hummock_meta_client.rs
+++ b/src/storage/src/hummock/hummock_meta_client.rs
@@ -19,7 +19,8 @@ use futures::stream::BoxStream;
 use risingwave_hummock_sdk::table_stats::TableStatsMap;
 use risingwave_hummock_sdk::{HummockSstableObjectId, LocalSstableInfo, SstObjectIdRange};
 use risingwave_pb::hummock::{
-    CompactTask, CompactTaskProgress, HummockSnapshot, HummockVersion, VacuumTask,
+    CompactTask, CompactTaskProgress, CompactorWorkload, HummockSnapshot, HummockVersion,
+    VacuumTask,
 };
 use risingwave_rpc_client::error::Result;
 use risingwave_rpc_client::{CompactTaskItem, HummockMetaClient, MetaClient};
@@ -122,18 +123,20 @@ impl HummockMetaClient for MonitoredHummockMetaClient {
     async fn subscribe_compact_tasks(
         &self,
         max_concurrent_task_number: u64,
+        cpu_core_num: u32,
     ) -> Result<BoxStream<'static, CompactTaskItem>> {
         self.meta_client
-            .subscribe_compact_tasks(max_concurrent_task_number)
+            .subscribe_compact_tasks(max_concurrent_task_number, cpu_core_num)
             .await
     }
 
-    async fn report_compaction_task_progress(
+    async fn compactor_heartbeat(
         &self,
         progress: Vec<CompactTaskProgress>,
+        workload: CompactorWorkload,
     ) -> Result<()> {
         self.meta_client
-            .report_compaction_task_progress(progress)
+            .compactor_heartbeat(progress, workload)
             .await
     }
 
diff --git a/src/storage/src/hummock/iterator/backward_merge.rs b/src/storage/src/hummock/iterator/backward_merge.rs
index ebc2517d14cd3..e76b9040bfb04 100644
--- a/src/storage/src/hummock/iterator/backward_merge.rs
+++ b/src/storage/src/hummock/iterator/backward_merge.rs
@@ -14,6 +14,7 @@
 
 #[cfg(test)]
 mod test {
+    use risingwave_common::cache::CachePriority;
 
     use crate::hummock::iterator::test_utils::{
         default_builder_opt_for_test, gen_iterator_test_sstable_base, iterator_test_key_of,
@@ -53,15 +54,33 @@ mod test {
         let cache = create_small_table_cache();
         let iters = vec![
             BackwardSstableIterator::new(
-                cache.insert(table0.id, table0.id, 1, Box::new(table0)),
+                cache.insert(
+                    table0.id,
+                    table0.id,
+                    1,
+                    Box::new(table0),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
             ),
             BackwardSstableIterator::new(
-                cache.insert(table1.id, table1.id, 1, Box::new(table1)),
+                cache.insert(
+                    table1.id,
+                    table1.id,
+                    1,
+                    Box::new(table1),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
             ),
             BackwardSstableIterator::new(
-                cache.insert(table2.id, table2.id, 1, Box::new(table2)),
+                cache.insert(
+                    table2.id,
+                    table2.id,
+                    1,
+                    Box::new(table2),
+                    CachePriority::High,
+                ),
                 sstable_store,
             ),
         ];
@@ -116,15 +135,33 @@ mod test {
         let cache = create_small_table_cache();
         let iters = vec![
             BackwardSstableIterator::new(
-                cache.insert(table0.id, table0.id, 1, Box::new(table0)),
+                cache.insert(
+                    table0.id,
+                    table0.id,
+                    1,
+                    Box::new(table0),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
             ),
             BackwardSstableIterator::new(
-                cache.insert(table1.id, table1.id, 1, Box::new(table1)),
+                cache.insert(
+                    table1.id,
+                    table1.id,
+                    1,
+                    Box::new(table1),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
             ),
             BackwardSstableIterator::new(
-                cache.insert(table2.id, table2.id, 1, Box::new(table2)),
+                cache.insert(
+                    table2.id,
+                    table2.id,
+                    1,
+                    Box::new(table2),
+                    CachePriority::High,
+                ),
                 sstable_store,
             ),
         ];
@@ -193,11 +230,23 @@ mod test {
         let cache = create_small_table_cache();
         let iters = vec![
             BackwardSstableIterator::new(
-                cache.insert(table1.id, table1.id, 1, Box::new(table1)),
+                cache.insert(
+                    table1.id,
+                    table1.id,
+                    1,
+                    Box::new(table1),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
             ),
             BackwardSstableIterator::new(
-                cache.insert(table0.id, table0.id, 1, Box::new(table0)),
+                cache.insert(
+                    table0.id,
+                    table0.id,
+                    1,
+                    Box::new(table0),
+                    CachePriority::High,
+                ),
                 sstable_store,
             ),
         ];
diff --git a/src/storage/src/hummock/iterator/backward_user.rs b/src/storage/src/hummock/iterator/backward_user.rs
index 4965782e75a66..3b71ce4a113c2 100644
--- a/src/storage/src/hummock/iterator/backward_user.rs
+++ b/src/storage/src/hummock/iterator/backward_user.rs
@@ -296,6 +296,7 @@ mod tests {
 
     use rand::distributions::Alphanumeric;
     use rand::{thread_rng, Rng};
+    use risingwave_common::cache::CachePriority;
     use risingwave_common::catalog::TableId;
     use risingwave_hummock_sdk::key::prev_key;
 
@@ -341,9 +342,27 @@ mod tests {
         )
         .await;
         let cache = create_small_table_cache();
-        let handle0 = cache.insert(table0.id, table0.id, 1, Box::new(table0));
-        let handle1 = cache.insert(table1.id, table1.id, 1, Box::new(table1));
-        let handle2 = cache.insert(table2.id, table2.id, 1, Box::new(table2));
+        let handle0 = cache.insert(
+            table0.id,
+            table0.id,
+            1,
+            Box::new(table0),
+            CachePriority::High,
+        );
+        let handle1 = cache.insert(
+            table1.id,
+            table1.id,
+            1,
+            Box::new(table1),
+            CachePriority::High,
+        );
+        let handle2 = cache.insert(
+            table2.id,
+            table2.id,
+            1,
+            Box::new(table2),
+            CachePriority::High,
+        );
 
         let backward_iters = vec![
             BackwardSstableIterator::new(handle1, sstable_store.clone()),
@@ -397,9 +416,27 @@ mod tests {
         )
         .await;
         let cache = create_small_table_cache();
-        let handle0 = cache.insert(table0.id, table0.id, 1, Box::new(table0));
-        let handle1 = cache.insert(table1.id, table1.id, 1, Box::new(table1));
-        let handle2 = cache.insert(table2.id, table2.id, 1, Box::new(table2));
+        let handle0 = cache.insert(
+            table0.id,
+            table0.id,
+            1,
+            Box::new(table0),
+            CachePriority::High,
+        );
+        let handle1 = cache.insert(
+            table1.id,
+            table1.id,
+            1,
+            Box::new(table1),
+            CachePriority::High,
+        );
+        let handle2 = cache.insert(
+            table2.id,
+            table2.id,
+            1,
+            Box::new(table2),
+            CachePriority::High,
+        );
         let backward_iters = vec![
             BackwardSstableIterator::new(handle0, sstable_store.clone()),
             BackwardSstableIterator::new(handle1, sstable_store.clone()),
@@ -464,11 +501,23 @@ mod tests {
         let cache = create_small_table_cache();
         let backward_iters = vec![
             BackwardSstableIterator::new(
-                cache.insert(table0.id, table0.id, 1, Box::new(table0)),
+                cache.insert(
+                    table0.id,
+                    table0.id,
+                    1,
+                    Box::new(table0),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
             ),
             BackwardSstableIterator::new(
-                cache.insert(table1.id, table1.id, 1, Box::new(table1)),
+                cache.insert(
+                    table1.id,
+                    table1.id,
+                    1,
+                    Box::new(table1),
+                    CachePriority::High,
+                ),
                 sstable_store,
             ),
         ];
@@ -515,7 +564,13 @@ mod tests {
         let sstable =
             gen_iterator_test_sstable_from_kv_pair(0, kv_pairs, sstable_store.clone()).await;
         let cache = create_small_table_cache();
-        let handle = cache.insert(sstable.id, sstable.id, 1, Box::new(sstable));
+        let handle = cache.insert(
+            sstable.id,
+            sstable.id,
+            1,
+            Box::new(sstable),
+            CachePriority::High,
+        );
         let backward_iters = vec![BackwardSstableIterator::new(handle, sstable_store)];
         let bmi = UnorderedMergeIteratorInner::new(backward_iters);
 
@@ -594,7 +649,13 @@ mod tests {
         let sstable =
             gen_iterator_test_sstable_from_kv_pair(0, kv_pairs, sstable_store.clone()).await;
         let cache = create_small_table_cache();
-        let handle = cache.insert(sstable.id, sstable.id, 1, Box::new(sstable));
+        let handle = cache.insert(
+            sstable.id,
+            sstable.id,
+            1,
+            Box::new(sstable),
+            CachePriority::High,
+        );
         let backward_iters = vec![BackwardSstableIterator::new(handle, sstable_store)];
         let bmi = UnorderedMergeIteratorInner::new(backward_iters);
 
@@ -675,7 +736,13 @@ mod tests {
             gen_iterator_test_sstable_from_kv_pair(0, kv_pairs, sstable_store.clone()).await;
         let cache = create_small_table_cache();
         let backward_iters = vec![BackwardSstableIterator::new(
-            cache.insert(sstable.id, sstable.id, 1, Box::new(sstable)),
+            cache.insert(
+                sstable.id,
+                sstable.id,
+                1,
+                Box::new(sstable),
+                CachePriority::High,
+            ),
             sstable_store,
         )];
         let bmi = UnorderedMergeIteratorInner::new(backward_iters);
@@ -754,7 +821,13 @@ mod tests {
         let sstable =
             gen_iterator_test_sstable_from_kv_pair(0, kv_pairs, sstable_store.clone()).await;
         let cache = create_small_table_cache();
-        let handle = cache.insert(sstable.id, sstable.id, 1, Box::new(sstable));
+        let handle = cache.insert(
+            sstable.id,
+            sstable.id,
+            1,
+            Box::new(sstable),
+            CachePriority::High,
+        );
 
         let backward_iters = vec![BackwardSstableIterator::new(handle, sstable_store)];
         let bmi = UnorderedMergeIteratorInner::new(backward_iters);
@@ -852,7 +925,13 @@ mod tests {
             _ => unimplemented!(),
         };
         let cache = create_small_table_cache();
-        let handle = cache.insert(sstable.id, sstable.id, 1, Box::new(sstable));
+        let handle = cache.insert(
+            sstable.id,
+            sstable.id,
+            1,
+            Box::new(sstable),
+            CachePriority::High,
+        );
         let backward_iters = vec![BackwardSstableIterator::new(handle, sstable_store)];
         let bmi = UnorderedMergeIteratorInner::new(backward_iters);
         let mut bui = BackwardUserIterator::for_test(bmi, (start_bound, end_bound));
@@ -1093,7 +1172,13 @@ mod tests {
         .await;
 
         let cache = create_small_table_cache();
-        let handle0 = cache.insert(table0.id, table0.id, 1, Box::new(table0));
+        let handle0 = cache.insert(
+            table0.id,
+            table0.id,
+            1,
+            Box::new(table0),
+            CachePriority::High,
+        );
 
         let backward_iters = vec![BackwardSstableIterator::new(handle0, sstable_store)];
 
diff --git a/src/storage/src/hummock/iterator/forward_merge.rs b/src/storage/src/hummock/iterator/forward_merge.rs
index a1e43bde20694..df31dcb1b3d24 100644
--- a/src/storage/src/hummock/iterator/forward_merge.rs
+++ b/src/storage/src/hummock/iterator/forward_merge.rs
@@ -20,6 +20,7 @@ mod test {
     use std::task::Poll;
 
     use futures::{pin_mut, FutureExt};
+    use risingwave_common::cache::CachePriority;
     use risingwave_hummock_sdk::key::{FullKey, TableKey, UserKey};
 
     use crate::hummock::iterator::test_utils::{
@@ -173,12 +174,12 @@ mod test {
             OrderedMergeIteratorInner<SstableIterator>,
         > = HummockIteratorUnion::First(UnorderedMergeIteratorInner::new(vec![
             SstableIterator::create(
-                cache.insert(table0.id, table0.id, 1, table0),
+                cache.insert(table0.id, table0.id, 1, table0, CachePriority::High),
                 sstable_store.clone(),
                 read_options.clone(),
             ),
             SstableIterator::create(
-                cache.insert(table1.id, table1.id, 1, table1),
+                cache.insert(table1.id, table1.id, 1, table1, CachePriority::High),
                 sstable_store.clone(),
                 read_options.clone(),
             ),
@@ -280,6 +281,7 @@ mod test {
                     non_overlapped_sstable.id,
                     1,
                     non_overlapped_sstable,
+                    CachePriority::High,
                 ),
                 sstable_store.clone(),
                 read_options.clone(),
@@ -290,6 +292,7 @@ mod test {
                     overlapped_new_sstable.id,
                     1,
                     overlapped_new_sstable,
+                    CachePriority::High,
                 ),
                 sstable_store.clone(),
                 read_options.clone(),
@@ -300,6 +303,7 @@ mod test {
                     overlapped_old_sstable.id,
                     1,
                     overlapped_old_sstable,
+                    CachePriority::High,
                 ),
                 sstable_store.clone(),
                 read_options.clone(),
diff --git a/src/storage/src/hummock/iterator/forward_user.rs b/src/storage/src/hummock/iterator/forward_user.rs
index b14907771b0c6..8769fe286c0a5 100644
--- a/src/storage/src/hummock/iterator/forward_user.rs
+++ b/src/storage/src/hummock/iterator/forward_user.rs
@@ -263,6 +263,8 @@ mod tests {
     use std::ops::Bound::*;
     use std::sync::Arc;
 
+    use risingwave_common::cache::CachePriority;
+
     use super::*;
     use crate::hummock::iterator::test_utils::{
         default_builder_opt_for_test, gen_iterator_test_sstable_base,
@@ -311,17 +313,35 @@ mod tests {
         let cache = create_small_table_cache();
         let iters = vec![
             SstableIterator::create(
-                cache.insert(table0.id, table0.id, 1, Box::new(table0)),
+                cache.insert(
+                    table0.id,
+                    table0.id,
+                    1,
+                    Box::new(table0),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
                 read_options.clone(),
             ),
             SstableIterator::create(
-                cache.insert(table1.id, table1.id, 1, Box::new(table1)),
+                cache.insert(
+                    table1.id,
+                    table1.id,
+                    1,
+                    Box::new(table1),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
                 read_options.clone(),
             ),
             SstableIterator::create(
-                cache.insert(table2.id, table2.id, 1, Box::new(table2)),
+                cache.insert(
+                    table2.id,
+                    table2.id,
+                    1,
+                    Box::new(table2),
+                    CachePriority::High,
+                ),
                 sstable_store,
                 read_options.clone(),
             ),
@@ -378,17 +398,35 @@ mod tests {
         let cache = create_small_table_cache();
         let iters = vec![
             SstableIterator::create(
-                cache.insert(table0.id, table0.id, 1, Box::new(table0)),
+                cache.insert(
+                    table0.id,
+                    table0.id,
+                    1,
+                    Box::new(table0),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
                 read_options.clone(),
             ),
             SstableIterator::create(
-                cache.insert(table1.id, table1.id, 1, Box::new(table1)),
+                cache.insert(
+                    table1.id,
+                    table1.id,
+                    1,
+                    Box::new(table1),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
                 read_options.clone(),
             ),
             SstableIterator::create(
-                cache.insert(table2.id, table2.id, 1, Box::new(table2)),
+                cache.insert(
+                    table2.id,
+                    table2.id,
+                    1,
+                    Box::new(table2),
+                    CachePriority::High,
+                ),
                 sstable_store,
                 read_options,
             ),
@@ -455,12 +493,24 @@ mod tests {
         let cache = create_small_table_cache();
         let iters = vec![
             SstableIterator::create(
-                cache.insert(table0.id, table0.id, 1, Box::new(table0)),
+                cache.insert(
+                    table0.id,
+                    table0.id,
+                    1,
+                    Box::new(table0),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
                 read_options.clone(),
             ),
             SstableIterator::create(
-                cache.insert(table1.id, table1.id, 1, Box::new(table1)),
+                cache.insert(
+                    table1.id,
+                    table1.id,
+                    1,
+                    Box::new(table1),
+                    CachePriority::High,
+                ),
                 sstable_store.clone(),
                 read_options,
             ),
@@ -519,7 +569,7 @@ mod tests {
         let cache = create_small_table_cache();
         let read_options = Arc::new(SstableIteratorReadOptions::default());
         let iters = vec![SstableIterator::create(
-            cache.insert(table.id, table.id, 1, Box::new(table)),
+            cache.insert(table.id, table.id, 1, Box::new(table), CachePriority::High),
             sstable_store,
             read_options,
         )];
@@ -602,7 +652,7 @@ mod tests {
         let cache = create_small_table_cache();
         let read_options = Arc::new(SstableIteratorReadOptions::default());
         let iters = vec![SstableIterator::create(
-            cache.insert(table.id, table.id, 1, Box::new(table)),
+            cache.insert(table.id, table.id, 1, Box::new(table), CachePriority::High),
             sstable_store,
             read_options,
         )];
@@ -670,7 +720,7 @@ mod tests {
         let cache = create_small_table_cache();
         let read_options = Arc::new(SstableIteratorReadOptions::default());
         let iters = vec![SstableIterator::create(
-            cache.insert(table.id, table.id, 1, Box::new(table)),
+            cache.insert(table.id, table.id, 1, Box::new(table), CachePriority::High),
             sstable_store,
             read_options,
         )];
@@ -739,7 +789,7 @@ mod tests {
         let cache = create_small_table_cache();
         let read_options = Arc::new(SstableIteratorReadOptions::default());
         let iters = vec![SstableIterator::create(
-            cache.insert(table.id, table.id, 1, Box::new(table)),
+            cache.insert(table.id, table.id, 1, Box::new(table), CachePriority::High),
             sstable_store,
             read_options,
         )];
@@ -818,7 +868,13 @@ mod tests {
         .await;
         let cache = create_small_table_cache();
         let iters = vec![SstableIterator::create(
-            cache.insert(table0.id, table0.id, 1, Box::new(table0)),
+            cache.insert(
+                table0.id,
+                table0.id,
+                1,
+                Box::new(table0),
+                CachePriority::High,
+            ),
             sstable_store.clone(),
             read_options.clone(),
         )];
@@ -856,7 +912,7 @@ mod tests {
         let read_options = Arc::new(SstableIteratorReadOptions::default());
         let table_id = table.id;
         let iters = vec![SstableIterator::create(
-            cache.insert(table.id, table.id, 1, Box::new(table)),
+            cache.insert(table.id, table.id, 1, Box::new(table), CachePriority::High),
             sstable_store.clone(),
             read_options.clone(),
         )];
diff --git a/src/storage/src/hummock/iterator/test_utils.rs b/src/storage/src/hummock/iterator/test_utils.rs
index 55810400d1293..4d1fa1fdd1404 100644
--- a/src/storage/src/hummock/iterator/test_utils.rs
+++ b/src/storage/src/hummock/iterator/test_utils.rs
@@ -17,6 +17,7 @@ use std::sync::Arc;
 
 use bytes::Bytes;
 use itertools::Itertools;
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::TableId;
 use risingwave_hummock_sdk::key::{FullKey, UserKey};
 use risingwave_hummock_sdk::{HummockEpoch, HummockSstableObjectId};
@@ -68,6 +69,7 @@ pub fn mock_sstable_store_with_object_store(store: ObjectStoreRef) -> SstableSto
         path,
         64 << 20,
         64 << 20,
+        0,
         TieredCache::none(),
     ))
 }
@@ -205,7 +207,7 @@ pub async fn gen_merge_iterator_interleave_test_sstable_iters(
             key_count,
         )
         .await;
-        let handle = cache.insert(table.id, table.id, 1, Box::new(table));
+        let handle = cache.insert(table.id, table.id, 1, Box::new(table), CachePriority::High);
         result.push(SstableIterator::create(
             handle,
             sstable_store.clone(),
diff --git a/src/storage/src/hummock/mod.rs b/src/storage/src/hummock/mod.rs
index 586e06aebe7cf..a50547d0478db 100644
--- a/src/storage/src/hummock/mod.rs
+++ b/src/storage/src/hummock/mod.rs
@@ -383,7 +383,7 @@ pub async fn get_from_sstable_info(
     let mut iter = SstableIterator::create(
         sstable,
         sstable_store_ref.clone(),
-        Arc::new(SstableIteratorReadOptions::default()),
+        Arc::new(SstableIteratorReadOptions::from(read_options)),
     );
     iter.seek(full_key).await?;
     // Iterator has sought passed the borders.
diff --git a/src/storage/src/hummock/observer_manager.rs b/src/storage/src/hummock/observer_manager.rs
index 43cd67fb4f89a..5065b4f2619b7 100644
--- a/src/storage/src/hummock/observer_manager.rs
+++ b/src/storage/src/hummock/observer_manager.rs
@@ -21,6 +21,7 @@ use risingwave_hummock_sdk::filter_key_extractor::{
 };
 use risingwave_pb::catalog::Table;
 use risingwave_pb::hummock::version_update_payload;
+use risingwave_pb::meta::relation::RelationInfo;
 use risingwave_pb::meta::subscribe_response::{Info, Operation};
 use risingwave_pb::meta::SubscribeResponse;
 use tokio::sync::mpsc::UnboundedSender;
@@ -46,19 +47,25 @@ impl ObserverState for HummockObserverNode {
         };
 
         match info.to_owned() {
-            Info::Table(table_catalog) => {
-                assert!(
-                    resp.version > self.version,
-                    "resp version={:?}, current version={:?}",
-                    resp.version,
-                    self.version
-                );
-
-                self.handle_catalog_notification(resp.operation(), table_catalog);
-
-                self.version = resp.version;
+            Info::RelationGroup(relation_group) => {
+                for relation in relation_group.relations {
+                    match relation.relation_info.unwrap() {
+                        RelationInfo::Table(table_catalog) => {
+                            assert!(
+                                resp.version > self.version,
+                                "resp version={:?}, current version={:?}",
+                                resp.version,
+                                self.version
+                            );
+
+                            self.handle_catalog_notification(resp.operation(), table_catalog);
+
+                            self.version = resp.version;
+                        }
+                        _ => panic!("error type notification"),
+                    };
+                }
             }
-
             Info::HummockVersionDeltas(hummock_version_deltas) => {
                 let _ = self
                     .version_update_sender
diff --git a/src/storage/src/hummock/sstable/backward_sstable_iterator.rs b/src/storage/src/hummock/sstable/backward_sstable_iterator.rs
index d36ebd1c2443d..2ffb9629941ac 100644
--- a/src/storage/src/hummock/sstable/backward_sstable_iterator.rs
+++ b/src/storage/src/hummock/sstable/backward_sstable_iterator.rs
@@ -16,6 +16,7 @@ use std::cmp::Ordering::{Equal, Less};
 use std::future::Future;
 use std::sync::Arc;
 
+use risingwave_common::cache::CachePriority;
 use risingwave_hummock_sdk::key::FullKey;
 
 use crate::hummock::iterator::{Backward, HummockIterator};
@@ -67,7 +68,7 @@ impl BackwardSstableIterator {
                 .get(
                     self.sst.value(),
                     idx as usize,
-                    crate::hummock::CachePolicy::Fill,
+                    crate::hummock::CachePolicy::Fill(CachePriority::High),
                     &mut self.stats,
                 )
                 .await?;
@@ -197,7 +198,7 @@ mod tests {
         // path.
         assert!(sstable.meta.block_metas.len() > 10);
         let cache = create_small_table_cache();
-        let handle = cache.insert(0, 0, 1, Box::new(sstable));
+        let handle = cache.insert(0, 0, 1, Box::new(sstable), CachePriority::High);
         let mut sstable_iter = BackwardSstableIterator::new(handle, sstable_store);
         let mut cnt = TEST_KEYS_COUNT;
         sstable_iter.rewind().await.unwrap();
@@ -224,7 +225,7 @@ mod tests {
         // path.
         assert!(sstable.meta.block_metas.len() > 10);
         let cache = create_small_table_cache();
-        let handle = cache.insert(0, 0, 1, Box::new(sstable));
+        let handle = cache.insert(0, 0, 1, Box::new(sstable), CachePriority::High);
         let mut sstable_iter = BackwardSstableIterator::new(handle, sstable_store);
         let mut all_key_to_test = (0..TEST_KEYS_COUNT).collect_vec();
         let mut rng = thread_rng();
diff --git a/src/storage/src/hummock/sstable/forward_sstable_iterator.rs b/src/storage/src/hummock/sstable/forward_sstable_iterator.rs
index af62ba157e708..7109d1a7ef65c 100644
--- a/src/storage/src/hummock/sstable/forward_sstable_iterator.rs
+++ b/src/storage/src/hummock/sstable/forward_sstable_iterator.rs
@@ -25,7 +25,8 @@ use super::Sstable;
 use crate::hummock::iterator::{Forward, HummockIterator};
 use crate::hummock::sstable::SstableIteratorReadOptions;
 use crate::hummock::{
-    BlockHolder, BlockIterator, BlockResponse, SstableStore, SstableStoreRef, TableHolder,
+    BlockHolder, BlockIterator, BlockResponse, CachePolicy, SstableStore, SstableStoreRef,
+    TableHolder,
 };
 use crate::monitor::StoreLocalStatistic;
 
@@ -40,7 +41,7 @@ pub trait SstableIteratorType: HummockIterator + 'static {
 /// Prefetching may increase the memory footprint of the CN process because the prefetched blocks
 /// cannot be evicted.
 enum BlockFetcher {
-    Simple,
+    Simple(SimpleFetchContext),
     Prefetch(PrefetchContext),
 }
 
@@ -53,9 +54,9 @@ impl BlockFetcher {
         stats: &mut StoreLocalStatistic,
     ) -> HummockResult<BlockHolder> {
         match self {
-            BlockFetcher::Simple => {
+            BlockFetcher::Simple(context) => {
                 sstable_store
-                    .get(sst, block_idx, crate::hummock::CachePolicy::Fill, stats)
+                    .get(sst, block_idx, context.cache_policy, stats)
                     .await
             }
             BlockFetcher::Prefetch(context) => {
@@ -67,20 +68,27 @@ impl BlockFetcher {
     }
 }
 
+struct SimpleFetchContext {
+    cache_policy: CachePolicy,
+}
+
 struct PrefetchContext {
     prefetched_blocks: VecDeque<(usize, BlockResponse)>,
 
     /// block[cur_idx..=dest_idx] will definitely be visited in the future.
     dest_idx: usize,
+
+    cache_policy: CachePolicy,
 }
 
 const DEFAULT_PREFETCH_BLOCK_NUM: usize = 1;
 
 impl PrefetchContext {
-    fn new(dest_idx: usize) -> Self {
+    fn new(dest_idx: usize, cache_policy: CachePolicy) -> Self {
         Self {
             prefetched_blocks: VecDeque::with_capacity(DEFAULT_PREFETCH_BLOCK_NUM + 1),
             dest_idx,
+            cache_policy,
         }
     }
 
@@ -106,7 +114,7 @@ impl PrefetchContext {
             self.prefetched_blocks.push_back((
                 idx,
                 sstable_store
-                    .get_block_response(sst, idx, crate::hummock::CachePolicy::Fill, stats)
+                    .get_block_response(sst, idx, self.cache_policy, stats)
                     .await?,
             ));
         }
@@ -121,12 +129,7 @@ impl PrefetchContext {
             self.prefetched_blocks.push_back((
                 next_prefetch_idx,
                 sstable_store
-                    .get_block_response(
-                        sst,
-                        next_prefetch_idx,
-                        crate::hummock::CachePolicy::Fill,
-                        stats,
-                    )
+                    .get_block_response(sst, next_prefetch_idx, self.cache_policy, stats)
                     .await?,
             ));
         }
@@ -163,7 +166,9 @@ impl SstableIterator {
         Self {
             block_iter: None,
             cur_idx: 0,
-            block_fetcher: BlockFetcher::Simple,
+            block_fetcher: BlockFetcher::Simple(SimpleFetchContext {
+                cache_policy: options.cache_policy,
+            }),
             sst: sstable,
             sstable_store,
             stats: StoreLocalStatistic::default(),
@@ -211,7 +216,10 @@ impl SstableIterator {
                     }
                 };
                 if start_idx < dest_idx {
-                    self.block_fetcher = BlockFetcher::Prefetch(PrefetchContext::new(dest_idx));
+                    self.block_fetcher = BlockFetcher::Prefetch(PrefetchContext::new(
+                        dest_idx,
+                        self.options.cache_policy,
+                    ));
                 }
             }
         }
@@ -344,6 +352,7 @@ impl SstableIteratorType for SstableIterator {
 mod tests {
     use itertools::Itertools;
     use rand::prelude::*;
+    use risingwave_common::cache::CachePriority;
     use risingwave_common::catalog::TableId;
 
     use super::*;
@@ -389,7 +398,7 @@ mod tests {
         assert!(sstable.meta.block_metas.len() > 10);
 
         let cache = create_small_table_cache();
-        let handle = cache.insert(0, 0, 1, Box::new(sstable));
+        let handle = cache.insert(0, 0, 1, Box::new(sstable), CachePriority::High);
         inner_test_forward_iterator(sstable_store.clone(), handle).await;
     }
 
@@ -403,7 +412,7 @@ mod tests {
         // path.
         assert!(sstable.meta.block_metas.len() > 10);
         let cache = create_small_table_cache();
-        let handle = cache.insert(0, 0, 1, Box::new(sstable));
+        let handle = cache.insert(0, 0, 1, Box::new(sstable), CachePriority::High);
 
         let mut sstable_iter = SstableIterator::create(
             handle,
@@ -497,7 +506,7 @@ mod tests {
                 .unwrap(),
             sstable_store,
             Arc::new(SstableIteratorReadOptions {
-                prefetch: true,
+                cache_policy: CachePolicy::Fill(CachePriority::High),
                 must_iterated_end_user_key: None,
             }),
         );
diff --git a/src/storage/src/hummock/sstable/mod.rs b/src/storage/src/hummock/sstable/mod.rs
index b0ff85c521d9a..dce0105853f2b 100644
--- a/src/storage/src/hummock/sstable/mod.rs
+++ b/src/storage/src/hummock/sstable/mod.rs
@@ -62,6 +62,8 @@ use xxhash_rust::{xxh32, xxh64};
 
 use self::utils::{xxhash64_checksum, xxhash64_verify};
 use super::{HummockError, HummockResult};
+use crate::hummock::CachePolicy;
+use crate::store::ReadOptions;
 
 const DEFAULT_META_BUFFER_CAPACITY: usize = 4096;
 const MAGIC: u32 = 0x5785ab73;
@@ -283,6 +285,7 @@ impl SstableMeta {
     /// | estimated size (4B) | key count (4B) |
     /// | smallest key len (4B) | smallest key |
     /// | largest key len (4B) | largest key |
+    /// | M (4B) |
     /// | range-tombstone 0 | ... | range-tombstone M-1 |
     /// | file offset of this meta block (8B) |
     /// | checksum (8B) | version (4B) | magic (4B) |
@@ -397,10 +400,19 @@ impl SstableMeta {
 
 #[derive(Default)]
 pub struct SstableIteratorReadOptions {
-    pub prefetch: bool,
+    pub cache_policy: CachePolicy,
     pub must_iterated_end_user_key: Option<Bound<UserKey<KeyPayloadType>>>,
 }
 
+impl From<&ReadOptions> for SstableIteratorReadOptions {
+    fn from(read_options: &ReadOptions) -> Self {
+        Self {
+            cache_policy: read_options.cache_policy,
+            must_iterated_end_user_key: None,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/storage/src/hummock/sstable_store.rs b/src/storage/src/hummock/sstable_store.rs
index 7761f52712b9c..66a7d3f3f2dbb 100644
--- a/src/storage/src/hummock/sstable_store.rs
+++ b/src/storage/src/hummock/sstable_store.rs
@@ -19,7 +19,7 @@ use await_tree::InstrumentAwait;
 use bytes::{Buf, BufMut, Bytes};
 use fail::fail_point;
 use itertools::Itertools;
-use risingwave_common::cache::LruCacheEventListener;
+use risingwave_common::cache::{CachePriority, LruCacheEventListener};
 use risingwave_hummock_sdk::HummockSstableObjectId;
 use risingwave_object_store::object::{
     BlockLocation, MonitoredStreamingReader, ObjectError, ObjectMetadata, ObjectStoreRef,
@@ -105,11 +105,17 @@ pub enum CachePolicy {
     /// Disable read cache and not fill the cache afterwards.
     Disable,
     /// Try reading the cache and fill the cache afterwards.
-    Fill,
+    Fill(CachePriority),
     /// Read the cache but not fill the cache afterwards.
     NotFill,
 }
 
+impl Default for CachePolicy {
+    fn default() -> Self {
+        CachePolicy::Fill(CachePriority::High)
+    }
+}
+
 pub struct SstableStore {
     path: String,
     store: ObjectStoreRef,
@@ -124,6 +130,7 @@ impl SstableStore {
         path: String,
         block_cache_capacity: usize,
         meta_cache_capacity: usize,
+        high_priority_ratio: usize,
         tiered_cache: TieredCache<(HummockSstableObjectId, u64), Box<Block>>,
     ) -> Self {
         // TODO: We should validate path early. Otherwise object store won't report invalid path
@@ -132,7 +139,7 @@ impl SstableStore {
         while (meta_cache_capacity >> shard_bits) < MIN_BUFFER_SIZE_PER_SHARD && shard_bits > 0 {
             shard_bits -= 1;
         }
-        let meta_cache = Arc::new(LruCache::new(shard_bits, meta_cache_capacity));
+        let meta_cache = Arc::new(LruCache::new(shard_bits, meta_cache_capacity, 0));
         let listener = Arc::new(BlockCacheEventListener {
             tiered_cache: tiered_cache.clone(),
         });
@@ -143,6 +150,7 @@ impl SstableStore {
             block_cache: BlockCache::with_event_listener(
                 block_cache_capacity,
                 MAX_CACHE_SHARD_BITS,
+                high_priority_ratio,
                 listener,
             ),
             meta_cache,
@@ -158,12 +166,12 @@ impl SstableStore {
         block_cache_capacity: usize,
         meta_cache_capacity: usize,
     ) -> Self {
-        let meta_cache = Arc::new(LruCache::new(0, meta_cache_capacity));
+        let meta_cache = Arc::new(LruCache::new(0, meta_cache_capacity, 0));
         let tiered_cache = TieredCache::none();
         Self {
             path,
             store,
-            block_cache: BlockCache::new(block_cache_capacity, 0),
+            block_cache: BlockCache::new(block_cache_capacity, 0, 0),
             meta_cache,
             tiered_cache,
         }
@@ -261,11 +269,12 @@ impl SstableStore {
         };
 
         match policy {
-            CachePolicy::Fill => {
-                Ok(self
-                    .block_cache
-                    .get_or_insert_with(object_id, block_index as u64, fetch_block))
-            }
+            CachePolicy::Fill(priority) => Ok(self.block_cache.get_or_insert_with(
+                object_id,
+                block_index as u64,
+                priority,
+                fetch_block,
+            )),
             CachePolicy::NotFill => match self.block_cache.get(object_id, block_index as u64) {
                 Some(block) => Ok(BlockResponse::Block(block)),
                 None => match self
@@ -351,29 +360,34 @@ impl SstableStore {
         let object_id = sst.get_object_id();
         let result = self
             .meta_cache
-            .lookup_with_request_dedup::<_, HummockError, _>(object_id, object_id, || {
-                let store = self.store.clone();
-                let meta_path = self.get_sst_data_path(object_id);
-                local_cache_meta_block_miss += 1;
-                let stats_ptr = stats.remote_io_time.clone();
-                let loc = BlockLocation {
-                    offset: sst.meta_offset as usize,
-                    size: (sst.file_size - sst.meta_offset) as usize,
-                };
-                async move {
-                    let now = minstant::Instant::now();
-                    let buf = store
-                        .read(&meta_path, Some(loc))
-                        .await
-                        .map_err(HummockError::object_io_error)?;
-                    let meta = SstableMeta::decode(&mut &buf[..])?;
-                    let sst = Sstable::new(object_id, meta);
-                    let charge = sst.estimate_size();
-                    let add = (now.elapsed().as_secs_f64() * 1000.0).ceil();
-                    stats_ptr.fetch_add(add as u64, Ordering::Relaxed);
-                    Ok((Box::new(sst), charge))
-                }
-            })
+            .lookup_with_request_dedup::<_, HummockError, _>(
+                object_id,
+                object_id,
+                CachePriority::High,
+                || {
+                    let store = self.store.clone();
+                    let meta_path = self.get_sst_data_path(object_id);
+                    local_cache_meta_block_miss += 1;
+                    let stats_ptr = stats.remote_io_time.clone();
+                    let loc = BlockLocation {
+                        offset: sst.meta_offset as usize,
+                        size: (sst.file_size - sst.meta_offset) as usize,
+                    };
+                    async move {
+                        let now = minstant::Instant::now();
+                        let buf = store
+                            .read(&meta_path, Some(loc))
+                            .await
+                            .map_err(HummockError::object_io_error)?;
+                        let meta = SstableMeta::decode(&mut &buf[..])?;
+                        let sst = Sstable::new(object_id, meta);
+                        let charge = sst.estimate_size();
+                        let add = (now.elapsed().as_secs_f64() * 1000.0).ceil();
+                        stats_ptr.fetch_add(add as u64, Ordering::Relaxed);
+                        Ok((Box::new(sst), charge))
+                    }
+                },
+            )
             .verbose_instrument_await("meta_cache_lookup")
             .await;
         result.map(|table_holder| (table_holder, local_cache_meta_block_miss))
@@ -410,8 +424,13 @@ impl SstableStore {
     pub fn insert_meta_cache(&self, object_id: HummockSstableObjectId, meta: SstableMeta) {
         let sst = Sstable::new(object_id, meta);
         let charge = sst.estimate_size();
-        self.meta_cache
-            .insert(object_id, object_id, charge, Box::new(sst));
+        self.meta_cache.insert(
+            object_id,
+            object_id,
+            charge,
+            Box::new(sst),
+            CachePriority::High,
+        );
     }
 
     pub fn insert_block_cache(
@@ -420,7 +439,8 @@ impl SstableStore {
         block_index: u64,
         block: Box<Block>,
     ) {
-        self.block_cache.insert(object_id, block_index, block);
+        self.block_cache
+            .insert(object_id, block_index, block, CachePriority::High);
     }
 
     pub fn get_meta_memory_usage(&self) -> u64 {
@@ -566,7 +586,7 @@ impl SstableWriter for BatchUploadWriter {
 
     async fn write_block(&mut self, block: &[u8], meta: &BlockMeta) -> HummockResult<()> {
         self.buf.extend_from_slice(block);
-        if let CachePolicy::Fill = self.policy {
+        if let CachePolicy::Fill(_) = self.policy {
             self.block_info.push(Block::decode(
                 Bytes::from(block.to_vec()),
                 meta.uncompressed_size as usize,
@@ -596,7 +616,7 @@ impl SstableWriter for BatchUploadWriter {
             self.sstable_store.insert_meta_cache(self.object_id, meta);
 
             // Add block cache.
-            if CachePolicy::Fill == self.policy {
+            if let CachePolicy::Fill(fill_cache_priority) = self.policy {
                 // The `block_info` may be empty when there is only range-tombstones, because we
                 //  store them in meta-block.
                 for (block_idx, block) in self.block_info.into_iter().enumerate() {
@@ -604,6 +624,7 @@ impl SstableWriter for BatchUploadWriter {
                         self.object_id,
                         block_idx as u64,
                         Box::new(block),
+                        fill_cache_priority,
                     );
                 }
             }
@@ -655,7 +676,7 @@ impl SstableWriter for StreamingUploadWriter {
     async fn write_block(&mut self, block_data: &[u8], meta: &BlockMeta) -> HummockResult<()> {
         self.data_len += block_data.len();
         let block_data = Bytes::from(block_data.to_vec());
-        if let CachePolicy::Fill = self.policy {
+        if let CachePolicy::Fill(_) = self.policy {
             let block = Block::decode(block_data.clone(), meta.uncompressed_size as usize)?;
             self.blocks.push(block);
         }
@@ -690,13 +711,14 @@ impl SstableWriter for StreamingUploadWriter {
             self.sstable_store.insert_meta_cache(self.object_id, meta);
 
             // Add block cache.
-            if let CachePolicy::Fill = self.policy {
+            if let CachePolicy::Fill(fill_high_priority_cache) = self.policy {
                 debug_assert!(!self.blocks.is_empty());
                 for (block_idx, block) in self.blocks.into_iter().enumerate() {
                     self.sstable_store.block_cache.insert(
                         self.object_id,
                         block_idx as u64,
                         Box::new(block),
+                        fill_high_priority_cache,
                     );
                 }
             }
diff --git a/src/storage/src/hummock/store/version.rs b/src/storage/src/hummock/store/version.rs
index f6ef7308daf11..6839ddda15e51 100644
--- a/src/storage/src/hummock/store/version.rs
+++ b/src/storage/src/hummock/store/version.rs
@@ -583,7 +583,7 @@ impl HummockVersionReader {
             staging_iters.push(HummockIteratorUnion::Second(SstableIterator::new(
                 table_holder,
                 self.sstable_store.clone(),
-                Arc::new(SstableIteratorReadOptions::default()),
+                Arc::new(SstableIteratorReadOptions::from(&read_options)),
             )));
         }
         local_stats.staging_sst_iter_count = staging_sst_iter_count;
@@ -637,6 +637,7 @@ impl HummockVersionReader {
             for sstable_info in fetch_meta_req {
                 let inner_req_count = req_count;
                 let capture_ref = async {
+                    // We would fill block to high priority cache for level-0
                     self.sstable_store
                         .sstable_syncable(sstable_info, &local_stats)
                         .in_span(Span::enter_with_local_parent("get_sstable"))
@@ -662,7 +663,7 @@ impl HummockVersionReader {
         drop(buffered);
         timer.observe_duration();
 
-        let mut sst_read_options = SstableIteratorReadOptions::default();
+        let mut sst_read_options = SstableIteratorReadOptions::from(&read_options);
         if read_options.prefetch_options.exhaust_iter {
             sst_read_options.must_iterated_end_user_key =
                 Some(user_key_range.1.map(|key| key.cloned()));
diff --git a/src/storage/src/hummock/test_utils.rs b/src/storage/src/hummock/test_utils.rs
index af149f1ac728b..13a6523fabbb8 100644
--- a/src/storage/src/hummock/test_utils.rs
+++ b/src/storage/src/hummock/test_utils.rs
@@ -50,6 +50,7 @@ pub fn default_opts_for_test() -> StorageOpts {
         write_conflict_detection_enabled: true,
         block_cache_capacity_mb: 64,
         meta_cache_capacity_mb: 64,
+        high_priority_ratio: 0,
         disable_remote_compactor: false,
         enable_local_spill: false,
         local_object_store: "memory".to_string(),
@@ -344,5 +345,5 @@ pub async fn count_stream<T>(s: impl Stream<Item = StorageResult<T>> + Send) ->
 }
 
 pub fn create_small_table_cache() -> Arc<LruCache<HummockSstableObjectId, Box<Sstable>>> {
-    Arc::new(LruCache::new(1, 4))
+    Arc::new(LruCache::new(1, 4, 0))
 }
diff --git a/src/storage/src/hummock/utils.rs b/src/storage/src/hummock/utils.rs
index cb2a0fb29fe58..35373f857eaa7 100644
--- a/src/storage/src/hummock/utils.rs
+++ b/src/storage/src/hummock/utils.rs
@@ -20,6 +20,7 @@ use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering};
 use std::sync::Arc;
 
 use bytes::Bytes;
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::{TableId, TableOption};
 use risingwave_hummock_sdk::can_concat;
 use risingwave_hummock_sdk::key::{
@@ -30,6 +31,7 @@ use tokio::sync::Notify;
 
 use super::{HummockError, HummockResult};
 use crate::error::StorageResult;
+use crate::hummock::CachePolicy;
 use crate::mem_table::{KeyOp, MemTableError};
 use crate::store::{ReadOptions, StateStoreRead};
 
@@ -352,6 +354,7 @@ pub(crate) async fn do_insert_sanity_check(
         ignore_range_tombstone: false,
         read_version_from_backup: false,
         prefetch_options: Default::default(),
+        cache_policy: CachePolicy::Fill(CachePriority::High),
     };
     let stored_value = inner.get(key.clone(), epoch, read_options).await?;
 
@@ -382,6 +385,7 @@ pub(crate) async fn do_delete_sanity_check(
         ignore_range_tombstone: false,
         read_version_from_backup: false,
         prefetch_options: Default::default(),
+        cache_policy: CachePolicy::Fill(CachePriority::High),
     };
     match inner.get(key.clone(), epoch, read_options).await? {
         None => Err(Box::new(MemTableError::InconsistentOperation {
@@ -422,6 +426,7 @@ pub(crate) async fn do_update_sanity_check(
         table_id,
         read_version_from_backup: false,
         prefetch_options: Default::default(),
+        cache_policy: CachePolicy::Fill(CachePriority::High),
     };
 
     match inner.get(key.clone(), epoch, read_options).await? {
diff --git a/src/storage/src/hummock/validator.rs b/src/storage/src/hummock/validator.rs
index de14532414ce2..1a0128685fe29 100644
--- a/src/storage/src/hummock/validator.rs
+++ b/src/storage/src/hummock/validator.rs
@@ -23,7 +23,7 @@ use risingwave_pb::hummock::ValidationTask;
 use crate::hummock::iterator::HummockIterator;
 use crate::hummock::sstable::SstableIteratorReadOptions;
 use crate::hummock::sstable_store::SstableStoreRef;
-use crate::hummock::SstableIterator;
+use crate::hummock::{CachePolicy, SstableIterator};
 use crate::monitor::StoreLocalStatistic;
 
 /// Validate SSTs in terms of Ordered, Locally unique and Globally unique.
@@ -58,7 +58,10 @@ pub async fn validate_ssts(task: ValidationTask, sstable_store: SstableStoreRef)
         let mut iter = SstableIterator::new(
             holder,
             sstable_store.clone(),
-            Arc::new(SstableIteratorReadOptions::default()),
+            Arc::new(SstableIteratorReadOptions {
+                cache_policy: CachePolicy::NotFill,
+                must_iterated_end_user_key: None,
+            }),
         );
         let mut previous_key: Option<FullKey<Vec<u8>>> = None;
         if let Err(err) = iter.rewind().await {
diff --git a/src/storage/src/hummock/value.rs b/src/storage/src/hummock/value.rs
index 70f32bba0e0c8..d5eae5ad0deac 100644
--- a/src/storage/src/hummock/value.rs
+++ b/src/storage/src/hummock/value.rs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::fmt::Debug;
+
 use bytes::{Buf, BufMut, Bytes};
 
 use super::{HummockError, HummockResult};
@@ -24,12 +26,23 @@ pub const VALUE_PUT: u8 = 0;
 ///
 /// Its encoding is a 1-byte flag + storage value. For `Put`, storage value contains both value meta
 /// and user value. For `Delete`, storage value contains only value meta.
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub enum HummockValue<T> {
     Put(T),
     Delete,
 }
 
+impl<T: AsRef<[u8]>> Debug for HummockValue<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match &self {
+            HummockValue::Put(v) => {
+                write!(f, "HummockValue {{ PUT, {} }}", hex::encode(v.as_ref()))
+            }
+            HummockValue::Delete => write!(f, "HummockValue {{ DELETE }}"),
+        }
+    }
+}
+
 impl<T> Copy for HummockValue<T> where T: Copy {}
 
 impl<T: PartialEq> PartialEq for HummockValue<T> {
diff --git a/src/storage/src/opts.rs b/src/storage/src/opts.rs
index 9fd919a6ef51b..e196366a3c751 100644
--- a/src/storage/src/opts.rs
+++ b/src/storage/src/opts.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use risingwave_common::config::RwConfig;
+use risingwave_common::config::{extract_storage_memory_config, RwConfig, StorageMemoryConfig};
 use risingwave_common::system_param::default_system_params;
 use risingwave_common::system_param::reader::SystemParamsReader;
 
@@ -40,6 +40,8 @@ pub struct StorageOpts {
     pub block_cache_capacity_mb: usize,
     /// Capacity of sstable meta cache.
     pub meta_cache_capacity_mb: usize,
+    /// Percent of the ratio of high priority data in block-cache
+    pub high_priority_ratio: usize,
     pub disable_remote_compactor: bool,
     pub enable_local_spill: bool,
     /// Local object store root. We should call `get_local_object_store` to get the object store.
@@ -73,12 +75,13 @@ impl Default for StorageOpts {
     fn default() -> Self {
         let c = RwConfig::default();
         let p = default_system_params();
-        Self::from((&c, &p.into()))
+        let s = extract_storage_memory_config(&c);
+        Self::from((&c, &p.into(), &s))
     }
 }
 
-impl From<(&RwConfig, &SystemParamsReader)> for StorageOpts {
-    fn from((c, p): (&RwConfig, &SystemParamsReader)) -> Self {
+impl From<(&RwConfig, &SystemParamsReader, &StorageMemoryConfig)> for StorageOpts {
+    fn from((c, p, s): (&RwConfig, &SystemParamsReader, &StorageMemoryConfig)) -> Self {
         Self {
             sstable_size_mb: p.sstable_size_mb(),
             block_size_kb: p.block_size_kb(),
@@ -87,23 +90,24 @@ impl From<(&RwConfig, &SystemParamsReader)> for StorageOpts {
             share_buffer_compaction_worker_threads_number: c
                 .storage
                 .share_buffer_compaction_worker_threads_number,
-            shared_buffer_capacity_mb: c.storage.shared_buffer_capacity_mb,
+            shared_buffer_capacity_mb: s.shared_buffer_capacity_mb,
             data_directory: p.data_directory().to_string(),
             write_conflict_detection_enabled: c.storage.write_conflict_detection_enabled,
-            block_cache_capacity_mb: c.storage.block_cache_capacity_mb,
-            meta_cache_capacity_mb: c.storage.meta_cache_capacity_mb,
+            high_priority_ratio: s.high_priority_ratio_in_percent,
+            block_cache_capacity_mb: s.block_cache_capacity_mb,
+            meta_cache_capacity_mb: s.meta_cache_capacity_mb,
             disable_remote_compactor: c.storage.disable_remote_compactor,
             enable_local_spill: c.storage.enable_local_spill,
             local_object_store: c.storage.local_object_store.to_string(),
             share_buffer_upload_concurrency: c.storage.share_buffer_upload_concurrency,
-            compactor_memory_limit_mb: c.storage.compactor_memory_limit_mb,
+            compactor_memory_limit_mb: s.compactor_memory_limit_mb,
             sstable_id_remote_fetch_number: c.storage.sstable_id_remote_fetch_number,
             min_sst_size_for_streaming_upload: c.storage.min_sst_size_for_streaming_upload,
             max_sub_compaction: c.storage.max_sub_compaction,
             max_concurrent_compaction_task_number: c.storage.max_concurrent_compaction_task_number,
             file_cache_dir: c.storage.file_cache.dir.clone(),
             file_cache_capacity_mb: c.storage.file_cache.capacity_mb,
-            file_cache_total_buffer_capacity_mb: c.storage.file_cache.total_buffer_capacity_mb,
+            file_cache_total_buffer_capacity_mb: s.file_cache_total_buffer_capacity_mb,
             file_cache_file_fallocate_unit_mb: c.storage.file_cache.cache_file_fallocate_unit_mb,
             file_cache_meta_fallocate_unit_mb: c.storage.file_cache.cache_meta_fallocate_unit_mb,
             file_cache_file_max_write_size_mb: c.storage.file_cache.cache_file_max_write_size_mb,
diff --git a/src/storage/src/store.rs b/src/storage/src/store.rs
index 1ccc2a0a72c66..85e5e5e303d07 100644
--- a/src/storage/src/store.rs
+++ b/src/storage/src/store.rs
@@ -25,6 +25,7 @@ use risingwave_hummock_sdk::key::{FullKey, KeyPayloadType};
 use risingwave_hummock_sdk::{HummockReadEpoch, LocalSstableInfo};
 
 use crate::error::{StorageError, StorageResult};
+use crate::hummock::CachePolicy;
 use crate::monitor::{MonitoredStateStore, MonitoredStorageMetrics};
 use crate::storage_value::StorageValue;
 use crate::write_batch::WriteBatch;
@@ -335,6 +336,7 @@ pub struct ReadOptions {
     pub prefix_hint: Option<Bytes>,
     pub ignore_range_tombstone: bool,
     pub prefetch_options: PrefetchOptions,
+    pub cache_policy: CachePolicy,
 
     pub retention_seconds: Option<u32>,
     pub table_id: TableId,
diff --git a/src/storage/src/store_impl.rs b/src/storage/src/store_impl.rs
index 105d37e4ce121..ffcb410835674 100644
--- a/src/storage/src/store_impl.rs
+++ b/src/storage/src/store_impl.rs
@@ -595,6 +595,7 @@ impl StateStoreImpl {
                     opts.data_directory.to_string(),
                     opts.block_cache_capacity_mb * (1 << 20),
                     opts.meta_cache_capacity_mb * (1 << 20),
+                    opts.high_priority_ratio,
                     tiered_cache,
                 ));
                 let notification_client =
diff --git a/src/storage/src/table/batch_table/storage_table.rs b/src/storage/src/table/batch_table/storage_table.rs
index 4d5dbec793e9f..ffbe57ff71e8b 100644
--- a/src/storage/src/table/batch_table/storage_table.rs
+++ b/src/storage/src/table/batch_table/storage_table.rs
@@ -25,9 +25,8 @@ use futures::{Stream, StreamExt};
 use futures_async_stream::try_stream;
 use itertools::{Either, Itertools};
 use risingwave_common::buffer::Bitmap;
-use risingwave_common::catalog::{
-    get_dist_key_in_pk_indices, ColumnDesc, ColumnId, Schema, TableId, TableOption,
-};
+use risingwave_common::cache::CachePriority;
+use risingwave_common::catalog::{ColumnDesc, ColumnId, Schema, TableId, TableOption};
 use risingwave_common::hash::{VirtualNode, VnodeBitmapExt};
 use risingwave_common::row::{self, OwnedRow, Row, RowExt};
 use risingwave_common::util::ordered::*;
@@ -42,6 +41,7 @@ use tracing::trace;
 
 use super::iter_utils;
 use crate::error::{StorageError, StorageResult};
+use crate::hummock::CachePolicy;
 use crate::row_serde::row_serde_util::{
     parse_raw_key_to_vnode_and_key, serialize_pk, serialize_pk_with_vnode,
 };
@@ -183,7 +183,7 @@ impl<S: StateStore> StorageTableInner<S, EitherSerde> {
         order_types: Vec<OrderType>,
         pk_indices: Vec<usize>,
         Distribution {
-            dist_key_indices,
+            dist_key_in_pk_indices,
             vnodes,
         }: Distribution,
         table_option: TableOption,
@@ -244,7 +244,6 @@ impl<S: StateStore> StorageTableInner<S, EitherSerde> {
             }
         };
 
-        let dist_key_in_pk_indices = get_dist_key_in_pk_indices(&dist_key_indices, &pk_indices);
         let key_output_indices = match key_output_indices.is_empty() {
             true => None,
             false => Some(key_output_indices),
@@ -340,6 +339,7 @@ impl<S: StateStore, SD: ValueRowSerde> StorageTableInner<S, SD> {
             table_id: self.table_id,
             read_version_from_backup: read_backup,
             prefetch_options: Default::default(),
+            cache_policy: CachePolicy::Fill(CachePriority::High),
         };
         if let Some(value) = self.store.get(serialized_pk, epoch, read_options).await? {
             // Refer to [`StorageTableInnerIterInner::new`] for necessity of `validate_read_epoch`.
@@ -382,6 +382,13 @@ impl<S: StateStore, SD: ValueRowSerde> StorageTableInner<S, SD> {
             Ok(None)
         }
     }
+
+    /// Update the vnode bitmap of the storage table, returns the previous vnode bitmap.
+    #[must_use = "the executor should decide whether to manipulate the cache based on the previous vnode bitmap"]
+    pub fn update_vnode_bitmap(&mut self, new_vnodes: Arc<Bitmap>) -> Arc<Bitmap> {
+        assert_eq!(self.vnodes.len(), new_vnodes.len());
+        std::mem::replace(&mut self.vnodes, new_vnodes)
+    }
 }
 
 pub trait PkAndRowStream = Stream<Item = StorageResult<(Vec<u8>, OwnedRow)>> + Send;
@@ -413,6 +420,16 @@ impl<S: StateStore, SD: ValueRowSerde> StorageTableInner<S, SD> {
         ordered: bool,
         prefetch_options: PrefetchOptions,
     ) -> StorageResult<StorageTableInnerIter<S, SD>> {
+        let cache_policy = match (
+            encoded_key_range.start_bound(),
+            encoded_key_range.end_bound(),
+        ) {
+            // To prevent unbounded range scan queries from polluting the block cache, use the
+            // low priority fill policy.
+            (Unbounded, _) | (_, Unbounded) => CachePolicy::Fill(CachePriority::Low),
+            _ => CachePolicy::Fill(CachePriority::High),
+        };
+
         let raw_key_ranges = if !ordered
             && matches!(encoded_key_range.start_bound(), Unbounded)
             && matches!(encoded_key_range.end_bound(), Unbounded)
@@ -456,6 +473,7 @@ impl<S: StateStore, SD: ValueRowSerde> StorageTableInner<S, SD> {
                     table_id: self.table_id,
                     read_version_from_backup: read_backup,
                     prefetch_options,
+                    cache_policy,
                 };
                 let pk_serializer = match self.output_row_in_key_indices.is_empty() {
                     true => None,
@@ -482,7 +500,7 @@ impl<S: StateStore, SD: ValueRowSerde> StorageTableInner<S, SD> {
         }))
         .await?;
 
-        #[auto_enum(futures::Stream)]
+        #[auto_enum(futures03::Stream)]
         let iter = match iterators.len() {
             0 => unreachable!(),
             1 => iterators.into_iter().next().unwrap(),
diff --git a/src/storage/src/table/mod.rs b/src/storage/src/table/mod.rs
index 53baaaf2dc78b..1bb9731eb7682 100644
--- a/src/storage/src/table/mod.rs
+++ b/src/storage/src/table/mod.rs
@@ -21,11 +21,11 @@ use risingwave_common::array::DataChunk;
 use risingwave_common::buffer::{Bitmap, BitmapBuilder};
 use risingwave_common::catalog::Schema;
 use risingwave_common::hash::VirtualNode;
-use risingwave_common::row::{OwnedRow, Row, RowExt};
-use risingwave_common::util::hash_util::Crc32FastBuilder;
+use risingwave_common::row::{OwnedRow, Row};
 use risingwave_common::util::iter_util::ZipEqFast;
 
 use crate::error::StorageResult;
+
 /// For tables without distribution (singleton), the `DEFAULT_VNODE` is encoded.
 pub const DEFAULT_VNODE: VirtualNode = VirtualNode::ZERO;
 
@@ -33,7 +33,7 @@ pub const DEFAULT_VNODE: VirtualNode = VirtualNode::ZERO;
 #[derive(Debug)]
 pub struct Distribution {
     /// Indices of distribution key for computing vnode, based on the all columns of the table.
-    pub dist_key_indices: Vec<usize>,
+    pub dist_key_in_pk_indices: Vec<usize>,
 
     /// Virtual nodes that the table is partitioned into.
     pub vnodes: Arc<Bitmap>,
@@ -49,7 +49,7 @@ impl Distribution {
             vnodes.finish().into()
         });
         Self {
-            dist_key_indices: vec![],
+            dist_key_in_pk_indices: vec![],
             vnodes: FALLBACK_VNODES.clone(),
         }
     }
@@ -66,12 +66,12 @@ impl Distribution {
     }
 
     /// Distribution that accesses all vnodes, mainly used for tests.
-    pub fn all_vnodes(dist_key_indices: Vec<usize>) -> Self {
+    pub fn all_vnodes(dist_key_in_pk_indices: Vec<usize>) -> Self {
         /// A bitmap that all vnodes are set.
         static ALL_VNODES: LazyLock<Arc<Bitmap>> =
             LazyLock::new(|| Bitmap::ones(VirtualNode::COUNT).into());
         Self {
-            dist_key_indices,
+            dist_key_in_pk_indices,
             vnodes: ALL_VNODES.clone(),
         }
     }
@@ -123,7 +123,7 @@ pub fn compute_vnode(row: impl Row, indices: &[usize], vnodes: &Bitmap) -> Virtu
     let vnode = if indices.is_empty() {
         DEFAULT_VNODE
     } else {
-        let vnode = (&row).project(indices).hash(Crc32FastBuilder).to_vnode();
+        let vnode = VirtualNode::compute_row(&row, indices);
         check_vnode_is_set(vnode, vnodes);
         vnode
     };
@@ -147,12 +147,11 @@ pub fn compute_chunk_vnode(
             .iter()
             .map(|idx| pk_indices[*idx])
             .collect_vec();
-        chunk
-            .get_hash_values(&dist_key_indices, Crc32FastBuilder)
+
+        VirtualNode::compute_chunk(chunk, &dist_key_indices)
             .into_iter()
             .zip_eq_fast(chunk.vis().iter())
-            .map(|(h, vis)| {
-                let vnode = h.to_vnode();
+            .map(|(vnode, vis)| {
                 // Ignore the invisible rows.
                 if vis {
                     check_vnode_is_set(vnode, vnodes);
diff --git a/src/stream/Cargo.toml b/src/stream/Cargo.toml
index 7bba32e665a01..7539ae6a2f55f 100644
--- a/src/stream/Cargo.toml
+++ b/src/stream/Cargo.toml
@@ -77,3 +77,4 @@ workspace-hack = { path = "../workspace-hack" }
 [dev-dependencies]
 assert_matches = "1"
 risingwave_hummock_test = { path = "../storage/hummock_test", features = ["test"] }
+tracing-test = "0.2"
diff --git a/src/stream/src/common/table/state_table.rs b/src/stream/src/common/table/state_table.rs
index ece7293f6ef28..482fbc3c0d6bc 100644
--- a/src/stream/src/common/table/state_table.rs
+++ b/src/stream/src/common/table/state_table.rs
@@ -21,6 +21,7 @@ use futures::{Stream, StreamExt};
 use itertools::{izip, Itertools};
 use risingwave_common::array::{Op, StreamChunk, Vis};
 use risingwave_common::buffer::Bitmap;
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::{get_dist_key_in_pk_indices, ColumnDesc, TableId, TableOption};
 use risingwave_common::hash::{VirtualNode, VnodeBitmapExt};
 use risingwave_common::row::{self, CompactedRow, OwnedRow, Row, RowExt};
@@ -35,6 +36,7 @@ use risingwave_hummock_sdk::key::{
 };
 use risingwave_pb::catalog::Table;
 use risingwave_storage::error::StorageError;
+use risingwave_storage::hummock::CachePolicy;
 use risingwave_storage::mem_table::MemTableError;
 use risingwave_storage::row_serde::row_serde_util::{
     deserialize_pk_with_vnode, serialize_pk, serialize_pk_with_vnode,
@@ -47,6 +49,7 @@ use risingwave_storage::StateStore;
 use tracing::trace;
 
 use super::watermark::{WatermarkBufferByEpoch, WatermarkBufferStrategy};
+use crate::cache::cache_may_stale;
 use crate::executor::{StreamExecutorError, StreamExecutorResult};
 
 /// This num is arbitrary and we may want to improve this choice in the future.
@@ -315,31 +318,6 @@ where
             Distribution::fallback(),
             None,
             false,
-            0,
-        )
-        .await
-    }
-
-    /// Create a state table without distribution, with given `prefix_hint_len`, used for unit
-    /// tests.
-    pub async fn new_without_distribution_with_prefix_hint_len(
-        store: S,
-        table_id: TableId,
-        columns: Vec<ColumnDesc>,
-        order_types: Vec<OrderType>,
-        pk_indices: Vec<usize>,
-        prefix_hint_len: usize,
-    ) -> Self {
-        Self::new_with_distribution_inner(
-            store,
-            table_id,
-            columns,
-            order_types,
-            pk_indices,
-            Distribution::fallback(),
-            None,
-            true,
-            prefix_hint_len,
         )
         .await
     }
@@ -364,7 +342,6 @@ where
             distribution,
             value_indices,
             true,
-            0,
         )
         .await
     }
@@ -387,7 +364,6 @@ where
             distribution,
             value_indices,
             false,
-            0,
         )
         .await
     }
@@ -400,12 +376,11 @@ where
         order_types: Vec<OrderType>,
         pk_indices: Vec<usize>,
         Distribution {
-            dist_key_indices,
+            dist_key_in_pk_indices,
             vnodes,
         }: Distribution,
         value_indices: Option<Vec<usize>>,
         is_consistent_op: bool,
-        prefix_hint_len: usize,
     ) -> Self {
         let local_state_store = store
             .new_local(NewLocalOptions {
@@ -439,7 +414,6 @@ where
                 .collect_vec(),
             None => table_columns.iter().map(|c| c.column_id).collect_vec(),
         };
-        let dist_key_in_pk_indices = get_dist_key_in_pk_indices(&dist_key_indices, &pk_indices);
         Self {
             table_id,
             local_store: local_state_store,
@@ -447,7 +421,7 @@ where
             row_serde: SD::new(&column_ids, Arc::from(data_types.into_boxed_slice())),
             pk_indices,
             dist_key_in_pk_indices,
-            prefix_hint_len,
+            prefix_hint_len: 0,
             vnodes,
             table_option: Default::default(),
             vnode_col_idx_in_pk: None,
@@ -577,6 +551,7 @@ where
             ignore_range_tombstone: false,
             read_version_from_backup: false,
             prefetch_options: Default::default(),
+            cache_policy: CachePolicy::Fill(CachePriority::High),
         };
 
         self.local_store
@@ -606,7 +581,7 @@ where
 
     /// Update the vnode bitmap of the state table, returns the previous vnode bitmap.
     #[must_use = "the executor should decide whether to manipulate the cache based on the previous vnode bitmap"]
-    pub fn update_vnode_bitmap(&mut self, new_vnodes: Arc<Bitmap>) -> Arc<Bitmap> {
+    pub fn update_vnode_bitmap(&mut self, new_vnodes: Arc<Bitmap>) -> (Arc<Bitmap>, bool) {
         assert!(
             !self.is_dirty(),
             "vnode bitmap should only be updated when state table is clean"
@@ -619,9 +594,16 @@ where
         }
         assert_eq!(self.vnodes.len(), new_vnodes.len());
 
-        self.cur_watermark = None;
+        let cache_may_stale = cache_may_stale(&self.vnodes, &new_vnodes);
 
-        std::mem::replace(&mut self.vnodes, new_vnodes)
+        if cache_may_stale {
+            self.cur_watermark = None;
+        }
+
+        (
+            std::mem::replace(&mut self.vnodes, new_vnodes),
+            cache_may_stale,
+        )
     }
 }
 
@@ -829,22 +811,28 @@ where
         } else {
             Some(self.pk_serde.prefix(1))
         };
-        let range_end_suffix = watermark.map(|watermark| {
+        let watermark_suffix = watermark.map(|watermark| {
             serialize_pk(
                 row::once(Some(watermark)),
                 prefix_serializer.as_ref().unwrap(),
             )
         });
-        if let Some(range_end_suffix) = range_end_suffix {
-            let range_begin_suffix = vec![];
-            trace!(table_id = %self.table_id, range_end = ?range_end_suffix, vnodes = ?{
+        if let Some(watermark_suffix) = watermark_suffix {
+            // We either serialize null into `0u8`, data into `(1u8 || scalar)`, or serialize null
+            // into `1u8`, data into `(0u8 || scalar)`. We do not want to delete null
+            // here, so `range_begin_suffix` cannot be `vec![]` when null is represented as `0u8`.
+            let range_begin_suffix = watermark_suffix
+                .first()
+                .map(|bit| vec![*bit])
+                .unwrap_or_default();
+            trace!(table_id = %self.table_id, watermark = ?watermark_suffix, vnodes = ?{
                 self.vnodes.iter_vnodes().collect_vec()
             }, "delete range");
             for vnode in self.vnodes.iter_vnodes() {
                 let mut range_begin = vnode.to_be_bytes().to_vec();
                 let mut range_end = range_begin.clone();
                 range_begin.extend(&range_begin_suffix);
-                range_end.extend(&range_end_suffix);
+                range_end.extend(&watermark_suffix);
                 delete_ranges.push((Bytes::from(range_begin), Bytes::from(range_end)));
             }
         }
@@ -1008,6 +996,7 @@ where
             table_id: self.table_id,
             read_version_from_backup: false,
             prefetch_options,
+            cache_policy: CachePolicy::Fill(CachePriority::High),
         };
 
         Ok(self.local_store.iter(key_range, read_options).await?)
@@ -1054,6 +1043,7 @@ where
             table_id: self.table_id,
             read_version_from_backup: false,
             prefetch_options: Default::default(),
+            cache_policy: CachePolicy::Fill(CachePriority::High),
         };
 
         self.local_store
diff --git a/src/stream/src/common/table/test_utils.rs b/src/stream/src/common/table/test_utils.rs
index 1d317cf80933d..526f6864b3a99 100644
--- a/src/stream/src/common/table/test_utils.rs
+++ b/src/stream/src/common/table/test_utils.rs
@@ -16,7 +16,7 @@ use itertools::Itertools;
 use risingwave_common::catalog::{ColumnDesc, TableId};
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_common::util::sort_util::OrderType;
-use risingwave_pb::catalog::Table as ProstTable;
+use risingwave_pb::catalog::PbTable;
 use risingwave_pb::common::PbColumnOrder;
 use risingwave_pb::plan_common::ColumnCatalog;
 
@@ -26,7 +26,7 @@ pub(crate) fn gen_prost_table(
     order_types: Vec<OrderType>,
     pk_index: Vec<usize>,
     read_prefix_len_hint: u32,
-) -> ProstTable {
+) -> PbTable {
     let col_len = column_descs.len() as i32;
     gen_prost_table_with_value_indices(
         table_id,
@@ -45,7 +45,7 @@ pub(crate) fn gen_prost_table_with_value_indices(
     pk_index: Vec<usize>,
     read_prefix_len_hint: u32,
     value_indices: Vec<i32>,
-) -> ProstTable {
+) -> PbTable {
     let prost_pk = pk_index
         .iter()
         .zip_eq_fast(order_types.iter())
@@ -62,7 +62,7 @@ pub(crate) fn gen_prost_table_with_value_indices(
         })
         .collect();
 
-    ProstTable {
+    PbTable {
         id: table_id.table_id(),
         columns: prost_columns,
         pk: prost_pk,
diff --git a/src/stream/src/error.rs b/src/stream/src/error.rs
index d2250cceeb92e..7c92a2b4e0235 100644
--- a/src/stream/src/error.rs
+++ b/src/stream/src/error.rs
@@ -16,7 +16,7 @@ use std::backtrace::Backtrace;
 
 use risingwave_common::array::ArrayError;
 use risingwave_expr::ExprError;
-use risingwave_pb::ProstFieldNotFound;
+use risingwave_pb::PbFieldNotFound;
 use risingwave_storage::error::StorageError;
 
 use crate::executor::StreamExecutorError;
@@ -95,8 +95,8 @@ impl From<StreamExecutorError> for StreamError {
     }
 }
 
-impl From<ProstFieldNotFound> for StreamError {
-    fn from(err: ProstFieldNotFound) -> Self {
+impl From<PbFieldNotFound> for StreamError {
+    fn from(err: PbFieldNotFound) -> Self {
         Self::from(anyhow::anyhow!(
             "Failed to decode prost: field not found `{}`",
             err.0
diff --git a/src/stream/src/executor/actor.rs b/src/stream/src/executor/actor.rs
index 7044e62b20615..5a26b43947b8e 100644
--- a/src/stream/src/executor/actor.rs
+++ b/src/stream/src/executor/actor.rs
@@ -15,9 +15,9 @@
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
+use anyhow::anyhow;
 use await_tree::InstrumentAwait;
 use futures::future::join_all;
-use futures::pin_mut;
 use hytra::TrAdder;
 use minitrace::prelude::*;
 use parking_lot::Mutex;
@@ -173,33 +173,33 @@ where
         };
 
         let mut last_epoch: Option<EpochPair> = None;
-
-        let stream = Box::new(self.consumer).execute();
-        pin_mut!(stream);
+        let mut stream = Box::pin(Box::new(self.consumer).execute());
 
         // Drive the streaming task with an infinite loop
-        while let Some(barrier) = stream
-            .next()
-            .in_span(span)
-            .instrument_await(
-                last_epoch.map_or("Epoch <initial>".into(), |e| format!("Epoch {}", e.curr)),
-            )
-            .await
-            .transpose()?
-        {
-            last_epoch = Some(barrier.epoch);
+        let result = loop {
+            let barrier = match stream
+                .try_next()
+                .in_span(span)
+                .instrument_await(
+                    last_epoch.map_or("Epoch <initial>".into(), |e| format!("Epoch {}", e.curr)),
+                )
+                .await
+            {
+                Ok(Some(barrier)) => barrier,
+                Ok(None) => break Err(anyhow!("actor exited unexpectedly").into()),
+                Err(err) => break Err(err),
+            };
 
             // Collect barriers to local barrier manager
             self.context.lock_barrier_manager().collect(id, &barrier);
 
             // Then stop this actor if asked
-            let to_stop = barrier.is_stop_or_update_drop_actor(id);
-            if to_stop {
-                tracing::trace!(actor_id = id, "actor exit");
-                return Ok(());
+            if barrier.is_stop(id) {
+                break Ok(());
             }
 
             // Tracing related work
+            last_epoch = Some(barrier.epoch);
             span = {
                 let mut span = Span::enter_with_local_parent("actor_poll");
                 span.add_property(|| ("otel.name", span_name.to_string()));
@@ -208,8 +208,24 @@ where
                 span.add_property(|| ("epoch", barrier.epoch.curr.to_string()));
                 span
             };
-        }
+        };
+
+        spawn_blocking_drop_stream(stream).await;
 
-        Ok(())
+        tracing::trace!(actor_id = id, "actor exit");
+        result
     }
 }
+
+/// Drop the stream in a blocking task to avoid interfering with other actors.
+///
+/// Logically the actor is dropped after we send the barrier with `Drop` mutation to the
+/// downstream，thus making the `drop`'s progress asynchronous. However, there might be a
+/// considerable amount of data in the executors' in-memory cache, dropping these structures might
+/// be a CPU-intensive task. This may lead to the runtime being unable to schedule other actors if
+/// the `drop` is called on the current thread.
+pub async fn spawn_blocking_drop_stream<T: Send + 'static>(stream: T) {
+    let _ = tokio::task::spawn_blocking(move || drop(stream))
+        .instrument_await("drop_stream")
+        .await;
+}
diff --git a/src/stream/src/executor/agg_common.rs b/src/stream/src/executor/agg_common.rs
index ecd61febe9db5..47f59f68d1ecd 100644
--- a/src/stream/src/executor/agg_common.rs
+++ b/src/stream/src/executor/agg_common.rs
@@ -25,7 +25,7 @@ use crate::executor::{ActorContextRef, PkIndices};
 use crate::task::AtomicU64Ref;
 
 /// Arguments needed to construct an `XxxAggExecutor`.
-pub struct AggExecutorArgs<S: StateStore> {
+pub struct AggExecutorArgs<S: StateStore, E: AggExecutorExtraArgs> {
     // basic
     pub input: Box<dyn Executor>,
     pub actor_ctx: ActorContextRef,
@@ -44,15 +44,18 @@ pub struct AggExecutorArgs<S: StateStore> {
     pub watermark_epoch: AtomicU64Ref,
 
     // extra
-    pub extra: Option<AggExecutorArgsExtra>,
+    pub extra: E,
 }
 
-/// Extra arguments needed to construct an `XxxAggExecutor`.
-pub struct AggExecutorArgsExtra {
-    // hash agg specific things
-    pub group_key_indices: Vec<usize>,
+pub trait AggExecutorExtraArgs {}
 
-    // things only used by hash agg currently
-    pub metrics: Arc<StreamingMetrics>,
+pub struct SimpleAggExecutorExtraArgs {}
+impl AggExecutorExtraArgs for SimpleAggExecutorExtraArgs {}
+
+/// Extra arguments needed to construct an `HashAggExecutor`.
+pub struct GroupAggExecutorExtraArgs {
+    pub group_key_indices: Vec<usize>,
     pub chunk_size: usize,
+    pub metrics: Arc<StreamingMetrics>,
 }
+impl AggExecutorExtraArgs for GroupAggExecutorExtraArgs {}
diff --git a/src/stream/src/executor/aggregation/agg_group.rs b/src/stream/src/executor/aggregation/agg_group.rs
index 6b875b176c7a8..e26a2e487e232 100644
--- a/src/stream/src/executor/aggregation/agg_group.rs
+++ b/src/stream/src/executor/aggregation/agg_group.rs
@@ -31,80 +31,15 @@ use crate::common::table::state_table::StateTable;
 use crate::executor::error::StreamExecutorResult;
 use crate::executor::PkIndices;
 
-mod changes_builder {
-    use super::*;
-
-    pub(super) fn insert_new_outputs(
-        curr_outputs: &OwnedRow,
-        builders: &mut [ArrayBuilderImpl],
-        new_ops: &mut Vec<Op>,
-    ) -> usize {
-        new_ops.push(Op::Insert);
-
-        for (builder, new_value) in builders.iter_mut().zip_eq_fast(curr_outputs.iter()) {
-            trace!("insert datum: {:?}", new_value);
-            builder.append_datum(new_value);
-        }
-
-        1
-    }
-
-    pub(super) fn delete_old_outputs(
-        prev_outputs: &OwnedRow,
-        builders: &mut [ArrayBuilderImpl],
-        new_ops: &mut Vec<Op>,
-    ) -> usize {
-        new_ops.push(Op::Delete);
-
-        for (builder, old_value) in builders.iter_mut().zip_eq_fast(prev_outputs.iter()) {
-            trace!("delete datum: {:?}", old_value);
-            builder.append_datum(old_value);
-        }
-
-        1
-    }
-
-    pub(super) fn update_outputs(
-        prev_outputs: &OwnedRow,
-        curr_outputs: &OwnedRow,
-        builders: &mut [ArrayBuilderImpl],
-        new_ops: &mut Vec<Op>,
-    ) -> usize {
-        if prev_outputs == curr_outputs {
-            // Fast path for no change.
-            return 0;
-        }
-
-        new_ops.push(Op::UpdateDelete);
-        new_ops.push(Op::UpdateInsert);
-
-        for (builder, old_value, new_value) in itertools::multizip((
-            builders.iter_mut(),
-            prev_outputs.iter(),
-            curr_outputs.iter(),
-        )) {
-            trace!(
-                "update datum: prev = {:?}, curr = {:?}",
-                old_value,
-                new_value
-            );
-            builder.append_datum(old_value);
-            builder.append_datum(new_value);
-        }
-
-        2
-    }
-}
-
 pub trait Strategy {
-    fn build_changes(
+    /// Infer the change type of the aggregation result. Don't need to take the ownership of
+    /// `prev_outputs` and `curr_outputs`.
+    fn infer_change_type(
         prev_row_count: usize,
         curr_row_count: usize,
         prev_outputs: Option<&OwnedRow>,
         curr_outputs: &OwnedRow,
-        builders: &mut [ArrayBuilderImpl],
-        new_ops: &mut Vec<Op>,
-    ) -> usize;
+    ) -> Option<AggChangeType>;
 }
 
 /// The strategy that always outputs the aggregation result no matter there're input rows or not.
@@ -114,14 +49,12 @@ pub struct AlwaysOutput;
 pub struct OnlyOutputIfHasInput;
 
 impl Strategy for AlwaysOutput {
-    fn build_changes(
+    fn infer_change_type(
         prev_row_count: usize,
         curr_row_count: usize,
         prev_outputs: Option<&OwnedRow>,
         curr_outputs: &OwnedRow,
-        builders: &mut [ArrayBuilderImpl],
-        new_ops: &mut Vec<Op>,
-    ) -> usize {
+    ) -> Option<AggChangeType> {
         match prev_outputs {
             None => {
                 // First time to build changes, assert to ensure correctness.
@@ -130,46 +63,48 @@ impl Strategy for AlwaysOutput {
                 assert_eq!(prev_row_count, 0);
 
                 // Generate output no matter whether current row count is 0 or not.
-                changes_builder::insert_new_outputs(curr_outputs, builders, new_ops)
+                Some(AggChangeType::Insert)
             }
             Some(prev_outputs) => {
-                if prev_row_count == 0 && curr_row_count == 0 {
-                    // No rows exist.
-                    return 0;
+                if prev_row_count == 0 && curr_row_count == 0 || prev_outputs == curr_outputs {
+                    // No rows exist, or output is not changed.
+                    None
+                } else {
+                    Some(AggChangeType::Update)
                 }
-                changes_builder::update_outputs(prev_outputs, curr_outputs, builders, new_ops)
             }
         }
     }
 }
 
 impl Strategy for OnlyOutputIfHasInput {
-    fn build_changes(
+    fn infer_change_type(
         prev_row_count: usize,
         curr_row_count: usize,
         prev_outputs: Option<&OwnedRow>,
         curr_outputs: &OwnedRow,
-        builders: &mut [ArrayBuilderImpl],
-        new_ops: &mut Vec<Op>,
-    ) -> usize {
+    ) -> Option<AggChangeType> {
         match (prev_row_count, curr_row_count) {
             (0, 0) => {
                 // No rows of current group exist.
-                0
+                None
             }
             (0, _) => {
                 // Insert new output row for this newly emerged group.
-                changes_builder::insert_new_outputs(curr_outputs, builders, new_ops)
+                Some(AggChangeType::Insert)
             }
             (_, 0) => {
                 // Delete old output row for this newly disappeared group.
-                let prev_outputs = prev_outputs.expect("must exist previous outputs");
-                changes_builder::delete_old_outputs(prev_outputs, builders, new_ops)
+                Some(AggChangeType::Delete)
             }
             (_, _) => {
                 // Update output row.
-                let prev_outputs = prev_outputs.expect("must exist previous outputs");
-                changes_builder::update_outputs(prev_outputs, curr_outputs, builders, new_ops)
+                if prev_outputs.expect("must exist previous outputs") == curr_outputs {
+                    // No output change.
+                    None
+                } else {
+                    Some(AggChangeType::Update)
+                }
             }
         }
     }
@@ -178,7 +113,7 @@ impl Strategy for OnlyOutputIfHasInput {
 /// [`AggGroup`] manages agg states of all agg calls for one `group_key`.
 pub struct AggGroup<S: StateStore, Strtg: Strategy> {
     /// Group key.
-    group_key: Option<OwnedRow>, // TODO(rc): we can remove this
+    group_key: Option<OwnedRow>,
 
     /// Current managed states for all [`AggCall`]s.
     states: Vec<AggState<S>>,
@@ -201,14 +136,25 @@ impl<S: StateStore, Strtg: Strategy> Debug for AggGroup<S, Strtg> {
     }
 }
 
-/// Information about the changes built by `AggState::build_changes`.
-pub struct AggChangesInfo {
-    /// The number of rows and corresponding ops in the changes.
-    pub n_appended_ops: usize,
-    /// The result row containing group key prefix. To be inserted into result table.
-    pub result_row: OwnedRow,
-    /// The previous outputs of all agg calls recorded in the `AggState`.
-    pub prev_outputs: Option<OwnedRow>,
+/// Type of aggregation change.
+pub enum AggChangeType {
+    Insert,
+    Delete,
+    Update,
+}
+
+/// Aggregation change. The result rows include group key prefix.
+pub enum AggChange {
+    Insert {
+        new_row: OwnedRow,
+    },
+    Delete {
+        old_row: OwnedRow,
+    },
+    Update {
+        old_row: OwnedRow,
+        new_row: OwnedRow,
+    },
 }
 
 impl<S: StateStore, Strtg: Strategy> AggGroup<S, Strtg> {
@@ -318,8 +264,10 @@ impl<S: StateStore, Strtg: Strategy> AggGroup<S, Strtg> {
         self.states.iter_mut().for_each(|state| state.reset());
     }
 
-    /// Get the outputs of all managed agg states.
+    /// Get the outputs of all managed agg states, without group key prefix.
     /// Possibly need to read/sync from state table if the state not cached in memory.
+    /// This method is idempotent, i.e. it can be called multiple times and the outputs are
+    /// guaranteed to be the same.
     pub async fn get_outputs(
         &mut self,
         storages: &[AggStateStorage<S>],
@@ -349,15 +297,9 @@ impl<S: StateStore, Strtg: Strategy> AggGroup<S, Strtg> {
         .map(OwnedRow::new)
     }
 
-    /// Build changes into `builders` and `new_ops`, according to previous and current agg outputs.
-    /// Returns [`AggChangesInfo`] contains information about changes built.
-    /// The saved previous outputs will be updated to the latest outputs after building changes.
-    pub fn build_changes(
-        &mut self,
-        curr_outputs: OwnedRow,
-        builders: &mut [ArrayBuilderImpl],
-        new_ops: &mut Vec<Op>,
-    ) -> AggChangesInfo {
+    /// Build aggregation result change, according to previous and current agg outputs.
+    /// The saved previous outputs will be updated to the latest outputs after this method.
+    pub fn build_change(&mut self, curr_outputs: OwnedRow) -> Option<AggChange> {
         let prev_row_count = self.prev_row_count();
         let curr_row_count = curr_outputs[self.row_count_index]
             .as_ref()
@@ -370,27 +312,78 @@ impl<S: StateStore, Strtg: Strategy> AggGroup<S, Strtg> {
             curr_row_count
         );
 
-        let n_appended_ops = Strtg::build_changes(
+        let change_type = Strtg::infer_change_type(
             prev_row_count,
             curr_row_count,
             self.prev_outputs.as_ref(),
             &curr_outputs,
-            builders,
-            new_ops,
         );
 
-        let result_row = self.group_key().chain(&curr_outputs).into_owned_row();
+        // Split `AggChangeType` and `AggChange` to avoid unnecessary cloning.
+        change_type.map(|change_type| match change_type {
+            AggChangeType::Insert => {
+                let new_row = self.group_key().chain(&curr_outputs).into_owned_row();
+                self.prev_outputs = Some(curr_outputs);
+                AggChange::Insert { new_row }
+            }
+            AggChangeType::Delete => {
+                let prev_outputs = self.prev_outputs.take();
+                let old_row = self.group_key().chain(prev_outputs).into_owned_row();
+                AggChange::Delete { old_row }
+            }
+            AggChangeType::Update => {
+                let new_row = self.group_key().chain(&curr_outputs).into_owned_row();
+                let prev_outputs = self.prev_outputs.replace(curr_outputs);
+                let old_row = self.group_key().chain(prev_outputs).into_owned_row();
+                AggChange::Update { old_row, new_row }
+            }
+        })
+    }
 
-        let prev_outputs = if n_appended_ops == 0 {
-            self.prev_outputs.clone()
-        } else {
-            std::mem::replace(&mut self.prev_outputs, Some(curr_outputs))
-        };
+    pub fn apply_change_to_builders(
+        &self,
+        change: &AggChange,
+        builders: &mut [ArrayBuilderImpl],
+        ops: &mut Vec<Op>,
+    ) {
+        match change {
+            AggChange::Insert { new_row } => {
+                trace!("insert row: {:?}", new_row);
+                ops.push(Op::Insert);
+                for (builder, new_value) in builders.iter_mut().zip_eq_fast(new_row.iter()) {
+                    builder.append_datum(new_value);
+                }
+            }
+            AggChange::Delete { old_row } => {
+                trace!("delete row: {:?}", old_row);
+                ops.push(Op::Delete);
+                for (builder, old_value) in builders.iter_mut().zip_eq_fast(old_row.iter()) {
+                    builder.append_datum(old_value);
+                }
+            }
+            AggChange::Update { old_row, new_row } => {
+                trace!("update row: prev = {:?}, curr = {:?}", old_row, new_row);
+                ops.push(Op::UpdateDelete);
+                ops.push(Op::UpdateInsert);
+                for (builder, old_value, new_value) in
+                    itertools::multizip((builders.iter_mut(), old_row.iter(), new_row.iter()))
+                {
+                    builder.append_datum(old_value);
+                    builder.append_datum(new_value);
+                }
+            }
+        }
+    }
 
-        AggChangesInfo {
-            n_appended_ops,
-            result_row,
-            prev_outputs,
+    pub fn apply_change_to_result_table(
+        &self,
+        change: &AggChange,
+        result_table: &mut StateTable<S>,
+    ) {
+        match change {
+            AggChange::Insert { new_row } => result_table.insert(new_row),
+            AggChange::Delete { old_row } => result_table.delete(old_row),
+            AggChange::Update { old_row, new_row } => result_table.update(old_row, new_row),
         }
     }
 }
diff --git a/src/stream/src/executor/aggregation/agg_impl/foldable.rs b/src/stream/src/executor/aggregation/agg_impl/foldable.rs
index 2f025eda1fde2..efc228e49f32b 100644
--- a/src/stream/src/executor/aggregation/agg_impl/foldable.rs
+++ b/src/stream/src/executor/aggregation/agg_impl/foldable.rs
@@ -406,9 +406,9 @@ impl_fold_agg! { I64Array, Int64, DecimalArray }
 impl_fold_agg! { I64Array, Int64, StructArray }
 impl_fold_agg! { I64Array, Int64, ListArray }
 impl_fold_agg! { I64Array, Int64, IntervalArray }
-impl_fold_agg! { I64Array, Int64, NaiveTimeArray }
-impl_fold_agg! { I64Array, Int64, NaiveDateArray }
-impl_fold_agg! { I64Array, Int64, NaiveDateTimeArray }
+impl_fold_agg! { I64Array, Int64, TimeArray }
+impl_fold_agg! { I64Array, Int64, DateArray }
+impl_fold_agg! { I64Array, Int64, TimestampArray }
 // max/min
 impl_fold_agg! { I16Array, Int16, I16Array }
 impl_fold_agg! { I32Array, Int32, I32Array }
@@ -419,9 +419,9 @@ impl_fold_agg! { Utf8Array, Utf8, Utf8Array }
 impl_fold_agg! { BytesArray, Bytea, BytesArray }
 impl_fold_agg! { StructArray, Struct, StructArray }
 impl_fold_agg! { IntervalArray, Interval, IntervalArray }
-impl_fold_agg! { NaiveTimeArray, NaiveTime, NaiveTimeArray }
-impl_fold_agg! { NaiveDateArray, NaiveDate, NaiveDateArray }
-impl_fold_agg! { NaiveDateTimeArray, NaiveDateTime, NaiveDateTimeArray }
+impl_fold_agg! { TimeArray, Time, TimeArray }
+impl_fold_agg! { DateArray, Date, DateArray }
+impl_fold_agg! { TimestampArray, Timestamp, TimestampArray }
 // sum
 impl_fold_agg! { DecimalArray, Decimal, I64Array }
 // avg
@@ -430,7 +430,7 @@ impl_fold_agg! { F64Array, Float64, F32Array }
 #[cfg(test)]
 mod tests {
     use risingwave_common::array::I64Array;
-    use risingwave_common::types::OrderedF64;
+    use risingwave_common::types::F64;
     use risingwave_common::{array, array_nonnull};
 
     use super::*;
@@ -503,7 +503,7 @@ mod tests {
                 .map(|(c, v)| {
                     (
                         if c == '+' { Op::Insert } else { Op::Delete },
-                        Some(OrderedF64::from(v)),
+                        Some(F64::from(v)),
                     )
                 })
                 .unzip();
@@ -516,7 +516,7 @@ mod tests {
             .unwrap();
             assert_eq!(
                 agg.get_output().unwrap().unwrap().as_float64(),
-                &OrderedF64::from(expected)
+                &F64::from(expected)
             );
         }
     }
diff --git a/src/stream/src/executor/aggregation/agg_impl/mod.rs b/src/stream/src/executor/aggregation/agg_impl/mod.rs
index 92108a82a8f47..0093212644650 100644
--- a/src/stream/src/executor/aggregation/agg_impl/mod.rs
+++ b/src/stream/src/executor/aggregation/agg_impl/mod.rs
@@ -24,9 +24,9 @@ use dyn_clone::DynClone;
 pub use foldable::*;
 use risingwave_common::array::stream_chunk::Ops;
 use risingwave_common::array::{
-    Array, ArrayBuilder, ArrayBuilderImpl, ArrayImpl, BoolArray, BytesArray, DecimalArray,
-    F32Array, F64Array, I16Array, I32Array, I64Array, IntervalArray, ListArray, NaiveDateArray,
-    NaiveDateTimeArray, NaiveTimeArray, StructArray, Utf8Array,
+    Array, ArrayBuilder, ArrayBuilderImpl, ArrayImpl, BoolArray, BytesArray, DateArray,
+    DecimalArray, F32Array, F64Array, I16Array, I32Array, I64Array, IntervalArray, ListArray,
+    StructArray, TimeArray, TimestampArray, Utf8Array,
 };
 use risingwave_common::buffer::Bitmap;
 use risingwave_common::types::{DataType, Datum};
@@ -164,14 +164,9 @@ pub fn create_streaming_agg_impl(
                     (Count, boolean, int64, StreamingCountAgg::<BoolArray>),
                     (Count, varchar, int64, StreamingCountAgg::<Utf8Array>),
                     (Count, interval, int64, StreamingCountAgg::<IntervalArray>),
-                    (Count, date, int64, StreamingCountAgg::<NaiveDateArray>),
-                    (
-                        Count,
-                        timestamp,
-                        int64,
-                        StreamingCountAgg::<NaiveDateTimeArray>
-                    ),
-                    (Count, time, int64, StreamingCountAgg::<NaiveTimeArray>),
+                    (Count, date, int64, StreamingCountAgg::<DateArray>),
+                    (Count, timestamp, int64, StreamingCountAgg::<TimestampArray>),
+                    (Count, time, int64, StreamingCountAgg::<TimeArray>),
                     (Count, struct_type, int64, StreamingCountAgg::<StructArray>),
                     (Count, list, int64, StreamingCountAgg::<ListArray>),
                     // Sum0
@@ -211,14 +206,9 @@ pub fn create_streaming_agg_impl(
                     (Min, float32, float32, StreamingMinAgg::<F32Array>),
                     (Min, float64, float64, StreamingMinAgg::<F64Array>),
                     (Min, interval, interval, StreamingMinAgg::<IntervalArray>),
-                    (Min, time, time, StreamingMinAgg::<NaiveTimeArray>),
-                    (Min, date, date, StreamingMinAgg::<NaiveDateArray>),
-                    (
-                        Min,
-                        timestamp,
-                        timestamp,
-                        StreamingMinAgg::<NaiveDateTimeArray>
-                    ),
+                    (Min, time, time, StreamingMinAgg::<TimeArray>),
+                    (Min, date, date, StreamingMinAgg::<DateArray>),
+                    (Min, timestamp, timestamp, StreamingMinAgg::<TimestampArray>),
                     (Min, timestamptz, timestamptz, StreamingMinAgg::<I64Array>),
                     (Min, varchar, varchar, StreamingMinAgg::<Utf8Array>),
                     (Min, bytea, bytea, StreamingMinAgg::<BytesArray>),
@@ -230,14 +220,9 @@ pub fn create_streaming_agg_impl(
                     (Max, float32, float32, StreamingMaxAgg::<F32Array>),
                     (Max, float64, float64, StreamingMaxAgg::<F64Array>),
                     (Max, interval, interval, StreamingMaxAgg::<IntervalArray>),
-                    (Max, time, time, StreamingMaxAgg::<NaiveTimeArray>),
-                    (Max, date, date, StreamingMaxAgg::<NaiveDateArray>),
-                    (
-                        Max,
-                        timestamp,
-                        timestamp,
-                        StreamingMaxAgg::<NaiveDateTimeArray>
-                    ),
+                    (Max, time, time, StreamingMaxAgg::<TimeArray>),
+                    (Max, date, date, StreamingMaxAgg::<DateArray>),
+                    (Max, timestamp, timestamp, StreamingMaxAgg::<TimestampArray>),
                     (Max, timestamptz, timestamptz, StreamingMaxAgg::<I64Array>),
                     (Max, varchar, varchar, StreamingMaxAgg::<Utf8Array>),
                     (Max, bytea, bytea, StreamingMaxAgg::<BytesArray>),
diff --git a/src/stream/src/executor/backfill.rs b/src/stream/src/executor/backfill.rs
index 1bbf6a5d2bb30..794c93e35126f 100644
--- a/src/stream/src/executor/backfill.rs
+++ b/src/stream/src/executor/backfill.rs
@@ -25,7 +25,7 @@ use risingwave_common::buffer::BitmapBuilder;
 use risingwave_common::catalog::Schema;
 use risingwave_common::row::{self, OwnedRow, Row, RowExt};
 use risingwave_common::util::iter_util::ZipEqFast;
-use risingwave_common::util::sort_util::{Direction, OrderType};
+use risingwave_common::util::sort_util::{compare_datum, OrderType};
 use risingwave_hummock_sdk::HummockReadEpoch;
 use risingwave_storage::store::PrefetchOptions;
 use risingwave_storage::table::batch_table::storage_table::StorageTable;
@@ -117,7 +117,7 @@ where
         // If the barrier is a conf change of creating this mview, we follow the procedure of
         // backfill. Otherwise, it means we've recovered and we can forward the upstream messages
         // directly.
-        let to_create_mv = first_barrier.is_add_dispatcher(self.actor_id);
+        let to_create_mv = first_barrier.is_newly_added(self.actor_id);
         // If the snapshot is empty, we don't need to backfill.
         let is_snapshot_empty: bool = {
             let snapshot = Self::snapshot_read(&self.table, init_epoch, None, false);
@@ -373,12 +373,9 @@ where
             match row
                 .project(pk_in_output_indices)
                 .iter()
-                .zip_eq_fast(pk_order.iter())
+                .zip_eq_fast(pk_order.iter().copied())
                 .cmp_by(current_pos.iter(), |(x, order), y| {
-                    match order.direction() {
-                        Direction::Ascending => x.cmp(&y),
-                        Direction::Descending => y.cmp(&x),
-                    }
+                    compare_datum(x, y, order)
                 }) {
                 Ordering::Less | Ordering::Equal => true,
                 Ordering::Greater => false,
diff --git a/src/stream/src/executor/chain.rs b/src/stream/src/executor/chain.rs
index f4081492928ae..56a10da734d37 100644
--- a/src/stream/src/executor/chain.rs
+++ b/src/stream/src/executor/chain.rs
@@ -74,9 +74,11 @@ impl ChainExecutor {
         // If the barrier is a conf change of creating this mview, init snapshot from its epoch
         // and begin to consume the snapshot.
         // Otherwise, it means we've recovered and the snapshot is already consumed.
-        let to_consume_snapshot = barrier.is_add_dispatcher(self.actor_id) && !self.upstream_only;
+        let to_consume_snapshot = barrier.is_newly_added(self.actor_id) && !self.upstream_only;
 
-        if self.upstream_only {
+        // If the barrier is a conf change of creating this mview, and the snapshot is not to be
+        // consumed, we can finish the progress immediately.
+        if barrier.is_newly_added(self.actor_id) && self.upstream_only {
             self.progress.finish(barrier.epoch.curr);
         }
 
@@ -100,7 +102,7 @@ impl ChainExecutor {
         #[for_await]
         for msg in upstream {
             let msg = msg?;
-            if let Message::Barrier(barrier) = &msg {
+            if to_consume_snapshot && let Message::Barrier(barrier) = &msg {
                 self.progress.finish(barrier.epoch.curr);
             }
             yield msg;
@@ -174,6 +176,7 @@ mod test {
                             ..Default::default()
                         }],
                     },
+                    added_actors: maplit::hashset! { actor_id },
                     splits: Default::default(),
                 })),
                 Message::Chunk(StreamChunk::from_pretty("I\n + 3")),
diff --git a/src/stream/src/executor/dispatch.rs b/src/stream/src/executor/dispatch.rs
index f115985bf63ba..f1a8c9d1ee23d 100644
--- a/src/stream/src/executor/dispatch.rs
+++ b/src/stream/src/executor/dispatch.rs
@@ -25,10 +25,9 @@ use itertools::Itertools;
 use risingwave_common::array::{Op, StreamChunk};
 use risingwave_common::buffer::BitmapBuilder;
 use risingwave_common::hash::{ActorMapping, ExpandedActorMapping, VirtualNode};
-use risingwave_common::util::hash_util::Crc32FastBuilder;
 use risingwave_common::util::iter_util::ZipEqFast;
-use risingwave_pb::stream_plan::update_mutation::DispatcherUpdate as ProstDispatcherUpdate;
-use risingwave_pb::stream_plan::Dispatcher as ProstDispatcher;
+use risingwave_pb::stream_plan::update_mutation::PbDispatcherUpdate;
+use risingwave_pb::stream_plan::PbDispatcher;
 use smallvec::{smallvec, SmallVec};
 use tracing::event;
 
@@ -106,7 +105,7 @@ impl DispatchExecutorInner {
     /// Add new dispatchers to the executor. Will check whether their ids are unique.
     fn add_dispatchers<'a>(
         &mut self,
-        new_dispatchers: impl IntoIterator<Item = &'a ProstDispatcher>,
+        new_dispatchers: impl IntoIterator<Item = &'a PbDispatcher>,
     ) -> StreamResult<()> {
         let new_dispatchers: Vec<_> = new_dispatchers
             .into_iter()
@@ -136,7 +135,7 @@ impl DispatchExecutorInner {
 
     /// Update the dispatcher BEFORE we actually dispatch this barrier. We'll only add the new
     /// outputs.
-    fn pre_update_dispatcher(&mut self, update: &ProstDispatcherUpdate) -> StreamResult<()> {
+    fn pre_update_dispatcher(&mut self, update: &PbDispatcherUpdate) -> StreamResult<()> {
         let outputs: Vec<_> = update
             .added_downstream_actor_id
             .iter()
@@ -151,7 +150,7 @@ impl DispatchExecutorInner {
 
     /// Update the dispatcher AFTER we dispatch this barrier. We'll remove some outputs and finally
     /// update the hash mapping.
-    fn post_update_dispatcher(&mut self, update: &ProstDispatcherUpdate) -> StreamResult<()> {
+    fn post_update_dispatcher(&mut self, update: &PbDispatcherUpdate) -> StreamResult<()> {
         let ids = update.removed_downstream_actor_id.iter().copied().collect();
 
         let dispatcher = self.find_dispatcher(update.dispatcher_id);
@@ -174,7 +173,7 @@ impl DispatchExecutorInner {
     /// For `Add` and `Update`, update the dispatchers before we dispatch the barrier.
     fn pre_mutate_dispatchers(&mut self, mutation: &Option<Arc<Mutation>>) -> StreamResult<()> {
         let Some(mutation) = mutation.as_deref() else {
-            return Ok(())
+            return Ok(());
         };
 
         match mutation {
@@ -199,7 +198,7 @@ impl DispatchExecutorInner {
     /// For `Stop` and `Update`, update the dispatchers after we dispatch the barrier.
     fn post_mutate_dispatchers(&mut self, mutation: &Option<Arc<Mutation>>) -> StreamResult<()> {
         let Some(mutation) = mutation.as_deref() else {
-            return Ok(())
+            return Ok(());
         };
 
         match mutation {
@@ -262,15 +261,12 @@ impl StreamConsumer for DispatchExecutor {
             #[for_await]
             for msg in input {
                 let msg: Message = msg?;
-                let (barrier, message) = match msg {
+                let (barrier, span) = match msg {
                     Message::Chunk(_) => (None, "dispatch_chunk"),
                     Message::Barrier(ref barrier) => (Some(barrier.clone()), "dispatch_barrier"),
                     Message::Watermark(_) => (None, "dispatch_watermark"),
                 };
-                self.inner
-                    .dispatch(msg)
-                    .verbose_instrument_await(message)
-                    .await?;
+                self.inner.dispatch(msg).instrument_await(span).await?;
                 if let Some(barrier) = barrier {
                     yield barrier;
                 }
@@ -291,7 +287,7 @@ impl DispatcherImpl {
     pub fn new(
         context: &SharedContext,
         actor_id: ActorId,
-        dispatcher: &ProstDispatcher,
+        dispatcher: &PbDispatcher,
     ) -> StreamResult<Self> {
         let outputs = dispatcher
             .downstream_actor_id
@@ -596,13 +592,7 @@ impl Dispatcher for HashDataDispatcher {
             let num_outputs = self.outputs.len();
 
             // get hash value of every line by its key
-            let hash_builder = Crc32FastBuilder;
-            let vnodes = chunk
-                .data_chunk()
-                .get_hash_values(&self.keys, hash_builder)
-                .into_iter()
-                .map(|hash| hash.to_vnode())
-                .collect_vec();
+            let vnodes = VirtualNode::compute_chunk(chunk.data_chunk(), &self.keys);
 
             tracing::trace!(target: "events::stream::dispatch::hash", "\n{}\n keys {:?} => {:?}", chunk.to_pretty_string(), self.keys, vnodes);
 
@@ -898,6 +888,7 @@ mod tests {
     use risingwave_common::array::{Array, ArrayBuilder, I32ArrayBuilder, Op};
     use risingwave_common::catalog::Schema;
     use risingwave_common::hash::VirtualNode;
+    use risingwave_common::util::hash_util::Crc32FastBuilder;
     use risingwave_common::util::iter_util::ZipEqFast;
     use risingwave_pb::stream_plan::DispatcherType;
 
@@ -1035,7 +1026,7 @@ mod tests {
         let broadcast_dispatcher = DispatcherImpl::new(
             &ctx,
             actor_id,
-            &ProstDispatcher {
+            &PbDispatcher {
                 r#type: DispatcherType::Broadcast as _,
                 dispatcher_id: broadcast_dispatcher_id,
                 downstream_actor_id: vec![untouched, old],
@@ -1048,7 +1039,7 @@ mod tests {
         let simple_dispatcher = DispatcherImpl::new(
             &ctx,
             actor_id,
-            &ProstDispatcher {
+            &PbDispatcher {
                 r#type: DispatcherType::Simple as _,
                 dispatcher_id: simple_dispatcher_id,
                 downstream_actor_id: vec![old_simple],
@@ -1085,7 +1076,7 @@ mod tests {
 
         // 4. Send a configuration change barrier for broadcast dispatcher.
         let dispatcher_updates = maplit::hashmap! {
-            actor_id => vec![ProstDispatcherUpdate {
+            actor_id => vec![PbDispatcherUpdate {
                 actor_id,
                 dispatcher_id: broadcast_dispatcher_id,
                 added_downstream_actor_id: vec![new],
@@ -1136,7 +1127,7 @@ mod tests {
 
         // 9. Send a configuration change barrier for simple dispatcher.
         let dispatcher_updates = maplit::hashmap! {
-            actor_id => vec![ProstDispatcherUpdate {
+            actor_id => vec![PbDispatcherUpdate {
                 actor_id,
                 dispatcher_id: simple_dispatcher_id,
                 added_downstream_actor_id: vec![new_simple],
diff --git a/src/stream/src/executor/dynamic_filter.rs b/src/stream/src/executor/dynamic_filter.rs
index f4da5696ebf8d..c8f7a1f1bf612 100644
--- a/src/stream/src/executor/dynamic_filter.rs
+++ b/src/stream/src/executor/dynamic_filter.rs
@@ -25,9 +25,7 @@ use risingwave_common::hash::VnodeBitmapExt;
 use risingwave_common::row::{once, OwnedRow as RowData, Row};
 use risingwave_common::types::{DataType, Datum, ScalarImpl, ToDatumRef, ToOwnedDatum};
 use risingwave_common::util::iter_util::ZipEqDebug;
-use risingwave_expr::expr::{
-    new_binary_expr, BoxedExpression, InputRefExpression, LiteralExpression,
-};
+use risingwave_expr::expr::{build, BoxedExpression, InputRefExpression, LiteralExpression};
 use risingwave_pb::expr::expr_node::Type as ExprNodeType;
 use risingwave_pb::expr::expr_node::Type::{
     GreaterThan, GreaterThanOrEqual, LessThan, LessThanOrEqual,
@@ -267,11 +265,13 @@ impl<S: StateStore> DynamicFilterExecutor<S> {
         assert_eq!(l_data_type, r_data_type);
         let dynamic_cond = move |literal: Datum| {
             literal.map(|scalar| {
-                new_binary_expr(
+                build(
                     self.comparator,
                     DataType::Boolean,
-                    Box::new(InputRefExpression::new(l_data_type.clone(), self.key_l)),
-                    Box::new(LiteralExpression::new(r_data_type.clone(), Some(scalar))),
+                    vec![
+                        Box::new(InputRefExpression::new(l_data_type.clone(), self.key_l)),
+                        Box::new(LiteralExpression::new(r_data_type.clone(), Some(scalar))),
+                    ],
                 )
             })
         };
@@ -456,7 +456,7 @@ impl<S: StateStore> DynamicFilterExecutor<S> {
 
                     // Update the vnode bitmap for the left state table if asked.
                     if let Some(vnode_bitmap) = barrier.as_update_vnode_bitmap(self.ctx.id) {
-                        let _previous_vnode_bitmap =
+                        let (_previous_vnode_bitmap, _cache_may_stale) =
                             self.left_table.update_vnode_bitmap(vnode_bitmap);
                     }
 
diff --git a/src/stream/src/executor/error.rs b/src/stream/src/executor/error.rs
index eafb17e977ae4..88c09bd7d043e 100644
--- a/src/stream/src/executor/error.rs
+++ b/src/stream/src/executor/error.rs
@@ -21,7 +21,7 @@ use risingwave_common::util::value_encoding::error::ValueEncodingError;
 use risingwave_connector::error::ConnectorError;
 use risingwave_connector::sink::SinkError;
 use risingwave_expr::ExprError;
-use risingwave_pb::ProstFieldNotFound;
+use risingwave_pb::PbFieldNotFound;
 use risingwave_rpc_client::error::RpcError;
 use risingwave_storage::error::StorageError;
 
@@ -173,8 +173,8 @@ impl From<SinkError> for StreamExecutorError {
     }
 }
 
-impl From<ProstFieldNotFound> for StreamExecutorError {
-    fn from(err: ProstFieldNotFound) -> Self {
+impl From<PbFieldNotFound> for StreamExecutorError {
+    fn from(err: PbFieldNotFound) -> Self {
         Self::from(anyhow::anyhow!(
             "Failed to decode prost: field not found `{}`",
             err.0
diff --git a/src/stream/src/executor/filter.rs b/src/stream/src/executor/filter.rs
index 61b9495d0f8c6..86f890c19cf5c 100644
--- a/src/stream/src/executor/filter.rs
+++ b/src/stream/src/executor/filter.rs
@@ -199,8 +199,7 @@ mod tests {
     use risingwave_common::array::StreamChunk;
     use risingwave_common::catalog::{Field, Schema};
     use risingwave_common::types::DataType;
-    use risingwave_expr::expr::{new_binary_expr, InputRefExpression};
-    use risingwave_pb::expr::expr_node::Type;
+    use risingwave_expr::expr::build_from_pretty;
 
     use super::super::test_utils::MockSource;
     use super::super::*;
@@ -234,15 +233,8 @@ mod tests {
         };
         let source = MockSource::with_chunks(schema, PkIndices::new(), vec![chunk1, chunk2]);
 
-        let left_expr = InputRefExpression::new(DataType::Int64, 0);
-        let right_expr = InputRefExpression::new(DataType::Int64, 1);
-        let test_expr = new_binary_expr(
-            Type::GreaterThan,
-            DataType::Boolean,
-            Box::new(left_expr),
-            Box::new(right_expr),
-        )
-        .unwrap();
+        let test_expr = build_from_pretty("(greater_than:boolean $0:int8 $1:int8)");
+
         let filter = Box::new(FilterExecutor::new(
             ActorContext::create(123),
             Box::new(source),
diff --git a/src/stream/src/executor/global_simple_agg.rs b/src/stream/src/executor/global_simple_agg.rs
index 85d8b8abdc2fe..41e7cc5e3162d 100644
--- a/src/stream/src/executor/global_simple_agg.rs
+++ b/src/stream/src/executor/global_simple_agg.rs
@@ -16,14 +16,12 @@ use futures::StreamExt;
 use futures_async_stream::try_stream;
 use risingwave_common::array::StreamChunk;
 use risingwave_common::catalog::Schema;
-use risingwave_common::row::RowExt;
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_storage::StateStore;
 
-use super::agg_common::AggExecutorArgs;
+use super::agg_common::{AggExecutorArgs, SimpleAggExecutorExtraArgs};
 use super::aggregation::{
-    agg_call_filter_res, iter_table_storage, AggChangesInfo, AggStateStorage, AlwaysOutput,
-    DistinctDeduplicater,
+    agg_call_filter_res, iter_table_storage, AggStateStorage, AlwaysOutput, DistinctDeduplicater,
 };
 use super::*;
 use crate::common::table::state_table::StateTable;
@@ -128,7 +126,7 @@ impl<S: StateStore> Executor for GlobalSimpleAggExecutor<S> {
 }
 
 impl<S: StateStore> GlobalSimpleAggExecutor<S> {
-    pub fn new(args: AggExecutorArgs<S>) -> StreamResult<Self> {
+    pub fn new(args: AggExecutorArgs<S, SimpleAggExecutorExtraArgs>) -> StreamResult<Self> {
         let input_info = args.input.info();
         let schema = generate_agg_schema(args.input.as_ref(), &args.agg_calls, None);
         Ok(Self {
@@ -251,29 +249,18 @@ impl<S: StateStore> GlobalSimpleAggExecutor<S> {
             let mut new_ops = Vec::with_capacity(2);
             // Retrieve modified states and put the changes into the builders.
             let curr_outputs = vars.agg_group.get_outputs(&this.storages).await?;
-            let AggChangesInfo {
-                result_row,
-                prev_outputs,
-                n_appended_ops,
-            } = vars
-                .agg_group
-                .build_changes(curr_outputs, &mut builders, &mut new_ops);
-
-            if n_appended_ops == 0 {
+            if let Some(change) = vars.agg_group.build_change(curr_outputs) {
+                vars.agg_group
+                    .apply_change_to_builders(&change, &mut builders, &mut new_ops);
+                vars.agg_group
+                    .apply_change_to_result_table(&change, &mut this.result_table);
+                this.result_table.commit(epoch).await?;
+            } else {
                 // Agg result is not changed.
                 this.result_table.commit_no_data_expected(epoch);
                 return Ok(None);
             }
 
-            // Update the result table with latest agg outputs.
-            if let Some(prev_outputs) = prev_outputs {
-                let old_row = vars.agg_group.group_key().chain(prev_outputs);
-                this.result_table.update(old_row, result_row);
-            } else {
-                this.result_table.insert(result_row);
-            }
-            this.result_table.commit(epoch).await?;
-
             let columns = builders
                 .into_iter()
                 .map(|builder| builder.finish().into())
diff --git a/src/stream/src/executor/hash_agg.rs b/src/stream/src/executor/hash_agg.rs
index 245921beb4060..ad56c27e6f0b8 100644
--- a/src/stream/src/executor/hash_agg.rs
+++ b/src/stream/src/executor/hash_agg.rs
@@ -14,6 +14,7 @@
 
 use std::collections::{HashMap, HashSet};
 use std::marker::PhantomData;
+use std::ptr::NonNull;
 use std::sync::Arc;
 
 use futures::{stream, StreamExt, TryStreamExt};
@@ -24,12 +25,11 @@ use risingwave_common::array::StreamChunk;
 use risingwave_common::buffer::{Bitmap, BitmapBuilder};
 use risingwave_common::catalog::Schema;
 use risingwave_common::hash::{HashKey, PrecomputedBuildHasher};
-use risingwave_common::row::RowExt;
 use risingwave_common::util::epoch::EpochPair;
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_storage::StateStore;
 
-use super::agg_common::AggExecutorArgs;
+use super::agg_common::{AggExecutorArgs, GroupAggExecutorExtraArgs};
 use super::aggregation::{
     agg_call_filter_res, iter_table_storage, AggStateStorage, DistinctDeduplicater,
     OnlyOutputIfHasInput,
@@ -41,14 +41,14 @@ use super::{
 use crate::cache::{cache_may_stale, new_with_hasher, ExecutorCache};
 use crate::common::table::state_table::StateTable;
 use crate::error::StreamResult;
-use crate::executor::aggregation::{generate_agg_schema, AggCall, AggChangesInfo, AggGroup};
+use crate::executor::aggregation::{generate_agg_schema, AggCall, AggGroup as GenericAggGroup};
 use crate::executor::error::StreamExecutorError;
 use crate::executor::monitor::StreamingMetrics;
 use crate::executor::{BoxedMessageStream, Message};
 use crate::task::AtomicU64Ref;
 
-type BoxedAggGroup<S> = Box<AggGroup<S, OnlyOutputIfHasInput>>;
-type AggGroupCache<K, S> = ExecutorCache<K, BoxedAggGroup<S>, PrecomputedBuildHasher>;
+type AggGroup<S> = GenericAggGroup<S, OnlyOutputIfHasInput>;
+type AggGroupCache<K, S> = ExecutorCache<K, AggGroup<S>, PrecomputedBuildHasher>;
 
 /// [`HashAggExecutor`] could process large amounts of data using a state backend. It works as
 /// follows:
@@ -177,14 +177,12 @@ impl<K: HashKey, S: StateStore> Executor for HashAggExecutor<K, S> {
 }
 
 impl<K: HashKey, S: StateStore> HashAggExecutor<K, S> {
-    pub fn new(args: AggExecutorArgs<S>) -> StreamResult<Self> {
-        let extra_args = args.extra.unwrap();
-
+    pub fn new(args: AggExecutorArgs<S, GroupAggExecutorExtraArgs>) -> StreamResult<Self> {
         let input_info = args.input.info();
         let schema = generate_agg_schema(
             args.input.as_ref(),
             &args.agg_calls,
-            Some(&extra_args.group_key_indices),
+            Some(&args.extra.group_key_indices),
         );
         Ok(Self {
             input: args.input,
@@ -198,16 +196,16 @@ impl<K: HashKey, S: StateStore> HashAggExecutor<K, S> {
                 },
                 input_pk_indices: input_info.pk_indices,
                 input_schema: input_info.schema,
-                group_key_indices: extra_args.group_key_indices,
+                group_key_indices: args.extra.group_key_indices,
                 agg_calls: args.agg_calls,
                 row_count_index: args.row_count_index,
                 storages: args.storages,
                 result_table: args.result_table,
                 distinct_dedup_tables: args.distinct_dedup_tables,
                 watermark_epoch: args.watermark_epoch,
-                chunk_size: extra_args.chunk_size,
                 extreme_cache_size: args.extreme_cache_size,
-                metrics: extra_args.metrics,
+                chunk_size: args.extra.chunk_size,
+                metrics: args.extra.metrics,
             },
         })
     }
@@ -255,19 +253,17 @@ impl<K: HashKey, S: StateStore> HashAggExecutor<K, S> {
                     Some(async {
                         // Create `AggGroup` for the current group if not exists. This will
                         // fetch previous agg result from the result table.
-                        let agg_group = Box::new(
-                            AggGroup::create(
-                                Some(key.deserialize(group_key_types)?),
-                                &this.agg_calls,
-                                &this.storages,
-                                &this.result_table,
-                                &this.input_pk_indices,
-                                this.row_count_index,
-                                this.extreme_cache_size,
-                                &this.input_schema,
-                            )
-                            .await?,
-                        );
+                        let agg_group = AggGroup::create(
+                            Some(key.deserialize(group_key_types)?),
+                            &this.agg_calls,
+                            &this.storages,
+                            &this.result_table,
+                            &this.input_pk_indices,
+                            this.row_count_index,
+                            this.extreme_cache_size,
+                            &this.input_schema,
+                        )
+                        .await?;
                         Ok::<_, StreamExecutorError>((key.clone(), agg_group))
                     })
                 }
@@ -345,7 +341,7 @@ impl<K: HashKey, S: StateStore> HashAggExecutor<K, S> {
 
         // Apply chunk to each of the state (per agg_call), for each group.
         for (key, visibility) in group_visibilities {
-            let agg_group = vars.agg_group_cache.get_mut(&key).unwrap().as_mut();
+            let agg_group = vars.agg_group_cache.get_mut(&key).unwrap();
             let visibilities = call_visibilities
                 .iter()
                 .map(Option::as_ref)
@@ -411,8 +407,6 @@ impl<K: HashKey, S: StateStore> HashAggExecutor<K, S> {
         let dirty_cnt = vars.group_change_set.len();
         if dirty_cnt > 0 {
             // Produce the stream chunk
-            let group_key_data_types =
-                &this.info.schema.data_types()[..this.group_key_indices.len()];
             let mut group_chunks =
                 IterChunks::chunks(vars.group_change_set.drain(), this.chunk_size);
             while let Some(batch) = group_chunks.next() {
@@ -423,8 +417,7 @@ impl<K: HashKey, S: StateStore> HashAggExecutor<K, S> {
                     let agg_group = vars
                         .agg_group_cache
                         .get_mut(key)
-                        .expect("changed group must have corresponding AggGroup")
-                        .as_mut();
+                        .expect("changed group must have corresponding AggGroup");
                     agg_group.flush_state_if_needed(&mut this.storages).await?;
                 }
 
@@ -436,11 +429,17 @@ impl<K: HashKey, S: StateStore> HashAggExecutor<K, S> {
 
                 // Calculate current outputs, concurrently.
                 let futs = keys_in_batch.into_iter().map(|key| {
-                    // Pop out the agg group temporarily.
-                    let mut agg_group = vars
-                        .agg_group_cache
-                        .pop(&key)
-                        .expect("changed group must have corresponding AggGroup");
+                    // Get agg group of the key.
+                    let agg_group = {
+                        let mut ptr: NonNull<_> = vars
+                            .agg_group_cache
+                            .get_mut(&key)
+                            .expect("changed group must have corresponding AggGroup")
+                            .into();
+                        // SAFETY: `key`s in `keys_in_batch` are unique by nature, because they're
+                        // from `group_change_set` which is a set.
+                        unsafe { ptr.as_mut() }
+                    };
                     async {
                         let curr_outputs = agg_group.get_outputs(&this.storages).await?;
                         Ok::<_, StreamExecutorError>((key, agg_group, curr_outputs))
@@ -452,34 +451,11 @@ impl<K: HashKey, S: StateStore> HashAggExecutor<K, S> {
                     .try_collect()
                     .await?;
 
-                for (key, mut agg_group, curr_outputs) in outputs_in_batch {
-                    let AggChangesInfo {
-                        n_appended_ops,
-                        result_row,
-                        prev_outputs,
-                    } = agg_group.build_changes(
-                        curr_outputs,
-                        &mut builders[this.group_key_indices.len()..],
-                        &mut new_ops,
-                    );
-
-                    if n_appended_ops != 0 {
-                        for _ in 0..n_appended_ops {
-                            key.deserialize_to_builders(
-                                &mut builders[..this.group_key_indices.len()],
-                                group_key_data_types,
-                            )?;
-                        }
-                        if let Some(prev_outputs) = prev_outputs {
-                            let old_row = agg_group.group_key().chain(prev_outputs);
-                            this.result_table.update(old_row, result_row);
-                        } else {
-                            this.result_table.insert(result_row);
-                        }
+                for (_key, agg_group, curr_outputs) in outputs_in_batch {
+                    if let Some(change) = agg_group.build_change(curr_outputs) {
+                        agg_group.apply_change_to_builders(&change, &mut builders, &mut new_ops);
+                        agg_group.apply_change_to_result_table(&change, &mut this.result_table);
                     }
-
-                    // Put the agg group back into the agg group cache.
-                    vars.agg_group_cache.put(key, agg_group);
                 }
 
                 let columns = builders
@@ -635,7 +611,7 @@ mod tests {
     use risingwave_storage::memory::MemoryStateStore;
     use risingwave_storage::StateStore;
 
-    use crate::executor::agg_common::{AggExecutorArgs, AggExecutorArgsExtra};
+    use crate::executor::agg_common::{AggExecutorArgs, GroupAggExecutorExtraArgs};
     use crate::executor::aggregation::{AggArgs, AggCall};
     use crate::executor::monitor::StreamingMetrics;
     use crate::executor::test_utils::agg_executor::{
@@ -694,12 +670,11 @@ mod tests {
             distinct_dedup_tables: Default::default(),
             watermark_epoch: Arc::new(AtomicU64::new(0)),
 
-            extra: Some(AggExecutorArgsExtra {
+            extra: GroupAggExecutorExtraArgs {
                 group_key_indices,
-
-                metrics: Arc::new(StreamingMetrics::unused()),
                 chunk_size: 1024,
-            }),
+                metrics: Arc::new(StreamingMetrics::unused()),
+            },
         })
         .unwrap()
         .boxed()
diff --git a/src/stream/src/executor/hash_join.rs b/src/stream/src/executor/hash_join.rs
index c2023e2a3a3cb..75e9b5949e080 100644
--- a/src/stream/src/executor/hash_join.rs
+++ b/src/stream/src/executor/hash_join.rs
@@ -30,6 +30,7 @@ use risingwave_common::types::{DataType, ToOwnedDatum};
 use risingwave_common::util::epoch::EpochPair;
 use risingwave_common::util::iter_util::ZipEqDebug;
 use risingwave_expr::expr::BoxedExpression;
+use risingwave_expr::ExprError;
 use risingwave_storage::StateStore;
 
 use self::JoinType::{FullOuter, LeftOuter, LeftSemi, RightAnti, RightOuter, RightSemi};
@@ -52,6 +53,10 @@ use crate::task::AtomicU64Ref;
 /// enum is not supported in const generic.
 // TODO: Use enum to replace this once [feature(adt_const_params)](https://github.com/rust-lang/rust/issues/95174) get completed.
 pub type JoinTypePrimitive = u8;
+
+/// Evict the cache every n rows.
+const EVICT_EVERY_N_ROWS: u32 = 1024;
+
 #[allow(non_snake_case, non_upper_case_globals)]
 pub mod JoinType {
     use super::JoinTypePrimitive;
@@ -168,6 +173,17 @@ struct JoinSide<K: HashKey, S: StateStore> {
     /// The mapping from input indices of a side to output columes.
     i2o_mapping: Vec<(usize, usize)>,
     i2o_mapping_indexed: MultiMap<usize, usize>,
+    /// The first field of the ith element indicates that when a watermark at the ith column of
+    /// this side comes, what band join conditions should be updated in order to possibly
+    /// generate a new watermark at that column or the corresponding column in the counterpart
+    /// join side.
+    ///
+    /// The second field indicates that whether the column is required less than the
+    /// the corresponding column in the counterpart join side in the band join condition.
+    input2inequality_index: Vec<Vec<(usize, bool)>>,
+    /// (i, j) in this `Vec` means that state data in this join side can be cleaned if the value of
+    /// its ith column is less than the synthetic watermark of the jth band join condition.
+    state_clean_columns: Vec<(usize, usize)>,
     /// Whether degree table is needed for this side.
     need_degree_table: bool,
 }
@@ -229,6 +245,12 @@ pub struct HashJoinExecutor<K: HashKey, S: StateStore, const T: JoinTypePrimitiv
     side_r: JoinSide<K, S>,
     /// Optional non-equi join conditions
     cond: Option<BoxedExpression>,
+    /// Column indices of watermark output and offset expression of each inequality, respectively.
+    inequality_pairs: Vec<(Vec<usize>, Option<BoxedExpression>)>,
+    /// The output watermark of each inequality condition and its value is the minimum of the
+    /// calculation result of both side. It will be used to generate watermark into downstream
+    /// and do state cleaning if `clean_state` field of that inequality is `true`.
+    inequality_watermarks: Vec<Option<Watermark>>,
     /// Identity string
     identity: String,
 
@@ -242,6 +264,8 @@ pub struct HashJoinExecutor<K: HashKey, S: StateStore, const T: JoinTypePrimitiv
     metrics: Arc<StreamingMetrics>,
     /// The maximum size of the chunk produced by executor at a time
     chunk_size: usize,
+    /// Count the messages received, clear to 0 when counted to `EVICT_EVERY_N_MESSAGES`
+    cnt_rows_received: u32,
 
     /// watermark column index -> `BufferedWatermarks`
     watermark_buffers: BTreeMap<usize, BufferedWatermarks<SideTypePrimitive>>,
@@ -414,6 +438,7 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
         output_indices: Vec<usize>,
         executor_id: u64,
         cond: Option<BoxedExpression>,
+        inequality_pairs: Vec<(usize, usize, bool, Option<BoxedExpression>)>,
         op_info: String,
         state_table_l: StateTable<S>,
         degree_state_table_l: StateTable<S>,
@@ -538,6 +563,55 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
         let l2o_indexed = MultiMap::from_iter(left_to_output.iter().copied());
         let r2o_indexed = MultiMap::from_iter(right_to_output.iter().copied());
 
+        let left_input_len = input_l.schema().len();
+        let right_input_len = input_r.schema().len();
+        let mut l2inequality_index = vec![vec![]; left_input_len];
+        let mut r2inequality_index = vec![vec![]; right_input_len];
+        let mut l_state_clean_columns = vec![];
+        let mut r_state_clean_columns = vec![];
+        let inequality_pairs = inequality_pairs
+            .into_iter()
+            .enumerate()
+            .map(
+                |(
+                    index,
+                    (key_required_larger, key_required_smaller, clean_state, delta_expression),
+                )| {
+                    let output_indices = if key_required_larger < key_required_smaller {
+                        if clean_state {
+                            l_state_clean_columns.push((key_required_larger, index));
+                        }
+                        l2inequality_index[key_required_larger].push((index, false));
+                        r2inequality_index[key_required_smaller - left_input_len]
+                            .push((index, true));
+                        l2o_indexed
+                            .get_vec(&key_required_larger)
+                            .cloned()
+                            .unwrap_or_default()
+                    } else {
+                        if clean_state {
+                            r_state_clean_columns
+                                .push((key_required_larger - left_input_len, index));
+                        }
+                        l2inequality_index[key_required_smaller].push((index, true));
+                        r2inequality_index[key_required_larger - left_input_len]
+                            .push((index, false));
+                        r2o_indexed
+                            .get_vec(&(key_required_larger - left_input_len))
+                            .cloned()
+                            .unwrap_or_default()
+                    };
+                    (output_indices, delta_expression)
+                },
+            )
+            .collect_vec();
+
+        if append_only_optimize {
+            l_state_clean_columns.clear();
+            r_state_clean_columns.clear();
+        }
+
+        let inequality_watermarks = vec![None; inequality_pairs.len()];
         let watermark_buffers = BTreeMap::new();
 
         Self {
@@ -567,6 +641,8 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                 all_data_types: state_all_data_types_l,
                 i2o_mapping: left_to_output,
                 i2o_mapping_indexed: l2o_indexed,
+                input2inequality_index: l2inequality_index,
+                state_clean_columns: l_state_clean_columns,
                 deduped_pk_indices: state_pk_indices_l,
                 start_pos: 0,
                 need_degree_table: need_degree_table_l,
@@ -594,15 +670,20 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                 start_pos: side_l_column_n,
                 i2o_mapping: right_to_output,
                 i2o_mapping_indexed: r2o_indexed,
+                input2inequality_index: r2inequality_index,
+                state_clean_columns: r_state_clean_columns,
                 need_degree_table: need_degree_table_r,
             },
             pk_indices,
             cond,
+            inequality_pairs,
+            inequality_watermarks,
             identity: format!("HashJoinExecutor {:X}", executor_id),
             op_info,
             append_only_optimize,
             metrics,
             chunk_size,
+            cnt_rows_received: 0,
             watermark_buffers,
         }
     }
@@ -639,12 +720,16 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                 .inc_by(start_time.elapsed().as_nanos() as u64);
             match msg? {
                 AlignedMessage::WatermarkLeft(watermark) => {
-                    for watermark_to_emit in self.handle_watermark(SideType::Left, watermark)? {
+                    for watermark_to_emit in
+                        self.handle_watermark(SideType::Left, watermark).await?
+                    {
                         yield Message::Watermark(watermark_to_emit);
                     }
                 }
                 AlignedMessage::WatermarkRight(watermark) => {
-                    for watermark_to_emit in self.handle_watermark(SideType::Right, watermark)? {
+                    for watermark_to_emit in
+                        self.handle_watermark(SideType::Right, watermark).await?
+                    {
                         yield Message::Watermark(watermark_to_emit);
                     }
                 }
@@ -659,9 +744,11 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                         &mut self.side_r,
                         &self.actual_output_data_types,
                         &mut self.cond,
+                        &self.inequality_watermarks,
                         chunk,
                         self.append_only_optimize,
                         self.chunk_size,
+                        &mut self.cnt_rows_received,
                     ) {
                         left_time += left_start_time.elapsed();
                         yield Message::Chunk(chunk?);
@@ -684,9 +771,11 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                         &mut self.side_r,
                         &self.actual_output_data_types,
                         &mut self.cond,
+                        &self.inequality_watermarks,
                         chunk,
                         self.append_only_optimize,
                         self.chunk_size,
+                        &mut self.cnt_rows_received,
                     ) {
                         right_time += right_start_time.elapsed();
                         yield Message::Chunk(chunk?);
@@ -704,7 +793,12 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
 
                     // Update the vnode bitmap for state tables of both sides if asked.
                     if let Some(vnode_bitmap) = barrier.as_update_vnode_bitmap(self.ctx.id) {
-                        self.side_l.ht.update_vnode_bitmap(vnode_bitmap.clone());
+                        if self.side_l.ht.update_vnode_bitmap(vnode_bitmap.clone()) {
+                            self.watermark_buffers
+                                .values_mut()
+                                .for_each(|buffers| buffers.clear());
+                            self.inequality_watermarks.fill(None);
+                        }
                         self.side_r.ht.update_vnode_bitmap(vnode_bitmap);
                     }
 
@@ -748,15 +842,24 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
         // `commit` them here.
         self.side_l.ht.flush(epoch).await?;
         self.side_r.ht.flush(epoch).await?;
-
-        // We need to manually evict the cache to the target capacity.
-        self.side_l.ht.evict();
-        self.side_r.ht.evict();
-
         Ok(())
     }
 
-    fn handle_watermark(
+    // We need to manually evict the cache.
+    fn evict_cache(
+        side_update: &mut JoinSide<K, S>,
+        side_match: &mut JoinSide<K, S>,
+        cnt_rows_received: &mut u32,
+    ) {
+        *cnt_rows_received += 1;
+        if *cnt_rows_received == EVICT_EVERY_N_ROWS {
+            side_update.ht.evict();
+            side_match.ht.evict();
+            *cnt_rows_received = 0;
+        }
+    }
+
+    async fn handle_watermark(
         &mut self,
         side: SideTypePrimitive,
         watermark: Watermark,
@@ -801,6 +904,37 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                 }
             };
         }
+        for (inequality_index, need_offset) in
+            &side_update.input2inequality_index[watermark.col_idx]
+        {
+            let buffers = self
+                .watermark_buffers
+                .entry(side_update.join_key_indices.len() + inequality_index)
+                .or_insert_with(|| BufferedWatermarks::with_ids([SideType::Left, SideType::Right]));
+            let mut input_watermark = watermark.clone();
+            if *need_offset && let Some(delta_expression) = self.inequality_pairs[*inequality_index].1.as_ref() {
+                // allow since we will handle error manually.
+                #[allow(clippy::disallowed_methods)]
+                let eval_result = delta_expression
+                    .eval_row(&OwnedRow::new(vec![Some(input_watermark.val)]))
+                    .await;
+                match eval_result {
+                    Ok(value) => input_watermark.val = value.unwrap(),
+                    Err(err) => {
+                        if !matches!(err, ExprError::NumericOutOfRange) {
+                            self.ctx.on_compute_error(err, self.identity.as_str());
+                        }
+                        continue;
+                    },
+                }
+            };
+            if let Some(selected_watermark) = buffers.handle_watermark(side, input_watermark) {
+                for output_idx in &self.inequality_pairs[*inequality_index].0 {
+                    watermarks_to_emit.push(selected_watermark.clone().with_idx(*output_idx));
+                }
+                self.inequality_watermarks[*inequality_index] = Some(selected_watermark);
+            }
+        }
         Ok(watermarks_to_emit)
     }
 
@@ -843,9 +977,11 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
         side_r: &'a mut JoinSide<K, S>,
         actual_output_data_types: &'a [DataType],
         cond: &'a mut Option<BoxedExpression>,
+        inequality_watermarks: &'a [Option<Watermark>],
         chunk: StreamChunk,
         append_only_optimize: bool,
         chunk_size: usize,
+        cnt_rows_received: &'a mut u32,
     ) {
         let chunk = chunk.compact();
 
@@ -855,6 +991,16 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
             (side_r, side_l)
         };
 
+        let useful_state_clean_columns = side_match
+            .state_clean_columns
+            .iter()
+            .filter_map(|(column_idx, inequality_index)| {
+                inequality_watermarks[*inequality_index]
+                    .as_ref()
+                    .map(|watermark| (*column_idx, watermark))
+            })
+            .collect_vec();
+
         let mut hashjoin_chunk_builder = HashJoinChunkBuilder::<T, SIDE> {
             stream_chunk_builder: StreamChunkBuilder::new(
                 chunk_size,
@@ -866,6 +1012,8 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
 
         let keys = K::build(&side_update.join_key_indices, chunk.data_chunk())?;
         for ((op, row), key) in chunk.rows().zip_eq_debug(keys.iter()) {
+            Self::evict_cache(side_update, side_match, cnt_rows_received);
+
             let matched_rows: Option<HashValueType> =
                 Self::hash_eq_match(key, &mut side_match.ht).await?;
             match op {
@@ -873,6 +1021,7 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                     let mut degree = 0;
                     let mut append_only_matched_row = None;
                     if let Some(mut matched_rows) = matched_rows {
+                        let mut matched_rows_to_clean = vec![];
                         for (matched_row_ref, matched_row) in
                             matched_rows.values_mut(&side_match.all_data_types)
                         {
@@ -897,6 +1046,7 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                             } else {
                                 true
                             };
+                            let mut need_state_clean = false;
                             if check_join_condition {
                                 degree += 1;
                                 if !forward_exactly_once(T, SIDE) {
@@ -909,6 +1059,19 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                                 if side_match.need_degree_table {
                                     side_match.ht.inc_degree(matched_row_ref, &mut matched_row);
                                 }
+                            } else {
+                                for (column_idx, watermark) in &useful_state_clean_columns {
+                                    if matched_row
+                                        .row
+                                        .datum_at(*column_idx)
+                                        .map_or(false, |scalar| {
+                                            scalar < watermark.val.as_scalar_ref_impl()
+                                        })
+                                    {
+                                        need_state_clean = true;
+                                        break;
+                                    }
+                                }
                             }
                             // If the stream is append-only and the join key covers pk in both side,
                             // then we can remove matched rows since pk is unique and will not be
@@ -918,6 +1081,10 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                                 // one row if matched.
                                 assert!(append_only_matched_row.is_none());
                                 append_only_matched_row = Some(matched_row);
+                            } else if need_state_clean {
+                                // `append_only_optimize` and `need_state_clean` won't both be true.
+                                // 'else' here is only to suppress compiler error.
+                                matched_rows_to_clean.push(matched_row);
                             }
                         }
                         if degree == 0 {
@@ -933,6 +1100,13 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                         }
                         // Insert back the state taken from ht.
                         side_match.ht.update_state(key, matched_rows);
+                        for matched_row in matched_rows_to_clean {
+                            if side_match.need_degree_table {
+                                side_match.ht.delete(key, matched_row);
+                            } else {
+                                side_match.ht.delete_row(key, matched_row.row);
+                            }
+                        }
                     } else if let Some(chunk) =
                         hashjoin_chunk_builder.forward_if_not_matched(Op::Insert, row)
                     {
@@ -950,6 +1124,7 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                 Op::Delete | Op::UpdateDelete => {
                     let mut degree = 0;
                     if let Some(mut matched_rows) = matched_rows {
+                        let mut matched_rows_to_clean = vec![];
                         for (matched_row_ref, matched_row) in
                             matched_rows.values_mut(&side_match.all_data_types)
                         {
@@ -974,6 +1149,7 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                             } else {
                                 true
                             };
+                            let mut need_state_clean = false;
                             if check_join_condition {
                                 degree += 1;
                                 if side_match.need_degree_table {
@@ -986,6 +1162,22 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                                         yield chunk;
                                     }
                                 }
+                            } else {
+                                for (column_idx, watermark) in &useful_state_clean_columns {
+                                    if matched_row
+                                        .row
+                                        .datum_at(*column_idx)
+                                        .map_or(false, |scalar| {
+                                            scalar < watermark.val.as_scalar_ref_impl()
+                                        })
+                                    {
+                                        need_state_clean = true;
+                                        break;
+                                    }
+                                }
+                            }
+                            if need_state_clean {
+                                matched_rows_to_clean.push(matched_row);
                             }
                         }
                         if degree == 0 {
@@ -1001,6 +1193,13 @@ impl<K: HashKey, S: StateStore, const T: JoinTypePrimitive> HashJoinExecutor<K,
                         }
                         // Insert back the state taken from ht.
                         side_match.ht.update_state(key, matched_rows);
+                        for matched_row in matched_rows_to_clean {
+                            if side_match.need_degree_table {
+                                side_match.ht.delete(key, matched_row);
+                            } else {
+                                side_match.ht.delete_row(key, matched_row.row);
+                            }
+                        }
                     } else if let Some(chunk) =
                         hashjoin_chunk_builder.forward_if_not_matched(Op::Delete, row)
                     {
@@ -1032,8 +1231,7 @@ mod tests {
     use risingwave_common::hash::{Key128, Key64};
     use risingwave_common::types::ScalarImpl;
     use risingwave_common::util::sort_util::OrderType;
-    use risingwave_expr::expr::{new_binary_expr, InputRefExpression};
-    use risingwave_pb::expr::expr_node::Type;
+    use risingwave_expr::expr::build_from_pretty;
     use risingwave_storage::memory::MemoryStateStore;
 
     use super::*;
@@ -1047,20 +1245,18 @@ mod tests {
         order_types: &[OrderType],
         pk_indices: &[usize],
         table_id: u32,
-        prefix_hint_len: usize,
     ) -> (StateTable<MemoryStateStore>, StateTable<MemoryStateStore>) {
         let column_descs = data_types
             .iter()
             .enumerate()
             .map(|(id, data_type)| ColumnDesc::unnamed(ColumnId::new(id as i32), data_type.clone()))
             .collect_vec();
-        let state_table = StateTable::new_without_distribution_with_prefix_hint_len(
+        let state_table = StateTable::new_without_distribution(
             mem_state.clone(),
             TableId::new(table_id),
             column_descs,
             order_types.to_vec(),
             pk_indices.to_vec(),
-            prefix_hint_len,
         )
         .await;
 
@@ -1087,21 +1283,19 @@ mod tests {
         (state_table, degree_state_table)
     }
 
-    fn create_cond() -> BoxedExpression {
-        let left_expr = InputRefExpression::new(DataType::Int64, 1);
-        let right_expr = InputRefExpression::new(DataType::Int64, 3);
-        new_binary_expr(
-            Type::LessThan,
-            DataType::Boolean,
-            Box::new(left_expr),
-            Box::new(right_expr),
+    fn create_cond(condition_text: Option<String>) -> BoxedExpression {
+        build_from_pretty(
+            condition_text
+                .as_deref()
+                .unwrap_or("(less_than:boolean $1:int8 $3:int8)"),
         )
-        .unwrap()
     }
 
     async fn create_executor<const T: JoinTypePrimitive>(
         with_condition: bool,
         null_safe: bool,
+        condition_text: Option<String>,
+        inequality_pairs: Vec<(usize, usize, bool, Option<BoxedExpression>)>,
     ) -> (MessageSender, MessageSender, BoxedMessageStream) {
         let schema = Schema {
             fields: vec![
@@ -1111,10 +1305,9 @@ mod tests {
         };
         let (tx_l, source_l) = MockSource::channel(schema.clone(), vec![1]);
         let (tx_r, source_r) = MockSource::channel(schema, vec![1]);
-        let join_key_indices = vec![0];
-        let params_l = JoinParams::new(join_key_indices.clone(), vec![1]);
-        let params_r = JoinParams::new(join_key_indices.clone(), vec![1]);
-        let cond = with_condition.then(create_cond);
+        let params_l = JoinParams::new(vec![0], vec![1]);
+        let params_r = JoinParams::new(vec![0], vec![1]);
+        let cond = with_condition.then(|| create_cond(condition_text));
 
         let mem_state = MemoryStateStore::new();
 
@@ -1124,7 +1317,6 @@ mod tests {
             &[OrderType::ascending(), OrderType::ascending()],
             &[0, 1],
             0,
-            join_key_indices.len(),
         )
         .await;
 
@@ -1134,7 +1326,6 @@ mod tests {
             &[OrderType::ascending(), OrderType::ascending()],
             &[0, 1],
             2,
-            join_key_indices.len(),
         )
         .await;
 
@@ -1155,6 +1346,7 @@ mod tests {
             (0..schema_len).collect_vec(),
             1,
             cond,
+            inequality_pairs,
             "HashJoinExecutor".to_string(),
             state_l,
             degree_state_l,
@@ -1168,6 +1360,14 @@ mod tests {
         (tx_l, tx_r, Box::new(executor).execute())
     }
 
+    async fn create_classical_executor<const T: JoinTypePrimitive>(
+        with_condition: bool,
+        null_safe: bool,
+        condition_text: Option<String>,
+    ) -> (MessageSender, MessageSender, BoxedMessageStream) {
+        create_executor::<T>(with_condition, null_safe, condition_text, vec![]).await
+    }
+
     async fn create_append_only_executor<const T: JoinTypePrimitive>(
         with_condition: bool,
     ) -> (MessageSender, MessageSender, BoxedMessageStream) {
@@ -1180,10 +1380,9 @@ mod tests {
         };
         let (tx_l, source_l) = MockSource::channel(schema.clone(), vec![0]);
         let (tx_r, source_r) = MockSource::channel(schema, vec![0]);
-        let join_key_indices = vec![0, 1];
-        let params_l = JoinParams::new(join_key_indices.clone(), vec![]);
-        let params_r = JoinParams::new(join_key_indices.clone(), vec![]);
-        let cond = with_condition.then(create_cond);
+        let params_l = JoinParams::new(vec![0, 1], vec![]);
+        let params_r = JoinParams::new(vec![0, 1], vec![]);
+        let cond = with_condition.then(|| create_cond(None));
 
         let mem_state = MemoryStateStore::new();
 
@@ -1197,7 +1396,6 @@ mod tests {
             ],
             &[0, 1, 0],
             0,
-            join_key_indices.len(),
         )
         .await;
 
@@ -1211,7 +1409,6 @@ mod tests {
             ],
             &[0, 1, 1],
             0,
-            join_key_indices.len(),
         )
         .await;
         let schema_len = match T {
@@ -1231,6 +1428,7 @@ mod tests {
             (0..schema_len).collect_vec(),
             1,
             cond,
+            vec![],
             "HashJoinExecutor".to_string(),
             state_l,
             degree_state_l,
@@ -1244,6 +1442,93 @@ mod tests {
         (tx_l, tx_r, Box::new(executor).execute())
     }
 
+    #[tokio::test]
+    async fn test_interval_join() -> StreamExecutorResult<()> {
+        let chunk_l1 = StreamChunk::from_pretty(
+            "  I I
+             + 1 4
+             + 2 3
+             + 2 5
+             + 3 6",
+        );
+        let chunk_l2 = StreamChunk::from_pretty(
+            "  I I
+             + 3 8
+             - 3 8",
+        );
+        let chunk_r1 = StreamChunk::from_pretty(
+            "  I I
+             + 2 6
+             + 4 8
+             + 6 9",
+        );
+        let chunk_r2 = StreamChunk::from_pretty(
+            "  I  I
+             + 2 3
+             + 6 11",
+        );
+        let (mut tx_l, mut tx_r, mut hash_join) = create_executor::<{ JoinType::Inner }>(
+            true,
+            false,
+            Some(String::from("(and:boolean (greater_than:boolean $1:int8 (subtract:int8 $3:int8 2:int8)) (greater_than:boolean $3:int8 (subtract:int8 $1:int8 2:int8)))")),
+            vec![(1, 3, true, Some(build_from_pretty("(subtract:int8 $0:int8 2:int8)"))), (3, 1, true, Some(build_from_pretty("(subtract:int8 $0:int8 2:int8)")))],
+        )
+        .await;
+
+        // push the init barrier for left and right
+        tx_l.push_barrier(1, false);
+        tx_r.push_barrier(1, false);
+        hash_join.next_unwrap_ready_barrier()?;
+
+        // push the 1st left chunk
+        tx_l.push_chunk(chunk_l1);
+        hash_join.next_unwrap_pending();
+
+        // push the init barrier for left and right
+        tx_l.push_barrier(2, false);
+        tx_r.push_barrier(2, false);
+        hash_join.next_unwrap_ready_barrier()?;
+
+        // push the 2nd left chunk
+        tx_l.push_chunk(chunk_l2);
+        hash_join.next_unwrap_pending();
+
+        tx_l.push_watermark(1, DataType::Int64, ScalarImpl::Int64(10));
+        hash_join.next_unwrap_pending();
+
+        tx_r.push_watermark(1, DataType::Int64, ScalarImpl::Int64(6));
+        let output_watermark = hash_join.next_unwrap_ready_watermark()?;
+        assert_eq!(
+            output_watermark,
+            Watermark::new(1, DataType::Int64, ScalarImpl::Int64(4))
+        );
+        let output_watermark = hash_join.next_unwrap_ready_watermark()?;
+        assert_eq!(
+            output_watermark,
+            Watermark::new(3, DataType::Int64, ScalarImpl::Int64(6))
+        );
+
+        // push the 1st right chunk
+        tx_r.push_chunk(chunk_r1);
+        let chunk = hash_join.next_unwrap_ready_chunk()?;
+        // data "2 3" should have been cleaned
+        assert_eq!(
+            chunk,
+            StreamChunk::from_pretty(
+                " I I I I
+                + 2 5 2 6"
+            )
+        );
+
+        // push the 2nd right chunk
+        tx_r.push_chunk(chunk_r2);
+        // pending means that state clean is successful, or the executor will yield a chunk "+ 2 3
+        // 2 3" here.
+        hash_join.next_unwrap_pending();
+
+        Ok(())
+    }
+
     #[tokio::test]
     async fn test_streaming_hash_inner_join() -> StreamExecutorResult<()> {
         let chunk_l1 = StreamChunk::from_pretty(
@@ -1269,7 +1554,7 @@ mod tests {
              + 6 11",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::Inner }>(false, false).await;
+            create_classical_executor::<{ JoinType::Inner }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -1339,7 +1624,7 @@ mod tests {
              + 6 11",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::Inner }>(false, true).await;
+            create_classical_executor::<{ JoinType::Inner }>(false, true, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -1421,7 +1706,7 @@ mod tests {
              - 6 9",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::LeftSemi }>(false, false).await;
+            create_classical_executor::<{ JoinType::LeftSemi }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -1531,7 +1816,7 @@ mod tests {
              - 6 9",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::LeftSemi }>(false, true).await;
+            create_classical_executor::<{ JoinType::LeftSemi }>(false, true, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -1860,7 +2145,7 @@ mod tests {
              - 6 9",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::RightSemi }>(false, false).await;
+            create_classical_executor::<{ JoinType::RightSemi }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -1972,7 +2257,7 @@ mod tests {
              - 1 3",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::LeftAnti }>(false, false).await;
+            create_classical_executor::<{ JoinType::LeftAnti }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -2102,7 +2387,7 @@ mod tests {
              - 1 3",
         );
         let (mut tx_r, mut tx_l, mut hash_join) =
-            create_executor::<{ JoinType::LeftAnti }>(false, false).await;
+            create_classical_executor::<{ JoinType::LeftAnti }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_r.push_barrier(1, false);
@@ -2218,7 +2503,7 @@ mod tests {
              + 6 11",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::Inner }>(false, false).await;
+            create_classical_executor::<{ JoinType::Inner }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -2313,7 +2598,7 @@ mod tests {
              + 6 11",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::Inner }>(false, false).await;
+            create_classical_executor::<{ JoinType::Inner }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -2408,7 +2693,7 @@ mod tests {
              + 6 11",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::LeftOuter }>(false, false).await;
+            create_classical_executor::<{ JoinType::LeftOuter }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -2492,7 +2777,7 @@ mod tests {
              + 6 11",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::LeftOuter }>(false, true).await;
+            create_classical_executor::<{ JoinType::LeftOuter }>(false, true, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -2576,7 +2861,7 @@ mod tests {
              - 5 10",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::RightOuter }>(false, false).await;
+            create_classical_executor::<{ JoinType::RightOuter }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -2804,7 +3089,7 @@ mod tests {
              - 5 10",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::FullOuter }>(false, false).await;
+            create_classical_executor::<{ JoinType::FullOuter }>(false, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -2894,7 +3179,7 @@ mod tests {
              + 1 2",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::FullOuter }>(true, false).await;
+            create_classical_executor::<{ JoinType::FullOuter }>(true, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -2986,7 +3271,7 @@ mod tests {
              + 6 11",
         );
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::Inner }>(true, false).await;
+            create_classical_executor::<{ JoinType::Inner }>(true, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
@@ -3022,7 +3307,7 @@ mod tests {
     #[tokio::test]
     async fn test_streaming_hash_join_watermark() -> StreamExecutorResult<()> {
         let (mut tx_l, mut tx_r, mut hash_join) =
-            create_executor::<{ JoinType::Inner }>(true, false).await;
+            create_classical_executor::<{ JoinType::Inner }>(true, false, None).await;
 
         // push the init barrier for left and right
         tx_l.push_barrier(1, false);
diff --git a/src/stream/src/executor/hop_window.rs b/src/stream/src/executor/hop_window.rs
index ded6e3fcf4fe3..c9eb64c6f7f32 100644
--- a/src/stream/src/executor/hop_window.rs
+++ b/src/stream/src/executor/hop_window.rs
@@ -18,7 +18,7 @@ use futures::StreamExt;
 use futures_async_stream::try_stream;
 use risingwave_common::array::column::Column;
 use risingwave_common::array::{StreamChunk, Vis};
-use risingwave_common::types::IntervalUnit;
+use risingwave_common::types::Interval;
 use risingwave_expr::expr::BoxedExpression;
 use risingwave_expr::ExprError;
 
@@ -30,8 +30,8 @@ pub struct HopWindowExecutor {
     pub input: BoxedExecutor,
     pub info: ExecutorInfo,
     pub time_col_idx: usize,
-    pub window_slide: IntervalUnit,
-    pub window_size: IntervalUnit,
+    pub window_slide: Interval,
+    pub window_size: Interval,
     window_start_exprs: Vec<BoxedExpression>,
     window_end_exprs: Vec<BoxedExpression>,
     pub output_indices: Vec<usize>,
@@ -44,8 +44,8 @@ impl HopWindowExecutor {
         input: BoxedExecutor,
         info: ExecutorInfo,
         time_col_idx: usize,
-        window_slide: IntervalUnit,
-        window_size: IntervalUnit,
+        window_slide: Interval,
+        window_size: Interval,
         window_start_exprs: Vec<BoxedExpression>,
         window_end_exprs: Vec<BoxedExpression>,
         output_indices: Vec<usize>,
@@ -199,8 +199,8 @@ mod tests {
     use futures::StreamExt;
     use risingwave_common::array::stream_chunk::StreamChunkTestExt;
     use risingwave_common::catalog::{Field, Schema};
-    use risingwave_common::types::test_utils::IntervalUnitTestExt;
-    use risingwave_common::types::{DataType, IntervalUnit};
+    use risingwave_common::types::test_utils::IntervalTestExt;
+    use risingwave_common::types::{DataType, Interval};
     use risingwave_expr::expr::test_utils::make_hop_window_expression;
 
     use super::super::*;
@@ -227,9 +227,9 @@ mod tests {
         );
         let input =
             MockSource::with_chunks(schema.clone(), pk_indices.clone(), vec![chunk]).boxed();
-        let window_slide = IntervalUnit::from_minutes(15);
-        let window_size = IntervalUnit::from_minutes(30);
-        let window_offset = IntervalUnit::from_minutes(0);
+        let window_slide = Interval::from_minutes(15);
+        let window_size = Interval::from_minutes(30);
+        let window_offset = Interval::from_minutes(0);
         let (window_start_exprs, window_end_exprs) = make_hop_window_expression(
             DataType::Timestamp,
             2,
@@ -350,9 +350,9 @@ mod tests {
         let pk_indices = vec![0];
         let (tx, source) = MockSource::channel(schema.clone(), pk_indices.clone());
 
-        let window_slide = IntervalUnit::from_minutes(15);
-        let window_size = IntervalUnit::from_minutes(30);
-        let offset = IntervalUnit::from_minutes(0);
+        let window_slide = Interval::from_minutes(15);
+        let window_size = Interval::from_minutes(30);
+        let offset = Interval::from_minutes(0);
         let (window_start_exprs, window_end_exprs) =
             make_hop_window_expression(DataType::Timestamp, 2, window_size, window_slide, offset)
                 .unwrap();
diff --git a/src/stream/src/executor/integration_tests.rs b/src/stream/src/executor/integration_tests.rs
index eb9d70679b78e..4eae8cfc7abf1 100644
--- a/src/stream/src/executor/integration_tests.rs
+++ b/src/stream/src/executor/integration_tests.rs
@@ -196,6 +196,7 @@ async fn test_merger_sum_aggr() {
         ],
         3,
         MultiMap::new(),
+        0.0,
     );
 
     let items = Arc::new(Mutex::new(vec![]));
diff --git a/src/stream/src/executor/lookup.rs b/src/stream/src/executor/lookup.rs
index db068fefc9b5b..94e9eeab76742 100644
--- a/src/stream/src/executor/lookup.rs
+++ b/src/stream/src/executor/lookup.rs
@@ -28,6 +28,8 @@ mod impl_;
 
 pub use impl_::LookupExecutorParams;
 
+use super::ActorContextRef;
+
 #[cfg(test)]
 mod tests;
 
@@ -38,6 +40,8 @@ mod tests;
 /// The output schema is `| stream columns | arrangement columns |`.
 /// The input is required to be first stream and then arrangement.
 pub struct LookupExecutor<S: StateStore> {
+    ctx: ActorContextRef,
+
     /// the data types of the produced data chunk inside lookup (before reordering)
     chunk_data_types: Vec<DataType>,
 
diff --git a/src/stream/src/executor/lookup/cache.rs b/src/stream/src/executor/lookup/cache.rs
index 498cb164a9620..0922b0b7a3323 100644
--- a/src/stream/src/executor/lookup/cache.rs
+++ b/src/stream/src/executor/lookup/cache.rs
@@ -64,6 +64,11 @@ impl LookupCache {
         self.data.update_epoch(epoch);
     }
 
+    /// Clear the cache.
+    pub fn clear(&mut self) {
+        self.data.clear();
+    }
+
     pub fn new(watermark_epoch: AtomicU64Ref) -> Self {
         let cache = ExecutorCache::new(new_unbounded(watermark_epoch));
         Self { data: cache }
diff --git a/src/stream/src/executor/lookup/impl_.rs b/src/stream/src/executor/lookup/impl_.rs
index 12b7610f1635a..375c307054724 100644
--- a/src/stream/src/executor/lookup/impl_.rs
+++ b/src/stream/src/executor/lookup/impl_.rs
@@ -28,16 +28,19 @@ use risingwave_storage::table::TableIter;
 use risingwave_storage::StateStore;
 
 use super::sides::{stream_lookup_arrange_prev_epoch, stream_lookup_arrange_this_epoch};
+use crate::cache::cache_may_stale;
 use crate::common::StreamChunkBuilder;
 use crate::executor::error::{StreamExecutorError, StreamExecutorResult};
 use crate::executor::lookup::cache::LookupCache;
 use crate::executor::lookup::sides::{ArrangeJoinSide, ArrangeMessage, StreamJoinSide};
 use crate::executor::lookup::LookupExecutor;
-use crate::executor::{Barrier, Executor, Message, PkIndices};
+use crate::executor::{ActorContextRef, Barrier, Executor, Message, PkIndices};
 use crate::task::AtomicU64Ref;
 
 /// Parameters for [`LookupExecutor`].
 pub struct LookupExecutorParams<S: StateStore> {
+    pub ctx: ActorContextRef,
+
     /// The side for arrangement. Currently, it should be a
     /// `MaterializeExecutor`.
     pub arrangement: Box<dyn Executor>,
@@ -116,6 +119,7 @@ pub struct LookupExecutorParams<S: StateStore> {
 impl<S: StateStore> LookupExecutor<S> {
     pub fn new(params: LookupExecutorParams<S>) -> Self {
         let LookupExecutorParams {
+            ctx,
             arrangement,
             stream,
             arrangement_col_descs,
@@ -202,6 +206,7 @@ impl<S: StateStore> LookupExecutor<S> {
         );
 
         Self {
+            ctx,
             chunk_data_types,
             schema: output_schema,
             pk_indices,
@@ -273,10 +278,8 @@ impl<S: StateStore> LookupExecutor<S> {
                         self.lookup_cache.flush();
                     }
 
-                    // Use the new stream barrier epoch as new cache epoch
-                    self.lookup_cache.update_epoch(barrier.epoch.curr);
+                    self.process_barrier(&barrier);
 
-                    self.process_barrier(barrier.clone()).await?;
                     if self.arrangement.use_current_epoch {
                         // When lookup this epoch, stream side barrier always come after arrangement
                         // ready, so we can forward barrier now.
@@ -336,11 +339,23 @@ impl<S: StateStore> LookupExecutor<S> {
         }
     }
 
-    /// Store the barrier.
-    #[expect(clippy::unused_async)]
-    async fn process_barrier(&mut self, barrier: Barrier) -> StreamExecutorResult<()> {
-        self.last_barrier = Some(barrier);
-        Ok(())
+    /// Process the barrier and apply changes if necessary.
+    fn process_barrier(&mut self, barrier: &Barrier) {
+        if let Some(vnode_bitmap) = barrier.as_update_vnode_bitmap(self.ctx.id) {
+            let previous_vnode_bitmap = self
+                .arrangement
+                .storage_table
+                .update_vnode_bitmap(vnode_bitmap.clone());
+
+            // Manipulate the cache if necessary.
+            if cache_may_stale(&previous_vnode_bitmap, &vnode_bitmap) {
+                self.lookup_cache.clear();
+            }
+        }
+
+        // Use the new stream barrier epoch as new cache epoch
+        self.lookup_cache.update_epoch(barrier.epoch.curr);
+        self.last_barrier = Some(barrier.clone());
     }
 
     /// Lookup all rows corresponding to a join key in shared buffer.
diff --git a/src/stream/src/executor/lookup/tests.rs b/src/stream/src/executor/lookup/tests.rs
index 66898dbd0d48a..5fda9504d17f7 100644
--- a/src/stream/src/executor/lookup/tests.rs
+++ b/src/stream/src/executor/lookup/tests.rs
@@ -20,7 +20,7 @@ use futures::StreamExt;
 use itertools::Itertools;
 use risingwave_common::array::stream_chunk::StreamChunkTestExt;
 use risingwave_common::array::StreamChunk;
-use risingwave_common::catalog::{ColumnDesc, ColumnId, ConflictBehavior, Field, Schema, TableId};
+use risingwave_common::catalog::{ColumnDesc, ConflictBehavior, Field, Schema, TableId};
 use risingwave_common::types::DataType;
 use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
 use risingwave_storage::memory::MemoryStateStore;
@@ -30,25 +30,13 @@ use crate::executor::lookup::impl_::LookupExecutorParams;
 use crate::executor::lookup::LookupExecutor;
 use crate::executor::test_utils::*;
 use crate::executor::{
-    Barrier, BoxedMessageStream, Executor, MaterializeExecutor, Message, PkIndices,
+    ActorContext, Barrier, BoxedMessageStream, Executor, MaterializeExecutor, Message, PkIndices,
 };
 
 fn arrangement_col_descs() -> Vec<ColumnDesc> {
     vec![
-        ColumnDesc {
-            data_type: DataType::Int64,
-            column_id: ColumnId::new(0),
-            name: "rowid_column".to_string(),
-            field_descs: vec![],
-            type_name: "".to_string(),
-        },
-        ColumnDesc {
-            data_type: DataType::Int64,
-            column_id: ColumnId::new(1),
-            name: "join_column".to_string(),
-            field_descs: vec![],
-            type_name: "".to_string(),
-        },
+        ColumnDesc::new_atomic(DataType::Int64, "rowid_column", 0),
+        ColumnDesc::new_atomic(DataType::Int64, "join_column", 1),
     ]
 }
 
@@ -152,20 +140,8 @@ async fn create_arrangement(
 /// | b  |       |      | 3 -> 4  |
 fn create_source() -> Box<dyn Executor + Send> {
     let columns = vec![
-        ColumnDesc {
-            data_type: DataType::Int64,
-            column_id: ColumnId::new(1),
-            name: "join_column".to_string(),
-            field_descs: vec![],
-            type_name: "".to_string(),
-        },
-        ColumnDesc {
-            data_type: DataType::Int64,
-            column_id: ColumnId::new(2),
-            name: "rowid_column".to_string(),
-            field_descs: vec![],
-            type_name: "".to_string(),
-        },
+        ColumnDesc::new_atomic(DataType::Int64, "join_column", 1),
+        ColumnDesc::new_atomic(DataType::Int64, "rowid_column", 2),
     ];
 
     // Prepare source chunks.
@@ -218,6 +194,7 @@ async fn test_lookup_this_epoch() {
     let arrangement = create_arrangement(table_id, store.clone()).await;
     let stream = create_source();
     let lookup_executor = Box::new(LookupExecutor::new(LookupExecutorParams {
+        ctx: ActorContext::create(0),
         arrangement,
         stream,
         arrangement_col_descs: arrangement_col_descs(),
@@ -281,14 +258,13 @@ async fn test_lookup_this_epoch() {
 }
 
 #[tokio::test]
-#[ignore]
-// Deprecated because the ability to read from prev epoch has been deprecated.
 async fn test_lookup_last_epoch() {
     let store = MemoryStateStore::new();
     let table_id = TableId::new(1);
     let arrangement = create_arrangement(table_id, store.clone()).await;
     let stream = create_source();
     let lookup_executor = Box::new(LookupExecutor::new(LookupExecutorParams {
+        ctx: ActorContext::create(0),
         arrangement,
         stream,
         arrangement_col_descs: arrangement_col_descs(),
diff --git a/src/stream/src/executor/lookup_union.rs b/src/stream/src/executor/lookup_union.rs
index a1be7e90b3984..f8385ff971359 100644
--- a/src/stream/src/executor/lookup_union.rs
+++ b/src/stream/src/executor/lookup_union.rs
@@ -119,7 +119,7 @@ impl LookupUnionExecutor {
                         msg @ Message::Chunk(_) => yield msg,
                         Message::Barrier(barrier) => {
                             if let Some(this_barrier) = &this_barrier {
-                                if this_barrier != &barrier {
+                                if this_barrier.epoch != barrier.epoch {
                                     return Err(StreamExecutorError::align_barrier(
                                         this_barrier.clone(),
                                         barrier,
diff --git a/src/stream/src/executor/managed_state/join/mod.rs b/src/stream/src/executor/managed_state/join/mod.rs
index 5dad98f000eb0..e0988f23e3b8f 100644
--- a/src/stream/src/executor/managed_state/join/mod.rs
+++ b/src/stream/src/executor/managed_state/join/mod.rs
@@ -36,7 +36,7 @@ use risingwave_common::util::sort_util::OrderType;
 use risingwave_storage::store::PrefetchOptions;
 use risingwave_storage::StateStore;
 
-use crate::cache::{cache_may_stale, new_with_hasher_in, ExecutorCache};
+use crate::cache::{new_with_hasher_in, ExecutorCache};
 use crate::common::table::state_table::StateTable;
 use crate::executor::error::StreamExecutorResult;
 use crate::executor::monitor::StreamingMetrics;
@@ -161,7 +161,6 @@ pub struct JoinHashMapMetrics {
     total_lookup_count: usize,
     /// How many times have we miss the cache when insert row
     insert_cache_miss_count: usize,
-    may_exist_true_count: usize,
 }
 
 impl JoinHashMapMetrics {
@@ -173,7 +172,6 @@ impl JoinHashMapMetrics {
             lookup_miss_count: 0,
             total_lookup_count: 0,
             insert_cache_miss_count: 0,
-            may_exist_true_count: 0,
         }
     }
 
@@ -190,14 +188,9 @@ impl JoinHashMapMetrics {
             .join_insert_cache_miss_count
             .with_label_values(&[&self.actor_id, self.side])
             .inc_by(self.insert_cache_miss_count as u64);
-        self.metrics
-            .join_may_exist_true_count
-            .with_label_values(&[&self.actor_id, self.side])
-            .inc_by(self.may_exist_true_count as u64);
         self.total_lookup_count = 0;
         self.lookup_miss_count = 0;
         self.insert_cache_miss_count = 0;
-        self.may_exist_true_count = 0;
     }
 }
 
@@ -318,16 +311,16 @@ impl<K: HashKey, S: StateStore> JoinHashMap<K, S> {
     }
 
     /// Update the vnode bitmap and manipulate the cache if necessary.
-    pub fn update_vnode_bitmap(&mut self, vnode_bitmap: Arc<Bitmap>) {
-        let previous_vnode_bitmap = self.state.table.update_vnode_bitmap(vnode_bitmap.clone());
-        let _ = self
-            .degree_state
-            .table
-            .update_vnode_bitmap(vnode_bitmap.clone());
-
-        if cache_may_stale(&previous_vnode_bitmap, &vnode_bitmap) {
+    pub fn update_vnode_bitmap(&mut self, vnode_bitmap: Arc<Bitmap>) -> bool {
+        let (_previous_vnode_bitmap, cache_may_stale) =
+            self.state.table.update_vnode_bitmap(vnode_bitmap.clone());
+        let _ = self.degree_state.table.update_vnode_bitmap(vnode_bitmap);
+
+        if cache_may_stale {
             self.inner.clear();
         }
+
+        cache_may_stale
     }
 
     pub fn update_watermark(&mut self, watermark: ScalarImpl) {
@@ -435,22 +428,11 @@ impl<K: HashKey, S: StateStore> JoinHashMap<K, S> {
             // Update cache
             entry.insert(pk, value.encode());
         } else if self.pk_contained_in_jk {
-            // Refill cache when the join key contains primary key.
+            // Refill cache when the join key exist in neither cache or storage.
             self.metrics.insert_cache_miss_count += 1;
             let mut state = JoinEntryState::default();
             state.insert(pk, value.encode());
             self.update_state(key, state.into());
-        } else {
-            let prefix = key.deserialize(&self.join_key_data_types)?;
-            self.metrics.insert_cache_miss_count += 1;
-            // Refill cache when the join key exists in neither cache or storage.
-            if !self.state.table.may_exist(&prefix).await? {
-                let mut state = JoinEntryState::default();
-                state.insert(pk, value.encode());
-                self.update_state(key, state.into());
-            } else {
-                self.metrics.may_exist_true_count += 1;
-            }
         }
 
         // Update the flush buffer.
@@ -462,6 +444,7 @@ impl<K: HashKey, S: StateStore> JoinHashMap<K, S> {
 
     /// Insert a row.
     /// Used when the side does not need to update degree.
+    #[allow(clippy::unused_async)]
     pub async fn insert_row(&mut self, key: &K, value: impl Row) -> StreamExecutorResult<()> {
         let join_row = JoinRow::new(&value, 0);
         let pk = (&value)
@@ -471,22 +454,11 @@ impl<K: HashKey, S: StateStore> JoinHashMap<K, S> {
             // Update cache
             entry.insert(pk, join_row.encode());
         } else if self.pk_contained_in_jk {
-            // Refill cache when the join key contains primary key.
+            // Refill cache when the join key exist in neither cache or storage.
             self.metrics.insert_cache_miss_count += 1;
             let mut state = JoinEntryState::default();
             state.insert(pk, join_row.encode());
             self.update_state(key, state.into());
-        } else {
-            let prefix = key.deserialize(&self.join_key_data_types)?;
-            self.metrics.insert_cache_miss_count += 1;
-            // Refill cache when the join key exists in neither cache or storage.
-            if !self.state.table.may_exist(&prefix).await? {
-                let mut state = JoinEntryState::default();
-                state.insert(pk, join_row.encode());
-                self.update_state(key, state.into());
-            } else {
-                self.metrics.may_exist_true_count += 1;
-            }
         }
 
         // Update the flush buffer.
diff --git a/src/stream/src/executor/managed_state/top_n/top_n_state.rs b/src/stream/src/executor/managed_state/top_n/top_n_state.rs
index 40441f77bb15c..8dee8fb7fba8e 100644
--- a/src/stream/src/executor/managed_state/top_n/top_n_state.rs
+++ b/src/stream/src/executor/managed_state/top_n/top_n_state.rs
@@ -354,9 +354,10 @@ mod tests {
 
     #[tokio::test]
     async fn test_managed_top_n_state_fill_cache() {
+        let data_types = vec![DataType::Varchar, DataType::Int64];
         let state_table = {
             let mut tb = create_in_memory_state_table(
-                &[DataType::Varchar, DataType::Int64],
+                &data_types,
                 &[OrderType::ascending(), OrderType::ascending()],
                 &[0, 1],
             )
@@ -382,7 +383,7 @@ mod tests {
         let rows = vec![row1, row2, row3, row4, row5];
         let ordered_rows = vec![row1_bytes, row2_bytes, row3_bytes, row4_bytes, row5_bytes];
 
-        let mut cache = TopNCache::<false>::new(1, 1);
+        let mut cache = TopNCache::<false>::new(1, 1, data_types);
 
         managed_state.insert(rows[3].clone());
         managed_state.insert(rows[1].clone());
diff --git a/src/stream/src/executor/merge.rs b/src/stream/src/executor/merge.rs
index 40fd5fe5c1976..ad734cf05d3e8 100644
--- a/src/stream/src/executor/merge.rs
+++ b/src/stream/src/executor/merge.rs
@@ -144,6 +144,21 @@ impl MergeExecutor {
                     );
                     barrier.passed_actors.push(actor_id);
 
+                    if let Some(Mutation::Update { dispatchers, .. }) = barrier.mutation.as_deref()
+                    {
+                        if select_all
+                            .upstream_actor_ids()
+                            .iter()
+                            .any(|actor_id| dispatchers.contains_key(actor_id))
+                        {
+                            // `Watermark` of upstream may become stale after downstream scaling.
+                            select_all
+                                .buffered_watermarks
+                                .values_mut()
+                                .for_each(|buffers| buffers.clear());
+                        }
+                    }
+
                     if let Some(update) =
                         barrier.as_update_merge(self.actor_context.id, self.upstream_fragment_id)
                     {
@@ -330,7 +345,7 @@ impl Stream for SelectReceivers {
         // If this barrier asks the actor to stop, we do not reset the active upstreams so that the
         // next call would return `Poll::Ready(None)` due to `is_terminated`.
         let upstreams = std::mem::take(&mut self.blocked);
-        if barrier.is_stop_or_update_drop_actor(self.actor_id) {
+        if barrier.is_stop(self.actor_id) {
             drop(upstreams);
         } else {
             self.extend_active(upstreams);
diff --git a/src/stream/src/executor/mod.rs b/src/stream/src/executor/mod.rs
index cf2be19024e38..7b71a06101dea 100644
--- a/src/stream/src/executor/mod.rs
+++ b/src/stream/src/executor/mod.rs
@@ -34,16 +34,15 @@ use risingwave_common::util::value_encoding::{deserialize_datum, serialize_datum
 use risingwave_connector::source::SplitImpl;
 use risingwave_expr::expr::BoxedExpression;
 use risingwave_expr::ExprError;
-use risingwave_pb::data::{Datum as ProstDatum, Epoch as ProstEpoch};
-use risingwave_pb::expr::InputRef as ProstInputRef;
+use risingwave_pb::data::{PbDatum, PbEpoch};
+use risingwave_pb::expr::PbInputRef;
 use risingwave_pb::stream_plan::add_mutation::Dispatchers;
-use risingwave_pb::stream_plan::barrier::Mutation as ProstMutation;
+use risingwave_pb::stream_plan::barrier::PbMutation;
 use risingwave_pb::stream_plan::stream_message::StreamMessage;
 use risingwave_pb::stream_plan::update_mutation::{DispatcherUpdate, MergeUpdate};
 use risingwave_pb::stream_plan::{
-    AddMutation, Barrier as ProstBarrier, Dispatcher as ProstDispatcher, PauseMutation,
-    ResumeMutation, SourceChangeSplitMutation, StopMutation, StreamMessage as ProstStreamMessage,
-    UpdateMutation, Watermark as ProstWatermark,
+    AddMutation, PauseMutation, PbBarrier, PbDispatcher, PbStreamMessage, PbWatermark,
+    ResumeMutation, SourceChangeSplitMutation, StopMutation, UpdateMutation,
 };
 use smallvec::SmallVec;
 
@@ -208,7 +207,7 @@ pub const INVALID_EPOCH: u64 = 0;
 
 type UpstreamFragmentId = FragmentId;
 
-/// See [`risingwave_pb::stream_plan::barrier::Mutation`] for the semantics of each mutation.
+/// See [`PbMutation`] for the semantics of each mutation.
 #[derive(Debug, Clone, PartialEq, EnumAsInner)]
 pub enum Mutation {
     Stop(HashSet<ActorId>),
@@ -220,7 +219,8 @@ pub enum Mutation {
         actor_splits: HashMap<ActorId, Vec<SplitImpl>>,
     },
     Add {
-        adds: HashMap<ActorId, Vec<ProstDispatcher>>,
+        adds: HashMap<ActorId, Vec<PbDispatcher>>,
+        added_actors: HashSet<ActorId>,
         // TODO: remove this and use `SourceChangesSplit` after we support multiple mutations.
         splits: HashMap<ActorId, Vec<SplitImpl>>,
     },
@@ -278,7 +278,7 @@ impl Barrier {
     }
 
     /// Whether this barrier is to stop the actor with `actor_id`.
-    pub fn is_stop_or_update_drop_actor(&self, actor_id: ActorId) -> bool {
+    pub fn is_stop(&self, actor_id: ActorId) -> bool {
         self.all_stop_actors()
             .map_or(false, |actors| actors.contains(&actor_id))
     }
@@ -292,15 +292,16 @@ impl Barrier {
         }
     }
 
-    /// Whether this barrier is to add new dispatchers for the actor with `actor_id`.
-    pub fn is_add_dispatcher(&self, actor_id: ActorId) -> bool {
-        matches!(
-            self.mutation.as_deref(),
-            Some(Mutation::Add {adds, ..}) if adds
-                .values()
-                .flatten()
-                .any(|dispatcher| dispatcher.downstream_actor_id.contains(&actor_id))
-        )
+    /// Whether this barrier is to newly add the actor with `actor_id`. This is used for `Chain` and
+    /// `Values` to decide whether to output the existing (historical) data.
+    ///
+    /// By "newly", we mean the actor belongs to a subgraph of a new streaming job. That is, actors
+    /// added for scaling are not included.
+    pub fn is_newly_added(&self, actor_id: ActorId) -> bool {
+        match self.mutation.as_deref() {
+            Some(Mutation::Add { added_actors, .. }) => added_actors.contains(&actor_id),
+            _ => false,
+        }
     }
 
     /// Whether this barrier is for pause.
@@ -364,9 +365,23 @@ impl Mutation {
         matches!(self, Mutation::Stop(_))
     }
 
-    fn to_protobuf(&self) -> ProstMutation {
+    fn to_protobuf(&self) -> PbMutation {
+        let actor_splits_to_protobuf = |actor_splits: &HashMap<ActorId, Vec<SplitImpl>>| {
+            actor_splits
+                .iter()
+                .map(|(&actor_id, splits)| {
+                    (
+                        actor_id,
+                        ConnectorSplits {
+                            splits: splits.clone().iter().map(ConnectorSplit::from).collect(),
+                        },
+                    )
+                })
+                .collect::<HashMap<_, _>>()
+        };
+
         match self {
-            Mutation::Stop(actors) => ProstMutation::Stop(StopMutation {
+            Mutation::Stop(actors) => PbMutation::Stop(StopMutation {
                 actors: actors.iter().copied().collect::<Vec<_>>(),
             }),
             Mutation::Update {
@@ -375,7 +390,7 @@ impl Mutation {
                 vnode_bitmaps,
                 dropped_actors,
                 actor_splits,
-            } => ProstMutation::Update(UpdateMutation {
+            } => PbMutation::Update(UpdateMutation {
                 dispatcher_update: dispatchers.values().flatten().cloned().collect(),
                 merge_update: merges.values().cloned().collect(),
                 actor_vnode_bitmap_update: vnode_bitmaps
@@ -383,63 +398,50 @@ impl Mutation {
                     .map(|(&actor_id, bitmap)| (actor_id, bitmap.to_protobuf()))
                     .collect(),
                 dropped_actors: dropped_actors.iter().cloned().collect(),
-                actor_splits: actor_splits
+                actor_splits: actor_splits_to_protobuf(actor_splits),
+            }),
+            Mutation::Add {
+                adds,
+                added_actors,
+                splits,
+            } => PbMutation::Add(AddMutation {
+                actor_dispatchers: adds
                     .iter()
-                    .map(|(&actor_id, splits)| {
+                    .map(|(&actor_id, dispatchers)| {
                         (
                             actor_id,
-                            ConnectorSplits {
-                                splits: splits.clone().iter().map(ConnectorSplit::from).collect(),
+                            Dispatchers {
+                                dispatchers: dispatchers.clone(),
                             },
                         )
                     })
                     .collect(),
+                added_actors: added_actors.iter().copied().collect(),
+                actor_splits: actor_splits_to_protobuf(splits),
             }),
-            Mutation::Add { adds, .. } => ProstMutation::Add(AddMutation {
-                actor_dispatchers: adds
+            Mutation::SourceChangeSplit(changes) => PbMutation::Splits(SourceChangeSplitMutation {
+                actor_splits: changes
                     .iter()
-                    .map(|(&actor_id, dispatchers)| {
+                    .map(|(&actor_id, splits)| {
                         (
                             actor_id,
-                            Dispatchers {
-                                dispatchers: dispatchers.clone(),
+                            ConnectorSplits {
+                                splits: splits.clone().iter().map(ConnectorSplit::from).collect(),
                             },
                         )
                     })
                     .collect(),
-                ..Default::default()
             }),
-            Mutation::SourceChangeSplit(changes) => {
-                ProstMutation::Splits(SourceChangeSplitMutation {
-                    actor_splits: changes
-                        .iter()
-                        .map(|(&actor_id, splits)| {
-                            (
-                                actor_id,
-                                ConnectorSplits {
-                                    splits: splits
-                                        .clone()
-                                        .iter()
-                                        .map(ConnectorSplit::from)
-                                        .collect(),
-                                },
-                            )
-                        })
-                        .collect(),
-                })
-            }
-            Mutation::Pause => ProstMutation::Pause(PauseMutation {}),
-            Mutation::Resume => ProstMutation::Resume(ResumeMutation {}),
+            Mutation::Pause => PbMutation::Pause(PauseMutation {}),
+            Mutation::Resume => PbMutation::Resume(ResumeMutation {}),
         }
     }
 
-    fn from_protobuf(prost: &ProstMutation) -> StreamExecutorResult<Self> {
+    fn from_protobuf(prost: &PbMutation) -> StreamExecutorResult<Self> {
         let mutation = match prost {
-            ProstMutation::Stop(stop) => {
-                Mutation::Stop(HashSet::from_iter(stop.get_actors().clone()))
-            }
+            PbMutation::Stop(stop) => Mutation::Stop(HashSet::from_iter(stop.get_actors().clone())),
 
-            ProstMutation::Update(update) => Mutation::Update {
+            PbMutation::Update(update) => Mutation::Update {
                 dispatchers: update
                     .dispatcher_update
                     .iter()
@@ -472,12 +474,13 @@ impl Mutation {
                     .collect(),
             },
 
-            ProstMutation::Add(add) => Mutation::Add {
+            PbMutation::Add(add) => Mutation::Add {
                 adds: add
                     .actor_dispatchers
                     .iter()
                     .map(|(&actor_id, dispatchers)| (actor_id, dispatchers.dispatchers.clone()))
                     .collect(),
+                added_actors: add.added_actors.iter().copied().collect(),
                 // TODO: remove this and use `SourceChangesSplit` after we support multiple
                 // mutations.
                 splits: add
@@ -496,7 +499,7 @@ impl Mutation {
                     .collect(),
             },
 
-            ProstMutation::Splits(s) => {
+            PbMutation::Splits(s) => {
                 let mut change_splits: Vec<(ActorId, Vec<SplitImpl>)> =
                     Vec::with_capacity(s.actor_splits.len());
                 for (&actor_id, splits) in &s.actor_splits {
@@ -513,15 +516,15 @@ impl Mutation {
                 }
                 Mutation::SourceChangeSplit(change_splits.into_iter().collect())
             }
-            ProstMutation::Pause(_) => Mutation::Pause,
-            ProstMutation::Resume(_) => Mutation::Resume,
+            PbMutation::Pause(_) => Mutation::Pause,
+            PbMutation::Resume(_) => Mutation::Resume,
         };
         Ok(mutation)
     }
 }
 
 impl Barrier {
-    pub fn to_protobuf(&self) -> ProstBarrier {
+    pub fn to_protobuf(&self) -> PbBarrier {
         let Barrier {
             epoch,
             mutation,
@@ -529,8 +532,8 @@ impl Barrier {
             passed_actors,
             ..
         }: Barrier = self.clone();
-        ProstBarrier {
-            epoch: Some(ProstEpoch {
+        PbBarrier {
+            epoch: Some(PbEpoch {
                 curr: epoch.curr,
                 prev: epoch.prev,
             }),
@@ -541,7 +544,7 @@ impl Barrier {
         }
     }
 
-    pub fn from_protobuf(prost: &ProstBarrier) -> StreamExecutorResult<Self> {
+    pub fn from_protobuf(prost: &PbBarrier) -> StreamExecutorResult<Self> {
         let mutation = prost
             .mutation
             .as_ref()
@@ -624,19 +627,19 @@ impl Watermark {
             .map(|new_col_idx| self.with_idx(new_col_idx))
     }
 
-    pub fn to_protobuf(&self) -> ProstWatermark {
-        ProstWatermark {
-            column: Some(ProstInputRef {
+    pub fn to_protobuf(&self) -> PbWatermark {
+        PbWatermark {
+            column: Some(PbInputRef {
                 index: self.col_idx as _,
                 r#type: Some(self.data_type.to_protobuf()),
             }),
-            val: Some(ProstDatum {
+            val: Some(PbDatum {
                 body: serialize_datum(Some(&self.val)),
             }),
         }
     }
 
-    pub fn from_protobuf(prost: &ProstWatermark) -> StreamExecutorResult<Self> {
+    pub fn from_protobuf(prost: &PbWatermark) -> StreamExecutorResult<Self> {
         let col_ref = prost.get_column()?;
         let data_type = DataType::from(col_ref.get_type()?);
         let val = deserialize_datum(prost.get_val()?.get_body().as_slice(), &data_type)?
@@ -692,7 +695,7 @@ impl Message {
         )
     }
 
-    pub fn to_protobuf(&self) -> ProstStreamMessage {
+    pub fn to_protobuf(&self) -> PbStreamMessage {
         let prost = match self {
             Self::Chunk(stream_chunk) => {
                 let prost_stream_chunk = stream_chunk.to_protobuf();
@@ -701,12 +704,12 @@ impl Message {
             Self::Barrier(barrier) => StreamMessage::Barrier(barrier.clone().to_protobuf()),
             Self::Watermark(watermark) => StreamMessage::Watermark(watermark.to_protobuf()),
         };
-        ProstStreamMessage {
+        PbStreamMessage {
             stream_message: Some(prost),
         }
     }
 
-    pub fn from_protobuf(prost: &ProstStreamMessage) -> StreamExecutorResult<Self> {
+    pub fn from_protobuf(prost: &PbStreamMessage) -> StreamExecutorResult<Self> {
         let res = match prost.get_stream_message()? {
             StreamMessage::StreamChunk(chunk) => Message::Chunk(StreamChunk::from_protobuf(chunk)?),
             StreamMessage::Barrier(barrier) => Message::Barrier(Barrier::from_protobuf(barrier)?),
diff --git a/src/stream/src/executor/monitor/streaming_stats.rs b/src/stream/src/executor/monitor/streaming_stats.rs
index 59aa97fa31314..fc6fe6a03f8f4 100644
--- a/src/stream/src/executor/monitor/streaming_stats.rs
+++ b/src/stream/src/executor/monitor/streaming_stats.rs
@@ -53,7 +53,6 @@ pub struct StreamingMetrics {
     pub join_lookup_miss_count: GenericCounterVec<AtomicU64>,
     pub join_total_lookup_count: GenericCounterVec<AtomicU64>,
     pub join_insert_cache_miss_count: GenericCounterVec<AtomicU64>,
-    pub join_may_exist_true_count: GenericCounterVec<AtomicU64>,
     pub join_actor_input_waiting_duration_ns: GenericCounterVec<AtomicU64>,
     pub join_match_duration_ns: GenericCounterVec<AtomicU64>,
     pub join_barrier_align_duration: HistogramVec,
@@ -275,7 +274,7 @@ impl StreamingMetrics {
 
         let join_lookup_miss_count = register_int_counter_vec_with_registry!(
             "stream_join_lookup_miss_count",
-            "Join executor lookup miss count",
+            "Join executor lookup miss duration",
             &["actor_id", "side"],
             registry
         )
@@ -283,7 +282,7 @@ impl StreamingMetrics {
 
         let join_total_lookup_count = register_int_counter_vec_with_registry!(
             "stream_join_lookup_total_count",
-            "Join executor lookup total count",
+            "Join executor lookup total operation",
             &["actor_id", "side"],
             registry
         )
@@ -291,15 +290,7 @@ impl StreamingMetrics {
 
         let join_insert_cache_miss_count = register_int_counter_vec_with_registry!(
             "stream_join_insert_cache_miss_count",
-            "Count of cache miss when insert rows in join executor",
-            &["actor_id", "side"],
-            registry
-        )
-        .unwrap();
-
-        let join_may_exist_true_count = register_int_counter_vec_with_registry!(
-            "stream_join_may_exist_true_count",
-            "Count of may_exist's true returns of when insert rows in join executor",
+            "Join executor cache miss when insert operation",
             &["actor_id", "side"],
             registry
         )
@@ -486,7 +477,6 @@ impl StreamingMetrics {
             join_lookup_miss_count,
             join_total_lookup_count,
             join_insert_cache_miss_count,
-            join_may_exist_true_count,
             join_actor_input_waiting_duration_ns,
             join_match_duration_ns,
             join_barrier_align_duration,
diff --git a/src/stream/src/executor/mview/materialize.rs b/src/stream/src/executor/mview/materialize.rs
index 5ae1d4e5cad63..6bfd1758e00ec 100644
--- a/src/stream/src/executor/mview/materialize.rs
+++ b/src/stream/src/executor/mview/materialize.rs
@@ -122,7 +122,7 @@ impl<S: StateStore, SD: ValueRowSerde> MaterializeExecutor<S, SD> {
                 Message::Watermark(w) => Message::Watermark(w),
                 Message::Chunk(chunk) => {
                     match self.conflict_behavior {
-                        ConflictBehavior::OverWrite | ConflictBehavior::IgnoreConflict => {
+                        ConflictBehavior::Overwrite | ConflictBehavior::IgnoreConflict => {
                             // create MaterializeBuffer from chunk
                             let buffer = MaterializeBuffer::fill_buffer_from_chunk(
                                 chunk,
@@ -138,11 +138,7 @@ impl<S: StateStore, SD: ValueRowSerde> MaterializeExecutor<S, SD> {
 
                             let fixed_changes = self
                                 .materialize_cache
-                                .handlle_conflict(
-                                    buffer,
-                                    &self.state_table,
-                                    &self.conflict_behavior,
-                                )
+                                .handle_conflict(buffer, &self.state_table, &self.conflict_behavior)
                                 .await?;
 
                             // TODO(st1page): when materialize partial columns(), we should
@@ -430,7 +426,7 @@ impl<SD: ValueRowSerde> MaterializeCache<SD> {
         }
     }
 
-    pub async fn handlle_conflict<'a, S: StateStore>(
+    pub async fn handle_conflict<'a, S: StateStore>(
         &mut self,
         buffer: MaterializeBuffer,
         table: &StateTableInner<S, SD>,
@@ -446,7 +442,7 @@ impl<SD: ValueRowSerde> MaterializeCache<SD> {
             match row_op {
                 KeyOp::Insert(new_row) => {
                     match conflict_behavior {
-                        ConflictBehavior::OverWrite => {
+                        ConflictBehavior::Overwrite => {
                             match self.force_get(&key) {
                                 Some(old_row) => fixed_changes.push((
                                     key.clone(),
@@ -476,7 +472,7 @@ impl<SD: ValueRowSerde> MaterializeCache<SD> {
                 }
                 KeyOp::Delete(_) => {
                     match conflict_behavior {
-                        ConflictBehavior::OverWrite => {
+                        ConflictBehavior::Overwrite => {
                             match self.force_get(&key) {
                                 Some(old_row) => {
                                     fixed_changes
@@ -496,7 +492,7 @@ impl<SD: ValueRowSerde> MaterializeCache<SD> {
                 }
                 KeyOp::Update((_, new_row)) => {
                     match conflict_behavior {
-                        ConflictBehavior::OverWrite => {
+                        ConflictBehavior::Overwrite => {
                             match self.force_get(&key) {
                                 Some(old_row) => fixed_changes.push((
                                     key.clone(),
@@ -770,7 +766,7 @@ mod tests {
                 column_ids,
                 1,
                 Arc::new(AtomicU64::new(0)),
-                ConflictBehavior::OverWrite,
+                ConflictBehavior::Overwrite,
             )
             .await,
         )
@@ -903,7 +899,7 @@ mod tests {
                 column_ids,
                 1,
                 Arc::new(AtomicU64::new(0)),
-                ConflictBehavior::OverWrite,
+                ConflictBehavior::Overwrite,
             )
             .await,
         )
diff --git a/src/stream/src/executor/now.rs b/src/stream/src/executor/now.rs
index 5e489589d059a..7f154fd7da9d7 100644
--- a/src/stream/src/executor/now.rs
+++ b/src/stream/src/executor/now.rs
@@ -204,7 +204,7 @@ mod tests {
         assert_eq!(
             chunk_msg.into_chunk().unwrap().compact(),
             StreamChunk::from_pretty(
-                " TSZ
+                " I
                 + 1617235200001000"
             )
         );
@@ -233,7 +233,7 @@ mod tests {
         assert_eq!(
             chunk_msg.into_chunk().unwrap().compact(),
             StreamChunk::from_pretty(
-                " TSZ
+                " I
                 - 1617235200001000
                 + 1617235200002000"
             )
diff --git a/src/stream/src/executor/project.rs b/src/stream/src/executor/project.rs
index 86ecb80a5feda..50307e7192f7e 100644
--- a/src/stream/src/executor/project.rs
+++ b/src/stream/src/executor/project.rs
@@ -40,6 +40,10 @@ struct Inner {
     /// All the watermark derivations, (input_column_index, output_column_index). And the
     /// derivation expression is the project's expression itself.
     watermark_derivations: MultiMap<usize, usize>,
+
+    /// the selectivity threshold which should be in [0,1]. for the chunk with selectivity less
+    /// than the threshold, the Project executor will construct a new chunk before expr evaluation,
+    materialize_selectivity_threshold: f64,
 }
 
 impl ProjectExecutor {
@@ -50,6 +54,7 @@ impl ProjectExecutor {
         exprs: Vec<BoxedExpression>,
         executor_id: u64,
         watermark_derivations: MultiMap<usize, usize>,
+        materialize_selectivity_threshold: f64,
     ) -> Self {
         let info = ExecutorInfo {
             schema: input.schema().to_owned(),
@@ -74,6 +79,7 @@ impl ProjectExecutor {
                 },
                 exprs,
                 watermark_derivations,
+                materialize_selectivity_threshold,
             },
         }
     }
@@ -110,10 +116,12 @@ impl Inner {
         &self,
         chunk: StreamChunk,
     ) -> StreamExecutorResult<Option<StreamChunk>> {
-        let chunk = chunk.compact();
-
+        let chunk = if chunk.selectivity() <= self.materialize_selectivity_threshold {
+            chunk.compact()
+        } else {
+            chunk
+        };
         let (data_chunk, ops) = chunk.into_parts();
-
         let mut projected_columns = Vec::new();
 
         for expr in &self.exprs {
@@ -125,8 +133,9 @@ impl Inner {
             let new_column = Column::new(evaluated_expr);
             projected_columns.push(new_column);
         }
-
-        let new_chunk = StreamChunk::new(ops, projected_columns, None);
+        let (_, vis) = data_chunk.into_parts();
+        let vis = vis.into_visibility();
+        let new_chunk = StreamChunk::new(ops, projected_columns, vis);
         Ok(Some(new_chunk))
     }
 
@@ -188,8 +197,7 @@ mod tests {
     use risingwave_common::array::StreamChunk;
     use risingwave_common::catalog::{Field, Schema};
     use risingwave_common::types::DataType;
-    use risingwave_expr::expr::{new_binary_expr, InputRefExpression, LiteralExpression};
-    use risingwave_pb::expr::expr_node::Type;
+    use risingwave_expr::expr::build_from_pretty;
 
     use super::super::test_utils::MockSource;
     use super::super::*;
@@ -216,15 +224,7 @@ mod tests {
         };
         let source = MockSource::with_chunks(schema, PkIndices::new(), vec![chunk1, chunk2]);
 
-        let left_expr = InputRefExpression::new(DataType::Int64, 0);
-        let right_expr = InputRefExpression::new(DataType::Int64, 1);
-        let test_expr = new_binary_expr(
-            Type::Add,
-            DataType::Int64,
-            Box::new(left_expr),
-            Box::new(right_expr),
-        )
-        .unwrap();
+        let test_expr = build_from_pretty("(add:int8 $0:int8 $1:int8)");
 
         let project = Box::new(ProjectExecutor::new(
             ActorContext::create(123),
@@ -233,6 +233,7 @@ mod tests {
             vec![test_expr],
             1,
             MultiMap::new(),
+            0.0,
         ));
         let mut project = project.execute();
 
@@ -269,25 +270,8 @@ mod tests {
         };
         let (mut tx, source) = MockSource::channel(schema, PkIndices::new());
 
-        let a_left_expr = InputRefExpression::new(DataType::Int64, 0);
-        let a_right_expr = LiteralExpression::new(DataType::Int64, Some(ScalarImpl::Int64(1)));
-        let a_expr = new_binary_expr(
-            Type::Add,
-            DataType::Int64,
-            Box::new(a_left_expr),
-            Box::new(a_right_expr),
-        )
-        .unwrap();
-
-        let b_left_expr = InputRefExpression::new(DataType::Int64, 0);
-        let b_right_expr = LiteralExpression::new(DataType::Int64, Some(ScalarImpl::Int64(1)));
-        let b_expr = new_binary_expr(
-            Type::Subtract,
-            DataType::Int64,
-            Box::new(b_left_expr),
-            Box::new(b_right_expr),
-        )
-        .unwrap();
+        let a_expr = build_from_pretty("(add:int8 $0:int8 1:int8)");
+        let b_expr = build_from_pretty("(subtract:int8 $0:int8 1:int8)");
 
         let project = Box::new(ProjectExecutor::new(
             ActorContext::create(123),
@@ -296,6 +280,7 @@ mod tests {
             vec![a_expr, b_expr],
             1,
             MultiMap::from_iter(vec![(0, 0), (0, 1)].into_iter()),
+            0.0,
         ));
         let mut project = project.execute();
 
diff --git a/src/stream/src/executor/project_set.rs b/src/stream/src/executor/project_set.rs
index 3d908d9e55df4..046db5003c56e 100644
--- a/src/stream/src/executor/project_set.rs
+++ b/src/stream/src/executor/project_set.rs
@@ -210,11 +210,9 @@ mod tests {
     use risingwave_common::array::StreamChunk;
     use risingwave_common::catalog::{Field, Schema};
     use risingwave_common::types::DataType;
-    use risingwave_expr::expr::{
-        new_binary_expr, Expression, InputRefExpression, LiteralExpression,
-    };
+    use risingwave_expr::expr::{build, Expression, InputRefExpression, LiteralExpression};
     use risingwave_expr::table_function::repeat_tf;
-    use risingwave_pb::expr::expr_node::Type;
+    use risingwave_pb::expr::expr_node::PbType;
 
     use super::super::test_utils::MockSource;
     use super::super::*;
@@ -243,15 +241,16 @@ mod tests {
         };
         let source = MockSource::with_chunks(schema, PkIndices::new(), vec![chunk1, chunk2]);
 
-        let left_expr = InputRefExpression::new(DataType::Int64, 0);
-        let right_expr = InputRefExpression::new(DataType::Int64, 1);
-        let test_expr = new_binary_expr(
-            Type::Add,
+        let test_expr = build(
+            PbType::Add,
             DataType::Int64,
-            Box::new(left_expr),
-            Box::new(right_expr),
+            vec![
+                Box::new(InputRefExpression::new(DataType::Int64, 0)),
+                Box::new(InputRefExpression::new(DataType::Int64, 1)),
+            ],
         )
         .unwrap();
+
         let tf1 = repeat_tf(
             LiteralExpression::new(DataType::Int32, Some(1_i32.into())).boxed(),
             1,
diff --git a/src/stream/src/executor/rearranged_chain.rs b/src/stream/src/executor/rearranged_chain.rs
index c713eb231189c..b374d8b408155 100644
--- a/src/stream/src/executor/rearranged_chain.rs
+++ b/src/stream/src/executor/rearranged_chain.rs
@@ -114,7 +114,7 @@ impl RearrangedChainExecutor {
         // If the barrier is a conf change of creating this mview, init snapshot from its epoch
         // and begin to consume the snapshot.
         // Otherwise, it means we've recovered and the snapshot is already consumed.
-        let to_consume_snapshot = first_barrier.is_add_dispatcher(self.actor_id);
+        let to_consume_snapshot = first_barrier.is_newly_added(self.actor_id);
 
         // The first barrier message should be propagated.
         yield Message::Barrier(first_barrier.clone());
diff --git a/src/stream/src/executor/row_id_gen.rs b/src/stream/src/executor/row_id_gen.rs
index eea4a3bba7c23..d101fe485c5f0 100644
--- a/src/stream/src/executor/row_id_gen.rs
+++ b/src/stream/src/executor/row_id_gen.rs
@@ -15,8 +15,9 @@
 use futures::StreamExt;
 use futures_async_stream::try_stream;
 use risingwave_common::array::column::Column;
+use risingwave_common::array::serial_array::{Serial, SerialArrayBuilder};
 use risingwave_common::array::stream_chunk::Ops;
-use risingwave_common::array::{ArrayBuilder, I64ArrayBuilder, Op, StreamChunk};
+use risingwave_common::array::{ArrayBuilder, Op, StreamChunk};
 use risingwave_common::buffer::Bitmap;
 use risingwave_common::catalog::Schema;
 use risingwave_common::util::epoch::UNIX_RISINGWAVE_DATE_EPOCH;
@@ -77,13 +78,13 @@ impl RowIdGenExecutor {
     /// Generate a row ID column according to ops.
     async fn gen_row_id_column_by_op(&mut self, column: &Column, ops: Ops<'_>) -> Column {
         let len = column.array_ref().len();
-        let mut builder = I64ArrayBuilder::new(len);
+        let mut builder = SerialArrayBuilder::new(len);
 
         for (datum, op) in column.array_ref().iter().zip_eq_fast(ops) {
             // Only refill row_id for insert operation.
             match op {
-                Op::Insert => builder.append(Some(self.row_id_generator.next().await)),
-                _ => builder.append(Some(i64::try_from(datum.unwrap()).unwrap())),
+                Op::Insert => builder.append(Some(self.row_id_generator.next().await.into())),
+                _ => builder.append(Some(Serial::try_from(datum.unwrap()).unwrap())),
             }
         }
 
@@ -159,7 +160,7 @@ mod tests {
     #[tokio::test]
     async fn test_row_id_gen_executor() {
         let schema = Schema::new(vec![
-            Field::unnamed(DataType::Int64),
+            Field::unnamed(DataType::Serial),
             Field::unnamed(DataType::Int64),
         ]);
         let pk_indices = vec![0];
@@ -184,7 +185,7 @@ mod tests {
 
         // Insert operation
         let chunk1 = StreamChunk::from_pretty(
-            " I I
+            " SRL I
             + . 1
             + . 2
             + . 6
@@ -198,7 +199,7 @@ mod tests {
             .unwrap()
             .into_chunk()
             .unwrap();
-        let row_id_col: &PrimitiveArray<i64> = chunk.column_at(row_id_index).array_ref().into();
+        let row_id_col: &PrimitiveArray<Serial> = chunk.column_at(row_id_index).array_ref().into();
         row_id_col.iter().for_each(|row_id| {
             // Should generate row id for insert operations.
             assert!(row_id.is_some());
@@ -206,7 +207,7 @@ mod tests {
 
         // Update operation
         let chunk2 = StreamChunk::from_pretty(
-            "      I        I
+            "      SRL        I
             U- 32874283748  1
             U+ 32874283748 999",
         );
@@ -218,14 +219,14 @@ mod tests {
             .unwrap()
             .into_chunk()
             .unwrap();
-        let row_id_col: &PrimitiveArray<i64> = chunk.column_at(row_id_index).array_ref().into();
+        let row_id_col: &PrimitiveArray<Serial> = chunk.column_at(row_id_index).array_ref().into();
         // Should not generate row id for update operations.
-        assert_eq!(row_id_col.value_at(0).unwrap(), 32874283748);
-        assert_eq!(row_id_col.value_at(1).unwrap(), 32874283748);
+        assert_eq!(row_id_col.value_at(0).unwrap(), Serial::from(32874283748));
+        assert_eq!(row_id_col.value_at(1).unwrap(), Serial::from(32874283748));
 
         // Delete operation
         let chunk3 = StreamChunk::from_pretty(
-            "      I       I
+            "      SRL       I
             - 84629409685  1",
         );
         tx.push_chunk(chunk3);
@@ -236,8 +237,8 @@ mod tests {
             .unwrap()
             .into_chunk()
             .unwrap();
-        let row_id_col: &PrimitiveArray<i64> = chunk.column_at(row_id_index).array_ref().into();
+        let row_id_col: &PrimitiveArray<Serial> = chunk.column_at(row_id_index).array_ref().into();
         // Should not generate row id for delete operations.
-        assert_eq!(row_id_col.value_at(0).unwrap(), 84629409685);
+        assert_eq!(row_id_col.value_at(0).unwrap(), Serial::from(84629409685));
     }
 }
diff --git a/src/stream/src/executor/sink.rs b/src/stream/src/executor/sink.rs
index f0c82b4e397ce..434fbe8c10ed2 100644
--- a/src/stream/src/executor/sink.rs
+++ b/src/stream/src/executor/sink.rs
@@ -85,7 +85,7 @@ impl SinkExecutor {
             input: materialize_executor,
             metrics,
             config,
-            identity: format!("SinkExecutor_{:?}", executor_id),
+            identity: format!("SinkExecutor {:X?}", executor_id),
             pk_indices,
             schema,
             connector_params,
diff --git a/src/stream/src/executor/sort.rs b/src/stream/src/executor/sort.rs
index cc6b606443671..fb700b6ddabcf 100644
--- a/src/stream/src/executor/sort.rs
+++ b/src/stream/src/executor/sort.rs
@@ -217,7 +217,7 @@ impl<S: StateStore> SortExecutor<S> {
 
                     // Update the vnode bitmap for the state table if asked. Also update the buffer.
                     if let Some(vnode_bitmap) = barrier.as_update_vnode_bitmap(self.context.id) {
-                        let prev_vnode_bitmap =
+                        let (prev_vnode_bitmap, _cache_may_stale) =
                             self.state_table.update_vnode_bitmap(vnode_bitmap.clone());
                         self.fill_buffer(Some(&prev_vnode_bitmap), &vnode_bitmap)
                             .await?;
diff --git a/src/stream/src/executor/source/source_executor.rs b/src/stream/src/executor/source/source_executor.rs
index 0558b70e6f5e0..67d33cc059a77 100644
--- a/src/stream/src/executor/source/source_executor.rs
+++ b/src/stream/src/executor/source/source_executor.rs
@@ -488,21 +488,21 @@ impl<S: StateStore> Debug for SourceExecutor<S> {
 
 #[cfg(test)]
 mod tests {
-    use std::sync::atomic::AtomicU64;
+
     use std::time::Duration;
 
     use maplit::{convert_args, hashmap};
     use risingwave_common::array::StreamChunk;
-    use risingwave_common::catalog::{ColumnId, ConflictBehavior, Field, Schema, TableId};
+    use risingwave_common::catalog::{ColumnId, Field, Schema, TableId};
     use risingwave_common::test_prelude::StreamChunkTestExt;
     use risingwave_common::types::DataType;
-    use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
     use risingwave_connector::source::datagen::DatagenSplit;
     use risingwave_pb::catalog::StreamSourceInfo;
-    use risingwave_pb::plan_common::RowFormatType as ProstRowFormatType;
+    use risingwave_pb::plan_common::PbRowFormatType;
     use risingwave_source::connector_test_utils::create_source_desc_builder;
     use risingwave_storage::memory::MemoryStateStore;
     use tokio::sync::mpsc::unbounded_channel;
+    use tracing_test::traced_test;
 
     use super::*;
     use crate::executor::ActorContext;
@@ -519,7 +519,7 @@ mod tests {
         let pk_column_ids = vec![0];
         let pk_indices = vec![0];
         let source_info = StreamSourceInfo {
-            row_format: ProstRowFormatType::Native as i32,
+            row_format: PbRowFormatType::Native as i32,
             ..Default::default()
         };
         let (barrier_tx, barrier_rx) = unbounded_channel::<Barrier>();
@@ -570,6 +570,7 @@ mod tests {
 
         let init_barrier = Barrier::new_test_barrier(1).with_mutation(Mutation::Add {
             adds: HashMap::new(),
+            added_actors: HashSet::new(),
             splits: hashmap! {
                 ActorId::default() => vec![
                     SplitImpl::Datagen(DatagenSplit {
@@ -600,6 +601,7 @@ mod tests {
         );
     }
 
+    #[traced_test]
     #[tokio::test]
     async fn test_split_change_mutation() {
         let table_id = TableId::default();
@@ -610,14 +612,14 @@ mod tests {
         let pk_column_ids = vec![0];
         let pk_indices = vec![0_usize];
         let source_info = StreamSourceInfo {
-            row_format: ProstRowFormatType::Native as i32,
+            row_format: PbRowFormatType::Native as i32,
             ..Default::default()
         };
         let properties = convert_args!(hashmap!(
             "connector" => "datagen",
-            "fields.v1.min" => "1",
-            "fields.v1.max" => "1000",
-            "fields.v1.seed" => "12345",
+            "fields.v1.kind" => "sequence",
+            "fields.v1.start" => "11",
+            "fields.v1.end" => "11111",
         ));
 
         let source_desc_builder = create_source_desc_builder(
@@ -658,23 +660,11 @@ mod tests {
             u64::MAX,
             1,
         );
-
-        let mut materialize = MaterializeExecutor::for_test(
-            Box::new(executor),
-            mem_state_store.clone(),
-            TableId::from(0x2333),
-            vec![ColumnOrder::new(0, OrderType::ascending())],
-            column_ids,
-            2,
-            Arc::new(AtomicU64::new(0)),
-            ConflictBehavior::NoCheck,
-        )
-        .await
-        .boxed()
-        .execute();
+        let mut handler = Box::new(executor).execute();
 
         let init_barrier = Barrier::new_test_barrier(1).with_mutation(Mutation::Add {
             adds: HashMap::new(),
+            added_actors: HashSet::new(),
             splits: hashmap! {
                 ActorId::default() => vec![
                     SplitImpl::Datagen(DatagenSplit {
@@ -687,11 +677,11 @@ mod tests {
         });
         barrier_tx.send(init_barrier).unwrap();
 
-        (materialize.next().await.unwrap().unwrap())
+        (handler.next().await.unwrap().unwrap())
             .into_barrier()
             .unwrap();
 
-        let mut ready_chunks = materialize.ready_chunks(10);
+        let mut ready_chunks = handler.ready_chunks(10);
         let chunks = (ready_chunks.next().await.unwrap())
             .into_iter()
             .map(|msg| msg.unwrap().into_chunk().unwrap())
@@ -701,10 +691,10 @@ mod tests {
             chunk_1,
             StreamChunk::from_pretty(
                 " i
-                + 533
-                + 833
-                + 738
-                + 344",
+                + 11
+                + 14
+                + 17
+                + 20",
             )
         );
 
@@ -719,6 +709,11 @@ mod tests {
                 split_num: 3,
                 start_offset: None,
             }),
+            SplitImpl::Datagen(DatagenSplit {
+                split_index: 2,
+                split_num: 3,
+                start_offset: None,
+            }),
         ];
 
         let change_split_mutation =
@@ -751,18 +746,22 @@ mod tests {
         let chunk_2 = StreamChunk::concat(chunks).sort_rows();
         assert_eq!(
             chunk_2,
-            // mixed from datagen split 0 and 1
+            // mixed from datagen split 0, 1 and 2
             StreamChunk::from_pretty(
                 " i
+                + 12
+                + 13
+                + 15
+                + 16
+                + 18
+                + 19
+                + 23
+                + 26
                 + 29
-                + 201
-                + 344
-                + 425
-                + 525
-                + 533
-                + 833",
+                + 32",
             )
         );
+        tracing::debug!("chunk_2: {:?}", chunk_2.to_pretty_string());
 
         let barrier = Barrier::new_test_barrier(3).with_mutation(Mutation::Pause);
         barrier_tx.send(barrier).unwrap();
diff --git a/src/stream/src/executor/source/state_table_handler.rs b/src/stream/src/executor/source/state_table_handler.rs
index 1377120a075b7..f578db63221eb 100644
--- a/src/stream/src/executor/source/state_table_handler.rs
+++ b/src/stream/src/executor/source/state_table_handler.rs
@@ -27,8 +27,8 @@ use risingwave_common::{bail, row};
 use risingwave_connector::source::{SplitId, SplitImpl, SplitMetaData};
 use risingwave_hummock_sdk::key::next_key;
 use risingwave_pb::catalog::table::TableType;
-use risingwave_pb::catalog::Table as ProstTable;
-use risingwave_pb::common::{PbColumnOrder, PbDirection, PbOrderType};
+use risingwave_pb::catalog::PbTable;
+use risingwave_pb::common::{PbColumnOrder, PbDirection, PbNullsAre, PbOrderType};
 use risingwave_pb::data::data_type::TypeName;
 use risingwave_pb::data::DataType;
 use risingwave_pb::plan_common::{ColumnCatalog, ColumnDesc};
@@ -46,7 +46,7 @@ pub struct SourceStateTableHandler<S: StateStore> {
 }
 
 impl<S: StateStore> SourceStateTableHandler<S> {
-    pub async fn from_table_catalog(table_catalog: &ProstTable, store: S) -> Self {
+    pub async fn from_table_catalog(table_catalog: &PbTable, store: S) -> Self {
         // The state of source should not be cleaned up by retention_seconds
         assert!(!table_catalog
             .properties
@@ -199,7 +199,7 @@ impl<S: StateStore> SourceStateTableHandler<S> {
 
 // align with schema defined in `LogicalSource::infer_internal_table_catalog`. The function is used
 // for test purpose and should not be used in production.
-pub fn default_source_internal_table(id: u32) -> ProstTable {
+pub fn default_source_internal_table(id: u32) -> PbTable {
     let make_column = |column_type: TypeName, column_id: i32| -> ColumnCatalog {
         ColumnCatalog {
             column_desc: Some(ColumnDesc {
@@ -218,7 +218,7 @@ pub fn default_source_internal_table(id: u32) -> ProstTable {
         make_column(TypeName::Varchar, 0),
         make_column(TypeName::Jsonb, 1),
     ];
-    ProstTable {
+    PbTable {
         id,
         schema_id: SchemaId::placeholder().schema_id,
         database_id: DatabaseId::placeholder().database_id,
@@ -230,6 +230,7 @@ pub fn default_source_internal_table(id: u32) -> ProstTable {
             column_index: 0,
             order_type: Some(PbOrderType {
                 direction: PbDirection::Ascending as _,
+                nulls_are: PbNullsAre::Largest as _,
             }),
         }],
         ..Default::default()
diff --git a/src/stream/src/executor/subtask.rs b/src/stream/src/executor/subtask.rs
index c4873087c568a..cfdd8ba12e7a1 100644
--- a/src/stream/src/executor/subtask.rs
+++ b/src/stream/src/executor/subtask.rs
@@ -18,7 +18,9 @@ use tokio::sync::mpsc;
 use tokio::sync::mpsc::error::SendError;
 use tokio_stream::wrappers::ReceiverStream;
 
-use super::{BoxedExecutor, Executor, ExecutorInfo, MessageStreamItem};
+use super::actor::spawn_blocking_drop_stream;
+use super::{BoxedExecutor, Executor, ExecutorInfo, Message, MessageStreamItem};
+use crate::task::ActorId;
 
 /// Handle used to drive the subtask.
 pub type SubtaskHandle = impl Future<Output = ()> + Send + 'static;
@@ -59,7 +61,7 @@ impl Executor for SubtaskRxExecutor {
 /// Used when there're multiple stateful executors in an actor. These subtasks can be concurrently
 /// executed to improve the I/O performance, while the computing resource can be still bounded to a
 /// single thread.
-pub fn wrap(input: BoxedExecutor) -> (SubtaskHandle, SubtaskRxExecutor) {
+pub fn wrap(input: BoxedExecutor, actor_id: ActorId) -> (SubtaskHandle, SubtaskRxExecutor) {
     let (tx, rx) = mpsc::channel(1);
     let rx_executor = SubtaskRxExecutor {
         info: ExecutorInfo {
@@ -71,7 +73,18 @@ pub fn wrap(input: BoxedExecutor) -> (SubtaskHandle, SubtaskRxExecutor) {
 
     let handle = async move {
         let mut input = input.execute();
+
         while let Some(item) = input.next().await {
+            // Decide whether to stop the subtask. We explicitly do this instead of relying on the
+            // termination of the input stream, because we don't want to exhaust the stream, which
+            // causes the stream dropped in the scope of the current async task and blocks other
+            // actors. See `spawn_blocking_drop_stream` for more details.
+            let to_stop = match &item {
+                Ok(Message::Barrier(barrier)) => barrier.is_stop(actor_id),
+                Ok(_) => false,
+                Err(_) => true,
+            };
+
             // It's possible that the downstream itself yields an error (e.g. from remote input) and
             // finishes, so we may fail to send the message. In this case, we can simply ignore the
             // send error and exit as well. If the message itself is another error, log it.
@@ -84,7 +97,13 @@ pub fn wrap(input: BoxedExecutor) -> (SubtaskHandle, SubtaskRxExecutor) {
                 }
                 break;
             }
+
+            if to_stop {
+                break;
+            }
         }
+
+        spawn_blocking_drop_stream(input).await;
     }
     .instrument_await("Subtask");
 
diff --git a/src/stream/src/executor/test_utils.rs b/src/stream/src/executor/test_utils.rs
index 8d86ead85473b..e85b2be70a0c5 100644
--- a/src/stream/src/executor/test_utils.rs
+++ b/src/stream/src/executor/test_utils.rs
@@ -201,6 +201,14 @@ pub trait StreamExecutorTestExt: MessageStream + Unpin {
         self.next_unwrap_ready()
             .map(|msg| msg.into_barrier().expect("expect barrier"))
     }
+
+    /// Asserts that the executor is ready on a [`Watermark`] now, returning the next barrier.
+    ///
+    /// Panics if it is pending or the next message is not a [`Watermark`].
+    fn next_unwrap_ready_watermark(&mut self) -> StreamExecutorResult<Watermark> {
+        self.next_unwrap_ready()
+            .map(|msg| msg.into_watermark().expect("expect watermark"))
+    }
 }
 
 // FIXME: implement on any `impl MessageStream` if the analyzer works well.
@@ -218,7 +226,7 @@ pub mod agg_executor {
 
     use crate::common::table::state_table::StateTable;
     use crate::common::StateTableColumnMapping;
-    use crate::executor::agg_common::AggExecutorArgs;
+    use crate::executor::agg_common::{AggExecutorArgs, SimpleAggExecutorExtraArgs};
     use crate::executor::aggregation::{AggCall, AggStateStorage};
     use crate::executor::{
         ActorContextRef, BoxedExecutor, Executor, GlobalSimpleAggExecutor, PkIndices,
@@ -381,7 +389,7 @@ pub mod agg_executor {
             distinct_dedup_tables: Default::default(),
             watermark_epoch: Arc::new(AtomicU64::new(0)),
 
-            extra: None,
+            extra: SimpleAggExecutorExtraArgs {},
         })
         .unwrap()
         .boxed()
diff --git a/src/stream/src/executor/top_n/group_top_n.rs b/src/stream/src/executor/top_n/group_top_n.rs
index de8a42edb86e4..9cc03f2e66a71 100644
--- a/src/stream/src/executor/top_n/group_top_n.rs
+++ b/src/stream/src/executor/top_n/group_top_n.rs
@@ -28,7 +28,7 @@ use risingwave_storage::StateStore;
 use super::top_n_cache::TopNCacheTrait;
 use super::utils::*;
 use super::TopNCache;
-use crate::cache::{cache_may_stale, new_unbounded, ExecutorCache};
+use crate::cache::{new_unbounded, ExecutorCache};
 use crate::common::table::state_table::StateTable;
 use crate::error::StreamResult;
 use crate::executor::error::StreamExecutorResult;
@@ -37,7 +37,7 @@ use crate::executor::{ActorContextRef, Executor, ExecutorInfo, PkIndices, Waterm
 use crate::task::AtomicU64Ref;
 
 pub type GroupTopNExecutor<K, S, const WITH_TIES: bool> =
-    TopNExecutorWrapper<InnerGroupTopNExecutorNew<K, S, WITH_TIES>>;
+    TopNExecutorWrapper<InnerGroupTopNExecutor<K, S, WITH_TIES>>;
 
 impl<K: HashKey, S: StateStore, const WITH_TIES: bool> GroupTopNExecutor<K, S, WITH_TIES> {
     #[allow(clippy::too_many_arguments)]
@@ -56,7 +56,7 @@ impl<K: HashKey, S: StateStore, const WITH_TIES: bool> GroupTopNExecutor<K, S, W
         Ok(TopNExecutorWrapper {
             input,
             ctx,
-            inner: InnerGroupTopNExecutorNew::new(
+            inner: InnerGroupTopNExecutor::new(
                 info,
                 storage_key,
                 offset_and_limit,
@@ -70,7 +70,7 @@ impl<K: HashKey, S: StateStore, const WITH_TIES: bool> GroupTopNExecutor<K, S, W
     }
 }
 
-pub struct InnerGroupTopNExecutorNew<K: HashKey, S: StateStore, const WITH_TIES: bool> {
+pub struct InnerGroupTopNExecutor<K: HashKey, S: StateStore, const WITH_TIES: bool> {
     info: ExecutorInfo,
 
     /// `LIMIT XXX`. None means no limit.
@@ -94,7 +94,7 @@ pub struct InnerGroupTopNExecutorNew<K: HashKey, S: StateStore, const WITH_TIES:
     cache_key_serde: CacheKeySerde,
 }
 
-impl<K: HashKey, S: StateStore, const WITH_TIES: bool> InnerGroupTopNExecutorNew<K, S, WITH_TIES> {
+impl<K: HashKey, S: StateStore, const WITH_TIES: bool> InnerGroupTopNExecutor<K, S, WITH_TIES> {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         input_info: ExecutorInfo,
@@ -158,7 +158,7 @@ impl<K: HashKey, const WITH_TIES: bool> DerefMut for GroupTopNCache<K, WITH_TIES
 
 #[async_trait]
 impl<K: HashKey, S: StateStore, const WITH_TIES: bool> TopNExecutorBase
-    for InnerGroupTopNExecutorNew<K, S, WITH_TIES>
+    for InnerGroupTopNExecutor<K, S, WITH_TIES>
 where
     TopNCache<WITH_TIES>: TopNCacheTrait,
 {
@@ -178,7 +178,8 @@ where
             // If 'self.caches' does not already have a cache for the current group, create a new
             // cache for it and insert it into `self.caches`
             if !self.caches.contains(group_cache_key) {
-                let mut topn_cache = TopNCache::new(self.offset, self.limit);
+                let mut topn_cache =
+                    TopNCache::new(self.offset, self.limit, self.schema().data_types());
                 self.managed_state
                     .init_topn_cache(Some(group_key), &mut topn_cache)
                     .await?;
@@ -221,12 +222,12 @@ where
     }
 
     fn update_vnode_bitmap(&mut self, vnode_bitmap: Arc<Bitmap>) {
-        let previous_vnode_bitmap = self
+        let (_previous_vnode_bitmap, cache_may_stale) = self
             .managed_state
             .state_table
-            .update_vnode_bitmap(vnode_bitmap.clone());
+            .update_vnode_bitmap(vnode_bitmap);
 
-        if cache_may_stale(&previous_vnode_bitmap, &vnode_bitmap) {
+        if cache_may_stale {
             self.caches.clear();
         }
     }
diff --git a/src/stream/src/executor/top_n/group_top_n_appendonly.rs b/src/stream/src/executor/top_n/group_top_n_appendonly.rs
index 48b31d5d1fc4e..c173f44759e8f 100644
--- a/src/stream/src/executor/top_n/group_top_n_appendonly.rs
+++ b/src/stream/src/executor/top_n/group_top_n_appendonly.rs
@@ -42,7 +42,6 @@ use super::group_top_n::GroupTopNCache;
 use super::top_n_cache::AppendOnlyTopNCacheTrait;
 use super::utils::*;
 use super::TopNCache;
-use crate::cache::cache_may_stale;
 use crate::common::table::state_table::StateTable;
 use crate::error::StreamResult;
 use crate::executor::error::StreamExecutorResult;
@@ -54,7 +53,7 @@ use crate::task::AtomicU64Ref;
 /// to keep all the data records/rows that have been seen. As long as a record
 /// is no longer being in the result set, it can be deleted.
 pub type AppendOnlyGroupTopNExecutor<K, S, const WITH_TIES: bool> =
-    TopNExecutorWrapper<InnerAppendOnlyGroupTopNExecutorNew<K, S, WITH_TIES>>;
+    TopNExecutorWrapper<InnerAppendOnlyGroupTopNExecutor<K, S, WITH_TIES>>;
 
 impl<K: HashKey, S: StateStore, const WITH_TIES: bool>
     AppendOnlyGroupTopNExecutor<K, S, WITH_TIES>
@@ -75,7 +74,7 @@ impl<K: HashKey, S: StateStore, const WITH_TIES: bool>
         Ok(TopNExecutorWrapper {
             input,
             ctx,
-            inner: InnerAppendOnlyGroupTopNExecutorNew::new(
+            inner: InnerAppendOnlyGroupTopNExecutor::new(
                 info,
                 storage_key,
                 offset_and_limit,
@@ -89,7 +88,7 @@ impl<K: HashKey, S: StateStore, const WITH_TIES: bool>
     }
 }
 
-pub struct InnerAppendOnlyGroupTopNExecutorNew<K: HashKey, S: StateStore, const WITH_TIES: bool> {
+pub struct InnerAppendOnlyGroupTopNExecutor<K: HashKey, S: StateStore, const WITH_TIES: bool> {
     info: ExecutorInfo,
 
     /// `LIMIT XXX`. None means no limit.
@@ -114,7 +113,7 @@ pub struct InnerAppendOnlyGroupTopNExecutorNew<K: HashKey, S: StateStore, const
 }
 
 impl<K: HashKey, S: StateStore, const WITH_TIES: bool>
-    InnerAppendOnlyGroupTopNExecutorNew<K, S, WITH_TIES>
+    InnerAppendOnlyGroupTopNExecutor<K, S, WITH_TIES>
 {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
@@ -153,7 +152,7 @@ impl<K: HashKey, S: StateStore, const WITH_TIES: bool>
 }
 #[async_trait]
 impl<K: HashKey, S: StateStore, const WITH_TIES: bool> TopNExecutorBase
-    for InnerAppendOnlyGroupTopNExecutorNew<K, S, WITH_TIES>
+    for InnerAppendOnlyGroupTopNExecutor<K, S, WITH_TIES>
 where
     TopNCache<WITH_TIES>: AppendOnlyTopNCacheTrait,
 {
@@ -164,7 +163,7 @@ where
         let keys = K::build(&self.group_by, chunk.data_chunk())?;
 
         let data_types = self.schema().data_types();
-        let row_deserializer = RowDeserializer::new(data_types);
+        let row_deserializer = RowDeserializer::new(data_types.clone());
 
         for ((op, row_ref), group_cache_key) in chunk.rows().zip_eq_debug(keys.iter()) {
             // The pk without group by
@@ -176,7 +175,7 @@ where
             // If 'self.caches' does not already have a cache for the current group, create a new
             // cache for it and insert it into `self.caches`
             if !self.caches.contains(group_cache_key) {
-                let mut topn_cache = TopNCache::new(self.offset, self.limit);
+                let mut topn_cache = TopNCache::new(self.offset, self.limit, data_types.clone());
                 self.managed_state
                     .init_topn_cache(Some(group_key), &mut topn_cache)
                     .await?;
@@ -207,12 +206,12 @@ where
     }
 
     fn update_vnode_bitmap(&mut self, vnode_bitmap: Arc<Bitmap>) {
-        let previous_vnode_bitmap = self
+        let (_previous_vnode_bitmap, cache_may_stale) = self
             .managed_state
             .state_table
-            .update_vnode_bitmap(vnode_bitmap.clone());
+            .update_vnode_bitmap(vnode_bitmap);
 
-        if cache_may_stale(&previous_vnode_bitmap, &vnode_bitmap) {
+        if cache_may_stale {
             self.caches.clear();
         }
     }
diff --git a/src/stream/src/executor/top_n/top_n_appendonly.rs b/src/stream/src/executor/top_n/top_n_appendonly.rs
index 626b45a60f9df..fcdab8550f2a3 100644
--- a/src/stream/src/executor/top_n/top_n_appendonly.rs
+++ b/src/stream/src/executor/top_n/top_n_appendonly.rs
@@ -129,6 +129,7 @@ impl<S: StateStore, const WITH_TIES: bool> InnerAppendOnlyTopNExecutor<S, WITH_T
         let cache_key_serde =
             create_cache_key_serde(&storage_key, &pk_indices, &schema, &order_by, &[]);
         let managed_state = ManagedTopNState::<S>::new(state_table, cache_key_serde.clone());
+        let data_types = schema.data_types();
 
         Ok(Self {
             info: ExecutorInfo {
@@ -138,7 +139,7 @@ impl<S: StateStore, const WITH_TIES: bool> InnerAppendOnlyTopNExecutor<S, WITH_T
             },
             managed_state,
             storage_key_indices: storage_key.into_iter().map(|op| op.column_index).collect(),
-            cache: TopNCache::new(num_offset, num_limit),
+            cache: TopNCache::new(num_offset, num_limit, data_types),
             cache_key_serde,
         })
     }
diff --git a/src/stream/src/executor/top_n/top_n_cache.rs b/src/stream/src/executor/top_n/top_n_cache.rs
index b500cd8eff90f..e99f3bffba29c 100644
--- a/src/stream/src/executor/top_n/top_n_cache.rs
+++ b/src/stream/src/executor/top_n/top_n_cache.rs
@@ -14,10 +14,13 @@
 
 use std::cmp::Ordering;
 use std::collections::BTreeMap;
+use std::fmt::Debug;
 
 use async_trait::async_trait;
+use itertools::Itertools;
 use risingwave_common::array::{Op, RowRef};
-use risingwave_common::row::{CompactedRow, Row, RowDeserializer};
+use risingwave_common::row::{CompactedRow, Row, RowDeserializer, RowExt};
+use risingwave_common::types::DataType;
 use risingwave_storage::StateStore;
 
 use crate::executor::error::StreamExecutorResult;
@@ -53,6 +56,52 @@ pub struct TopNCache<const WITH_TIES: bool> {
     pub offset: usize,
     /// Assumption: `limit != 0`
     pub limit: usize,
+
+    /// Data types for the full row.
+    ///
+    /// For debug formatting only.
+    data_types: Vec<DataType>,
+}
+
+impl<const WITH_TIES: bool> Debug for TopNCache<WITH_TIES> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "TopNCache {{\n  offset: {}, limit: {}, high_capacity: {},\n",
+            self.offset, self.limit, self.high_capacity
+        )?;
+
+        fn format_cache(
+            f: &mut std::fmt::Formatter<'_>,
+            cache: &BTreeMap<CacheKey, CompactedRow>,
+            data_types: &[DataType],
+        ) -> std::fmt::Result {
+            if cache.is_empty() {
+                return write!(f, "    <empty>");
+            }
+            write!(
+                f,
+                "    {}",
+                cache
+                    .iter()
+                    .format_with("\n    ", |item, f| f(&format_args!(
+                        "{:?}, {}",
+                        item.0,
+                        item.1.deserialize(data_types).unwrap().display(),
+                    )))
+            )
+        }
+
+        writeln!(f, "  low:")?;
+        format_cache(f, &self.low, &self.data_types)?;
+        writeln!(f, "\n  middle:")?;
+        format_cache(f, &self.middle, &self.data_types)?;
+        writeln!(f, "\n  high:")?;
+        format_cache(f, &self.high, &self.data_types)?;
+
+        write!(f, "\n}}")?;
+        Ok(())
+    }
 }
 
 /// `CacheKey` is composed of `(order_by, remaining columns of pk)`.
@@ -67,10 +116,11 @@ pub trait TopNCacheTrait {
     ///
     /// Changes in `self.middle` is recorded to `res_ops` and `res_rows`, which will be
     /// used to generate messages to be sent to downstream operators.
+    #[allow(clippy::too_many_arguments)]
     fn insert(
         &mut self,
         cache_key: CacheKey,
-        row: impl Row,
+        row: impl Row + Send,
         res_ops: &mut Vec<Op>,
         res_rows: &mut Vec<CompactedRow>,
     );
@@ -96,7 +146,8 @@ pub trait TopNCacheTrait {
 }
 
 impl<const WITH_TIES: bool> TopNCache<WITH_TIES> {
-    pub fn new(offset: usize, limit: usize) -> Self {
+    /// `data_types` -- Data types for the full row.
+    pub fn new(offset: usize, limit: usize, data_types: Vec<DataType>) -> Self {
         assert!(limit != 0);
         if WITH_TIES {
             // It's trickier to support.
@@ -113,6 +164,7 @@ impl<const WITH_TIES: bool> TopNCache<WITH_TIES> {
                 .unwrap_or(usize::MAX),
             offset,
             limit,
+            data_types,
         }
     }
 
@@ -137,13 +189,19 @@ impl<const WITH_TIES: bool> TopNCache<WITH_TIES> {
     pub fn is_middle_cache_full(&self) -> bool {
         // For WITH_TIES, the middle cache can exceed the capacity.
         if !WITH_TIES {
-            assert!(self.middle.len() <= self.limit);
+            assert!(
+                self.middle.len() <= self.limit,
+                "the middle cache exceeds the capacity\n{self:?}"
+            );
         }
         let full = self.middle.len() >= self.limit;
         if full {
             assert!(self.is_low_cache_full());
         } else {
-            assert!(self.high.is_empty());
+            assert!(
+                self.high.is_empty(),
+                "the high cache is not empty when middle cache is not full:\n{self:?}"
+            );
         }
         full
     }
@@ -153,11 +211,33 @@ impl<const WITH_TIES: bool> TopNCache<WITH_TIES> {
         if !WITH_TIES {
             assert!(self.high.len() <= self.high_capacity);
         }
-        let full = self.high.len() >= self.high_capacity;
-        if full {
-            assert!(self.is_middle_cache_full());
+        self.high.len() >= self.high_capacity
+    }
+
+    /// Use this method instead of `self.high.insert` directly when possible.
+    ///
+    /// It only inserts into high cache if the key is smaller than the largest key in the high
+    /// cache. Otherwise, we simply ignore the row. We will wait until the high cache becomes
+    /// empty and fill it at that time.
+    fn insert_high_cache(&mut self, cache_key: CacheKey, row: CompactedRow, is_from_middle: bool) {
+        if !self.is_high_cache_full() {
+            if is_from_middle {
+                self.high.insert(cache_key, row);
+                return;
+            }
+            // For direct insert, we need to check if the key is smaller than the largest key
+            if let Some(high_last) = self.high.last_key_value() && cache_key <= *high_last.0 {
+                debug_assert!(cache_key != *high_last.0, "cache_key should be unique");
+                self.high.insert(cache_key, row);
+            }
+        } else {
+            let high_last = self.high.last_entry().unwrap();
+            if cache_key <= *high_last.key() {
+                debug_assert!(cache_key != *high_last.key(), "cache_key should be unique");
+                high_last.remove_entry();
+                self.high.insert(cache_key, row);
+            }
         }
-        full
     }
 }
 
@@ -166,7 +246,7 @@ impl TopNCacheTrait for TopNCache<false> {
     fn insert(
         &mut self,
         cache_key: CacheKey,
-        row: impl Row,
+        row: impl Row + Send,
         res_ops: &mut Vec<Op>,
         res_rows: &mut Vec<CompactedRow>,
     ) {
@@ -195,6 +275,7 @@ impl TopNCacheTrait for TopNCache<false> {
             return;
         }
 
+        let mut is_from_middle = false;
         let elem_to_compare_with_high = {
             let middle_last = self.middle.last_entry().unwrap();
             if elem_to_compare_with_middle.0 <= *middle_last.key() {
@@ -207,23 +288,18 @@ impl TopNCacheTrait for TopNCache<false> {
                 res_rows.push(elem_to_compare_with_middle.1.clone());
                 self.middle
                     .insert(elem_to_compare_with_middle.0, elem_to_compare_with_middle.1);
+                is_from_middle = true;
                 res
             } else {
                 elem_to_compare_with_middle
             }
         };
 
-        if !self.is_high_cache_full() {
-            self.high
-                .insert(elem_to_compare_with_high.0, elem_to_compare_with_high.1);
-        } else {
-            let high_last = self.high.last_entry().unwrap();
-            if elem_to_compare_with_high.0 <= *high_last.key() {
-                high_last.remove_entry();
-                self.high
-                    .insert(elem_to_compare_with_high.0, elem_to_compare_with_high.1);
-            }
-        }
+        self.insert_high_cache(
+            elem_to_compare_with_high.0,
+            elem_to_compare_with_high.1,
+            is_from_middle,
+        );
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -308,7 +384,7 @@ impl TopNCacheTrait for TopNCache<true> {
     fn insert(
         &mut self,
         cache_key: CacheKey,
-        row: impl Row,
+        row: impl Row + Send,
         res_ops: &mut Vec<Op>,
         res_rows: &mut Vec<CompactedRow>,
     ) {
@@ -381,21 +457,11 @@ impl TopNCacheTrait for TopNCache<true> {
             Ordering::Greater => {
                 // The row is in high.
                 let elem_to_compare_with_high = elem_to_compare_with_middle;
-                if !self.is_high_cache_full() {
-                    self.high.insert(
-                        elem_to_compare_with_high.0,
-                        (&elem_to_compare_with_high.1).into(),
-                    );
-                } else {
-                    let high_last = self.high.last_entry().unwrap();
-                    if elem_to_compare_with_high.0 <= *high_last.key() {
-                        high_last.remove_entry();
-                        self.high.insert(
-                            elem_to_compare_with_high.0,
-                            (&elem_to_compare_with_high.1).into(),
-                        );
-                    }
-                }
+                self.insert_high_cache(
+                    elem_to_compare_with_high.0,
+                    elem_to_compare_with_high.1.into(),
+                    false,
+                );
             }
         }
     }
diff --git a/src/stream/src/executor/top_n/top_n_plain.rs b/src/stream/src/executor/top_n/top_n_plain.rs
index 8356380e55f3a..faba24ef9d35f 100644
--- a/src/stream/src/executor/top_n/top_n_plain.rs
+++ b/src/stream/src/executor/top_n/top_n_plain.rs
@@ -30,7 +30,7 @@ use crate::executor::{ActorContextRef, Executor, ExecutorInfo, PkIndices, Waterm
 /// `TopNExecutor` works with input with modification, it keeps all the data
 /// records/rows that have been seen, and returns topN records overall.
 pub type TopNExecutor<S, const WITH_TIES: bool> =
-    TopNExecutorWrapper<InnerTopNExecutorNew<S, WITH_TIES>>;
+    TopNExecutorWrapper<InnerTopNExecutor<S, WITH_TIES>>;
 
 impl<S: StateStore> TopNExecutor<S, false> {
     #[allow(clippy::too_many_arguments)]
@@ -48,7 +48,7 @@ impl<S: StateStore> TopNExecutor<S, false> {
         Ok(TopNExecutorWrapper {
             input,
             ctx,
-            inner: InnerTopNExecutorNew::new(
+            inner: InnerTopNExecutor::new(
                 info,
                 storage_key,
                 offset_and_limit,
@@ -76,7 +76,7 @@ impl<S: StateStore> TopNExecutor<S, true> {
         Ok(TopNExecutorWrapper {
             input,
             ctx,
-            inner: InnerTopNExecutorNew::new(
+            inner: InnerTopNExecutor::new(
                 info,
                 storage_key,
                 offset_and_limit,
@@ -102,7 +102,7 @@ impl<S: StateStore> TopNExecutor<S, true> {
     ) -> StreamResult<Self> {
         let info = input.info();
 
-        let mut inner = InnerTopNExecutorNew::new(
+        let mut inner = InnerTopNExecutor::new(
             info,
             storage_key,
             offset_and_limit,
@@ -111,13 +111,13 @@ impl<S: StateStore> TopNExecutor<S, true> {
             state_table,
         )?;
 
-        inner.cache.high_capacity = 1;
+        inner.cache.high_capacity = 2;
 
         Ok(TopNExecutorWrapper { input, ctx, inner })
     }
 }
 
-pub struct InnerTopNExecutorNew<S: StateStore, const WITH_TIES: bool> {
+pub struct InnerTopNExecutor<S: StateStore, const WITH_TIES: bool> {
     info: ExecutorInfo,
 
     /// The storage key indices of the `TopNExecutor`
@@ -132,7 +132,7 @@ pub struct InnerTopNExecutorNew<S: StateStore, const WITH_TIES: bool> {
     cache_key_serde: CacheKeySerde,
 }
 
-impl<S: StateStore, const WITH_TIES: bool> InnerTopNExecutorNew<S, WITH_TIES> {
+impl<S: StateStore, const WITH_TIES: bool> InnerTopNExecutor<S, WITH_TIES> {
     /// # Arguments
     ///
     /// `storage_key` -- the storage pk. It's composed of the ORDER BY columns and the missing
@@ -158,6 +158,7 @@ impl<S: StateStore, const WITH_TIES: bool> InnerTopNExecutorNew<S, WITH_TIES> {
         let cache_key_serde =
             create_cache_key_serde(&storage_key, &pk_indices, &schema, &order_by, &[]);
         let managed_state = ManagedTopNState::<S>::new(state_table, cache_key_serde.clone());
+        let data_types = schema.data_types();
 
         Ok(Self {
             info: ExecutorInfo {
@@ -167,14 +168,14 @@ impl<S: StateStore, const WITH_TIES: bool> InnerTopNExecutorNew<S, WITH_TIES> {
             },
             managed_state,
             storage_key_indices: storage_key.into_iter().map(|op| op.column_index).collect(),
-            cache: TopNCache::new(num_offset, num_limit),
+            cache: TopNCache::new(num_offset, num_limit, data_types),
             cache_key_serde,
         })
     }
 }
 
 #[async_trait]
-impl<S: StateStore, const WITH_TIES: bool> TopNExecutorBase for InnerTopNExecutorNew<S, WITH_TIES>
+impl<S: StateStore, const WITH_TIES: bool> TopNExecutorBase for InnerTopNExecutor<S, WITH_TIES>
 where
     TopNCache<WITH_TIES>: TopNCacheTrait,
 {
@@ -1079,10 +1080,11 @@ mod tests {
                 ),
                 StreamChunk::from_pretty(
                     "  I I
-                    +  3 8
-                    +  1 6
-                    +  2 7
-                    + 10 9",
+                    +  3 6
+                    +  3 7
+                    +  1 8
+                    +  2 9
+                    + 10 10",
                 ),
                 StreamChunk::from_pretty(
                     " I I
@@ -1090,7 +1092,7 @@ mod tests {
                 ),
                 StreamChunk::from_pretty(
                     " I I
-                    - 1 6",
+                    - 1 8",
                 ),
             ];
             let schema = Schema {
@@ -1168,11 +1170,13 @@ mod tests {
                 *res.as_chunk().unwrap(),
                 StreamChunk::from_pretty(
                     " I I
-                    + 3 8
-                    - 3 8
+                    + 3 6
+                    + 3 7
+                    - 3 7
+                    - 3 6
                     - 3 2
-                    + 1 6
-                    + 2 7"
+                    + 1 8
+                    + 2 9"
                 )
             );
 
@@ -1185,15 +1189,16 @@ mod tests {
                 )
             );
 
-            // High cache has only one capacity, but we need to trigger 2 inserts here!
+            // High cache has only 2 capacity, but we need to trigger 3 inserts here!
             let res = top_n_executor.next().await.unwrap().unwrap();
             assert_eq!(
                 *res.as_chunk().unwrap(),
                 StreamChunk::from_pretty(
                     " I I
-                    - 1 6
+                    - 1 8
                     + 3 2
-                    + 3 8
+                    + 3 6
+                    + 3 7
                     "
                 )
             );
@@ -1219,10 +1224,11 @@ mod tests {
                 ),
                 StreamChunk::from_pretty(
                     "  I I
-                    +  3 8
-                    +  1 6
-                    +  2 7
-                    + 10 9",
+                    +  3 6
+                    +  3 7
+                    +  1 8
+                    +  2 9
+                    + 10 10",
                 ),
             ];
             let schema = Schema {
@@ -1251,7 +1257,7 @@ mod tests {
                 ),
                 StreamChunk::from_pretty(
                     " I I
-                    - 1 6",
+                    - 1 8",
                 ),
             ];
             let schema = Schema {
@@ -1314,11 +1320,13 @@ mod tests {
                 *res.as_chunk().unwrap(),
                 StreamChunk::from_pretty(
                     " I I
-                    + 3 8
-                    - 3 8
+                    + 3 6
+                    + 3 7
+                    - 3 7
+                    - 3 6
                     - 3 2
-                    + 1 6
-                    + 2 7"
+                    + 1 8
+                    + 2 9"
                 )
             );
 
@@ -1366,19 +1374,20 @@ mod tests {
                 )
             );
 
-            // High cache has only one capacity, but we need to trigger 2 inserts here!
+            // High cache has only 2 capacity, but we need to trigger 3 inserts here!
             let res = top_n_executor.next().await.unwrap().unwrap();
             assert_eq!(
                 *res.as_chunk().unwrap(),
                 StreamChunk::from_pretty(
                     " I I
-                    - 1 6
+                    - 1 8
                     + 3 2
-                    + 3 8
+                    + 3 6
+                    + 3 7
                     "
                 )
             );
-
+            println!("hello");
             // barrier
             assert_matches!(
                 top_n_executor.next().await.unwrap().unwrap(),
diff --git a/src/stream/src/executor/watermark_filter.rs b/src/stream/src/executor/watermark_filter.rs
index f43b17b75c7c3..0b587b23ff5e4 100644
--- a/src/stream/src/executor/watermark_filter.rs
+++ b/src/stream/src/executor/watermark_filter.rs
@@ -23,7 +23,7 @@ use risingwave_common::row::{OwnedRow, Row};
 use risingwave_common::types::{DataType, ScalarImpl};
 use risingwave_common::{bail, row};
 use risingwave_expr::expr::{
-    new_binary_expr, BoxedExpression, Expression, InputRefExpression, LiteralExpression,
+    build, BoxedExpression, Expression, InputRefExpression, LiteralExpression,
 };
 use risingwave_expr::Result as ExprResult;
 use risingwave_pb::expr::expr_node::Type;
@@ -199,7 +199,8 @@ impl<S: StateStore> WatermarkFilterExecutor<S> {
                 Message::Barrier(barrier) => {
                     // Update the vnode bitmap for state tables of all agg calls if asked.
                     if let Some(vnode_bitmap) = barrier.as_update_vnode_bitmap(ctx.id) {
-                        let previous_vnode_bitmap = table.update_vnode_bitmap(vnode_bitmap.clone());
+                        let (previous_vnode_bitmap, _cache_may_stale) =
+                            table.update_vnode_bitmap(vnode_bitmap.clone());
 
                         // Take the global max watermark when scaling happens.
                         if previous_vnode_bitmap != vnode_bitmap {
@@ -235,11 +236,13 @@ impl<S: StateStore> WatermarkFilterExecutor<S> {
         event_time_col_idx: usize,
         watermark: ScalarImpl,
     ) -> ExprResult<BoxedExpression> {
-        new_binary_expr(
+        build(
             Type::GreaterThanOrEqual,
             DataType::Boolean,
-            InputRefExpression::new(watermark_type.clone(), event_time_col_idx).boxed(),
-            LiteralExpression::new(watermark_type, Some(watermark)).boxed(),
+            vec![
+                InputRefExpression::new(watermark_type.clone(), event_time_col_idx).boxed(),
+                LiteralExpression::new(watermark_type, Some(watermark)).boxed(),
+            ],
         )
     }
 
@@ -282,8 +285,9 @@ mod tests {
     use risingwave_common::array::StreamChunk;
     use risingwave_common::catalog::{ColumnDesc, ColumnId, Field, Schema, TableId};
     use risingwave_common::test_prelude::StreamChunkTestExt;
-    use risingwave_common::types::{IntervalUnit, NaiveDateWrapper};
+    use risingwave_common::types::Date;
     use risingwave_common::util::sort_util::OrderType;
+    use risingwave_expr::expr::build_from_pretty;
     use risingwave_storage::memory::MemoryStateStore;
     use risingwave_storage::table::Distribution;
 
@@ -323,8 +327,6 @@ mod tests {
     async fn create_watermark_filter_executor(
         mem_state: MemoryStateStore,
     ) -> (BoxedExecutor, MessageSender) {
-        let interval_type = DataType::Interval;
-
         let schema = Schema {
             fields: vec![
                 Field::unnamed(DataType::Int16),        // pk
@@ -332,19 +334,7 @@ mod tests {
             ],
         };
 
-        let watermark_expr = new_binary_expr(
-            Type::Subtract,
-            WATERMARK_TYPE.clone(),
-            InputRefExpression::new(WATERMARK_TYPE.clone(), 1).boxed(),
-            LiteralExpression::new(
-                interval_type,
-                Some(ScalarImpl::Interval(IntervalUnit::from_month_day_usec(
-                    0, 1, 0,
-                ))),
-            )
-            .boxed(),
-        )
-        .unwrap();
+        let watermark_expr = build_from_pretty("(subtract:timestamp $1:timestamp 1day:interval)");
 
         let table = create_in_memory_state_table(
             mem_state,
@@ -429,8 +419,8 @@ mod tests {
         let watermark = executor.next().await.unwrap().unwrap();
         assert_eq!(
             watermark.into_watermark().unwrap(),
-            watermark!(ScalarImpl::NaiveDateTime(
-                NaiveDateWrapper::from_ymd_uncheck(2022, 11, 7).and_hms_uncheck(0, 0, 0)
+            watermark!(ScalarImpl::Timestamp(
+                Date::from_ymd_uncheck(2022, 11, 7).and_hms_uncheck(0, 0, 0)
             ))
         );
 
@@ -452,8 +442,8 @@ mod tests {
         let watermark = executor.next().await.unwrap().unwrap();
         assert_eq!(
             watermark.into_watermark().unwrap(),
-            watermark!(ScalarImpl::NaiveDateTime(
-                NaiveDateWrapper::from_ymd_uncheck(2022, 11, 9).and_hms_uncheck(0, 0, 0)
+            watermark!(ScalarImpl::Timestamp(
+                Date::from_ymd_uncheck(2022, 11, 9).and_hms_uncheck(0, 0, 0)
             ))
         );
 
@@ -476,8 +466,8 @@ mod tests {
         let watermark = executor.next().await.unwrap().unwrap();
         assert_eq!(
             watermark.into_watermark().unwrap(),
-            watermark!(ScalarImpl::NaiveDateTime(
-                NaiveDateWrapper::from_ymd_uncheck(2022, 11, 9).and_hms_uncheck(0, 0, 0)
+            watermark!(ScalarImpl::Timestamp(
+                Date::from_ymd_uncheck(2022, 11, 9).and_hms_uncheck(0, 0, 0)
             ))
         );
 
@@ -495,8 +485,8 @@ mod tests {
         let watermark = executor.next().await.unwrap().unwrap();
         assert_eq!(
             watermark.into_watermark().unwrap(),
-            watermark!(ScalarImpl::NaiveDateTime(
-                NaiveDateWrapper::from_ymd_uncheck(2022, 11, 13).and_hms_uncheck(0, 0, 0)
+            watermark!(ScalarImpl::Timestamp(
+                Date::from_ymd_uncheck(2022, 11, 13).and_hms_uncheck(0, 0, 0)
             ))
         );
     }
diff --git a/src/stream/src/executor/wrapper.rs b/src/stream/src/executor/wrapper.rs
index 158508d3dc5c6..b2e574b095599 100644
--- a/src/stream/src/executor/wrapper.rs
+++ b/src/stream/src/executor/wrapper.rs
@@ -118,6 +118,8 @@ impl WrapperExecutor {
         let stream =
             trace::instrument_await_tree(info.clone(), extra.actor_id, extra.executor_id, stream);
 
+        // Schema check
+        let stream = schema_check::schema_check(info.clone(), stream);
         // Epoch check
         let stream = epoch_check::epoch_check(info, stream);
 
diff --git a/src/stream/src/executor/wrapper/schema_check.rs b/src/stream/src/executor/wrapper/schema_check.rs
index 4bc99d3b3c8bb..d23eca2b455c6 100644
--- a/src/stream/src/executor/wrapper/schema_check.rs
+++ b/src/stream/src/executor/wrapper/schema_check.rs
@@ -27,13 +27,25 @@ pub async fn schema_check(info: Arc<ExecutorInfo>, input: impl MessageStream) {
     for message in input {
         let message = message?;
 
-        if let Message::Chunk(chunk) = &message {
-            risingwave_common::util::schema_check::schema_check(
+        match &message {
+            Message::Chunk(chunk) => risingwave_common::util::schema_check::schema_check(
                 info.schema.fields().iter().map(|f| &f.data_type),
                 chunk.columns(),
-            )
-            .unwrap_or_else(|e| panic!("schema check failed on {}: {}", info.identity, e));
+            ),
+            Message::Watermark(watermark) => {
+                let expected = info.schema.fields()[watermark.col_idx].data_type();
+                let found = &watermark.data_type;
+                if &expected != found {
+                    Err(format!(
+                        "watermark type mismatched: expected {expected}, found {found}"
+                    ))
+                } else {
+                    Ok(())
+                }
+            }
+            Message::Barrier(_) => Ok(()),
         }
+        .unwrap_or_else(|e| panic!("schema check failed on {}: {}", info.identity, e));
 
         yield message;
     }
diff --git a/src/stream/src/from_proto/agg_common.rs b/src/stream/src/from_proto/agg_common.rs
index 29f4001837b6e..9a527df245133 100644
--- a/src/stream/src/from_proto/agg_common.rs
+++ b/src/stream/src/from_proto/agg_common.rs
@@ -52,8 +52,6 @@ pub fn build_agg_call_from_prost(
         .map(|col_order| {
             let col_idx = col_order.get_column_index() as usize;
             let order_type = OrderType::from_protobuf(col_order.get_order_type().unwrap());
-            // TODO(yuchao): `nulls first/last` is not supported yet, so it's ignore here,
-            // see also `risingwave_common::util::sort_util::compare_values`
             ColumnOrder::new(col_idx, order_type)
         })
         .collect();
diff --git a/src/stream/src/from_proto/batch_query.rs b/src/stream/src/from_proto/batch_query.rs
index a03825ab461e0..7d24f04bed1fc 100644
--- a/src/stream/src/from_proto/batch_query.rs
+++ b/src/stream/src/from_proto/batch_query.rs
@@ -66,14 +66,14 @@ impl ExecutorBuilder for BatchQueryExecutorBuilder {
             .map(|k| k.column_index as usize)
             .collect_vec();
 
-        let dist_key_indices = table_desc
-            .dist_key_indices
+        let dist_key_in_pk_indices = table_desc
+            .dist_key_in_pk_indices
             .iter()
             .map(|&k| k as usize)
             .collect_vec();
         let distribution = match params.vnode_bitmap {
             Some(vnodes) => Distribution {
-                dist_key_indices,
+                dist_key_in_pk_indices,
                 vnodes: vnodes.into(),
             },
             None => Distribution::fallback(),
diff --git a/src/stream/src/from_proto/chain.rs b/src/stream/src/from_proto/chain.rs
index 6f7dcc81a01be..2cf464acb9522 100644
--- a/src/stream/src/from_proto/chain.rs
+++ b/src/stream/src/from_proto/chain.rs
@@ -105,14 +105,14 @@ impl ExecutorBuilder for ChainExecutorBuilder {
                     .map(|k| k.column_index as usize)
                     .collect_vec();
 
-                let dist_key_indices = table_desc
-                    .dist_key_indices
+                let dist_key_in_pk_indices = table_desc
+                    .dist_key_in_pk_indices
                     .iter()
                     .map(|&k| k as usize)
                     .collect_vec();
                 let distribution = match params.vnode_bitmap {
                     Some(vnodes) => Distribution {
-                        dist_key_indices,
+                        dist_key_in_pk_indices,
                         vnodes: vnodes.into(),
                     },
                     None => Distribution::fallback(),
diff --git a/src/stream/src/from_proto/global_simple_agg.rs b/src/stream/src/from_proto/global_simple_agg.rs
index 2656b374d4bc1..cebce95cb3b7b 100644
--- a/src/stream/src/from_proto/global_simple_agg.rs
+++ b/src/stream/src/from_proto/global_simple_agg.rs
@@ -22,7 +22,7 @@ use super::agg_common::{
 };
 use super::*;
 use crate::common::table::state_table::StateTable;
-use crate::executor::agg_common::AggExecutorArgs;
+use crate::executor::agg_common::{AggExecutorArgs, SimpleAggExecutorExtraArgs};
 use crate::executor::aggregation::AggCall;
 use crate::executor::GlobalSimpleAggExecutor;
 
@@ -69,7 +69,7 @@ impl ExecutorBuilder for GlobalSimpleAggExecutorBuilder {
             distinct_dedup_tables,
             watermark_epoch: stream.get_watermark_epoch(),
 
-            extra: None,
+            extra: SimpleAggExecutorExtraArgs {},
         })?
         .boxed())
     }
diff --git a/src/stream/src/from_proto/hash_agg.rs b/src/stream/src/from_proto/hash_agg.rs
index a264d11241e66..b01239251f766 100644
--- a/src/stream/src/from_proto/hash_agg.rs
+++ b/src/stream/src/from_proto/hash_agg.rs
@@ -26,12 +26,12 @@ use super::agg_common::{
 };
 use super::*;
 use crate::common::table::state_table::StateTable;
-use crate::executor::agg_common::{AggExecutorArgs, AggExecutorArgsExtra};
+use crate::executor::agg_common::{AggExecutorArgs, GroupAggExecutorExtraArgs};
 use crate::executor::aggregation::AggCall;
 use crate::executor::HashAggExecutor;
 
 pub struct HashAggExecutorDispatcherArgs<S: StateStore> {
-    args: AggExecutorArgs<S>,
+    args: AggExecutorArgs<S, GroupAggExecutorExtraArgs>,
     group_key_types: Vec<DataType>,
 }
 
@@ -111,12 +111,11 @@ impl ExecutorBuilder for HashAggExecutorBuilder {
                 distinct_dedup_tables,
                 watermark_epoch: stream.get_watermark_epoch(),
 
-                extra: Some(AggExecutorArgsExtra {
+                extra: GroupAggExecutorExtraArgs {
                     group_key_indices,
-
-                    metrics: params.executor_stats,
                     chunk_size: params.env.config().developer.stream_chunk_size,
-                }),
+                    metrics: params.executor_stats,
+                },
             },
             group_key_types,
         }
diff --git a/src/stream/src/from_proto/hash_join.rs b/src/stream/src/from_proto/hash_join.rs
index 4f0b8b19143ac..1356ca99767ec 100644
--- a/src/stream/src/from_proto/hash_join.rs
+++ b/src/stream/src/from_proto/hash_join.rs
@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::cmp::min;
 use std::sync::Arc;
 
 use risingwave_common::hash::{HashKey, HashKeyDispatcher};
 use risingwave_common::types::DataType;
-use risingwave_expr::expr::{build_from_prost, BoxedExpression};
+use risingwave_expr::expr::{build, build_from_prost, BoxedExpression, InputRefExpression};
+pub use risingwave_pb::expr::expr_node::Type as ExprType;
 use risingwave_pb::plan_common::JoinType as JoinTypeProto;
 use risingwave_pb::stream_plan::HashJoinNode;
 
@@ -82,6 +84,31 @@ impl ExecutorBuilder for HashJoinExecutorBuilder {
             Err(_) => None,
         };
         trace!("Join non-equi condition: {:?}", condition);
+        let mut inequality_pairs = Vec::with_capacity(node.get_inequality_pairs().len());
+        for inequality_pair in node.get_inequality_pairs() {
+            let key_required_larger = inequality_pair.get_key_required_larger() as usize;
+            let key_required_smaller = inequality_pair.get_key_required_smaller() as usize;
+            inequality_pairs.push((
+                key_required_larger,
+                key_required_smaller,
+                inequality_pair.get_clean_state(),
+                if let Some(delta_expression) = inequality_pair.delta_expression.as_ref() {
+                    let data_type = source_l.schema().fields
+                        [min(key_required_larger, key_required_smaller)]
+                    .data_type();
+                    Some(build(
+                        delta_expression.delta_type(),
+                        data_type.clone(),
+                        vec![
+                            Box::new(InputRefExpression::new(data_type, 0)),
+                            build_from_prost(delta_expression.delta.as_ref().unwrap())?,
+                        ],
+                    )?)
+                } else {
+                    None
+                },
+            ));
+        }
 
         let join_key_data_types = params_l
             .join_key_indices
@@ -111,6 +138,7 @@ impl ExecutorBuilder for HashJoinExecutorBuilder {
             output_indices,
             executor_id: params.executor_id,
             cond: condition,
+            inequality_pairs,
             op_info: params.op_info,
             state_table_l,
             degree_state_table_l,
@@ -139,6 +167,7 @@ struct HashJoinExecutorDispatcherArgs<S: StateStore> {
     output_indices: Vec<usize>,
     executor_id: u64,
     cond: Option<BoxedExpression>,
+    inequality_pairs: Vec<(usize, usize, bool, Option<BoxedExpression>)>,
     op_info: String,
     state_table_l: StateTable<S>,
     degree_state_table_l: StateTable<S>,
@@ -171,6 +200,7 @@ impl<S: StateStore> HashKeyDispatcher for HashJoinExecutorDispatcherArgs<S> {
                         self.output_indices,
                         self.executor_id,
                         self.cond,
+                        self.inequality_pairs,
                         self.op_info,
                         self.state_table_l,
                         self.degree_state_table_l,
diff --git a/src/stream/src/from_proto/lookup.rs b/src/stream/src/from_proto/lookup.rs
index 7696cea1d0cf8..df574e5587214 100644
--- a/src/stream/src/from_proto/lookup.rs
+++ b/src/stream/src/from_proto/lookup.rs
@@ -82,14 +82,14 @@ impl ExecutorBuilder for LookupExecutorBuilder {
             .map(|k| k.column_index as usize)
             .collect_vec();
 
-        let dist_key_indices = table_desc
-            .dist_key_indices
+        let dist_key_in_pk_indices = table_desc
+            .dist_key_in_pk_indices
             .iter()
             .map(|&k| k as usize)
             .collect_vec();
         let distribution = match params.vnode_bitmap {
             Some(vnodes) => Distribution {
-                dist_key_indices,
+                dist_key_in_pk_indices,
                 vnodes: vnodes.into(),
             },
             None => Distribution::fallback(),
@@ -125,6 +125,7 @@ impl ExecutorBuilder for LookupExecutorBuilder {
         );
 
         Ok(Box::new(LookupExecutor::new(LookupExecutorParams {
+            ctx: params.actor_context,
             schema: params.schema,
             arrangement,
             stream,
diff --git a/src/stream/src/from_proto/mod.rs b/src/stream/src/from_proto/mod.rs
index 8a9fee89f39f0..d292a39644479 100644
--- a/src/stream/src/from_proto/mod.rs
+++ b/src/stream/src/from_proto/mod.rs
@@ -127,7 +127,7 @@ pub async fn create_executor(
         NodeBody::Source => SourceExecutorBuilder,
         NodeBody::Sink => SinkExecutorBuilder,
         NodeBody::Project => ProjectExecutorBuilder,
-        NodeBody::TopN => TopNExecutorNewBuilder,
+        NodeBody::TopN => TopNExecutorBuilder,
         NodeBody::AppendOnlyTopN => AppendOnlyTopNExecutorBuilder,
         NodeBody::LocalSimpleAgg => LocalSimpleAggExecutorBuilder,
         NodeBody::GlobalSimpleAgg => GlobalSimpleAggExecutorBuilder,
diff --git a/src/stream/src/from_proto/mview.rs b/src/stream/src/from_proto/mview.rs
index d61bc7ccfe30c..d0444ecdfa0da 100644
--- a/src/stream/src/from_proto/mview.rs
+++ b/src/stream/src/from_proto/mview.rs
@@ -46,17 +46,8 @@ impl ExecutorBuilder for MaterializeExecutorBuilder {
         let table = node.get_table()?;
         let versioned = table.version.is_some();
 
-        let conflict_behavior = match table.handle_pk_conflict_behavior() {
-            risingwave_pb::catalog::HandleConflictBehavior::NoCheckUnspecified => {
-                ConflictBehavior::NoCheck
-            }
-            risingwave_pb::catalog::HandleConflictBehavior::Overwrite => {
-                ConflictBehavior::OverWrite
-            }
-            risingwave_pb::catalog::HandleConflictBehavior::Ignore => {
-                ConflictBehavior::IgnoreConflict
-            }
-        };
+        let conflict_behavior =
+            ConflictBehavior::from_protobuf(&table.handle_pk_conflict_behavior());
 
         macro_rules! new_executor {
             ($SD:ident) => {
@@ -112,17 +103,8 @@ impl ExecutorBuilder for ArrangeExecutorBuilder {
         // FIXME: Lookup is now implemented without cell-based table API and relies on all vnodes
         // being `DEFAULT_VNODE`, so we need to make the Arrange a singleton.
         let vnodes = params.vnode_bitmap.map(Arc::new);
-        let conflict_behavior = match table.handle_pk_conflict_behavior() {
-            risingwave_pb::catalog::HandleConflictBehavior::NoCheckUnspecified => {
-                ConflictBehavior::NoCheck
-            }
-            risingwave_pb::catalog::HandleConflictBehavior::Overwrite => {
-                ConflictBehavior::OverWrite
-            }
-            risingwave_pb::catalog::HandleConflictBehavior::Ignore => {
-                ConflictBehavior::IgnoreConflict
-            }
-        };
+        let conflict_behavior =
+            ConflictBehavior::from_protobuf(&table.handle_pk_conflict_behavior());
         let executor = MaterializeExecutor::<_, BasicSerde>::new(
             input,
             store,
diff --git a/src/stream/src/from_proto/project.rs b/src/stream/src/from_proto/project.rs
index e9c0808921c48..a148e39f458bc 100644
--- a/src/stream/src/from_proto/project.rs
+++ b/src/stream/src/from_proto/project.rs
@@ -15,6 +15,7 @@
 use multimap::MultiMap;
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_expr::expr::build_from_prost;
+use risingwave_pb::expr::expr_node;
 use risingwave_pb::stream_plan::ProjectNode;
 
 use super::*;
@@ -49,7 +50,11 @@ impl ExecutorBuilder for ProjectExecutorBuilder {
                         .map(|key| *key as usize),
                 ),
         );
-
+        let extremely_light = node.get_select_list().iter().all(|expr| {
+            let expr_type = expr.get_expr_type().unwrap();
+            expr_type == expr_node::Type::InputRef || expr_type == expr_node::Type::ConstantValue
+        });
+        let materialize_selectivity_threshold = if extremely_light { 0.0 } else { 0.5 };
         Ok(ProjectExecutor::new(
             params.actor_context,
             input,
@@ -57,6 +62,7 @@ impl ExecutorBuilder for ProjectExecutorBuilder {
             project_exprs,
             params.executor_id,
             watermark_derivations,
+            materialize_selectivity_threshold,
         )
         .boxed())
     }
diff --git a/src/stream/src/from_proto/sink.rs b/src/stream/src/from_proto/sink.rs
index ee7dc0628ba60..f200d7211dc1d 100644
--- a/src/stream/src/from_proto/sink.rs
+++ b/src/stream/src/from_proto/sink.rs
@@ -37,10 +37,10 @@ impl ExecutorBuilder for SinkExecutorBuilder {
         let sink_type = SinkType::from_proto(sink_desc.get_sink_type().unwrap());
         let mut properties = sink_desc.get_properties().clone();
         let pk_indices = sink_desc
-            .pk
+            .downstream_pk
             .iter()
-            .map(|pk| pk.column_index as usize)
-            .collect::<Vec<_>>();
+            .map(|i| *i as usize)
+            .collect_vec();
         let schema = sink_desc.columns.iter().map(Into::into).collect();
         // This field can be used to distinguish a specific actor in parallelism to prevent
         // transaction execution errors
diff --git a/src/stream/src/from_proto/temporal_join.rs b/src/stream/src/from_proto/temporal_join.rs
index 43404b9eb129f..7344aebd6c551 100644
--- a/src/stream/src/from_proto/temporal_join.rs
+++ b/src/stream/src/from_proto/temporal_join.rs
@@ -64,14 +64,14 @@ impl ExecutorBuilder for TemporalJoinExecutorBuilder {
                 .map(|k| k.column_index as usize)
                 .collect_vec();
 
-            let dist_key_indices = table_desc
-                .dist_key_indices
+            let dist_key_in_pk_indices = table_desc
+                .dist_key_in_pk_indices
                 .iter()
                 .map(|&k| k as usize)
                 .collect_vec();
             let distribution = match params.vnode_bitmap.clone() {
                 Some(vnodes) => Distribution {
-                    dist_key_indices,
+                    dist_key_in_pk_indices,
                     vnodes: vnodes.into(),
                 },
                 None => Distribution::fallback(),
diff --git a/src/stream/src/from_proto/top_n.rs b/src/stream/src/from_proto/top_n.rs
index df1261112700f..930db956c2b21 100644
--- a/src/stream/src/from_proto/top_n.rs
+++ b/src/stream/src/from_proto/top_n.rs
@@ -21,10 +21,10 @@ use super::*;
 use crate::common::table::state_table::StateTable;
 use crate::executor::TopNExecutor;
 
-pub struct TopNExecutorNewBuilder;
+pub struct TopNExecutorBuilder;
 
 #[async_trait::async_trait]
-impl ExecutorBuilder for TopNExecutorNewBuilder {
+impl ExecutorBuilder for TopNExecutorBuilder {
     type Node = TopNNode;
 
     async fn new_boxed_executor(
diff --git a/src/stream/src/task/barrier_manager.rs b/src/stream/src/task/barrier_manager.rs
index 3116aba68164f..548117bc8f12c 100644
--- a/src/stream/src/task/barrier_manager.rs
+++ b/src/stream/src/task/barrier_manager.rs
@@ -16,7 +16,7 @@ use std::collections::{HashMap, HashSet};
 
 use anyhow::anyhow;
 use prometheus::HistogramTimer;
-use risingwave_pb::stream_service::barrier_complete_response::CreateMviewProgress as ProstCreateMviewProgress;
+use risingwave_pb::stream_service::barrier_complete_response::PbCreateMviewProgress;
 use tokio::sync::mpsc::UnboundedSender;
 use tokio::sync::oneshot;
 use tokio::sync::oneshot::Receiver;
@@ -42,7 +42,7 @@ pub const ENABLE_BARRIER_AGGREGATION: bool = false;
 /// Collect result of some barrier on current compute node. Will be reported to the meta service.
 #[derive(Debug)]
 pub struct CollectResult {
-    pub create_mview_progress: Vec<ProstCreateMviewProgress>,
+    pub create_mview_progress: Vec<PbCreateMviewProgress>,
 }
 
 enum BarrierState {
diff --git a/src/stream/src/task/env.rs b/src/stream/src/task/env.rs
index 9f5097dc333d3..e4499cd7c2336 100644
--- a/src/stream/src/task/env.rs
+++ b/src/stream/src/task/env.rs
@@ -20,6 +20,8 @@ use risingwave_common::system_param::local_manager::LocalSystemParamsManagerRef;
 use risingwave_common::util::addr::HostAddr;
 use risingwave_connector::source::monitor::SourceMetrics;
 use risingwave_connector::ConnectorParams;
+#[cfg(test)]
+use risingwave_pb::connector_service::SinkPayloadFormat;
 use risingwave_source::dml_manager::DmlManagerRef;
 use risingwave_storage::StateStoreImpl;
 
@@ -90,7 +92,7 @@ impl StreamEnvironment {
         use risingwave_storage::monitor::MonitoredStorageMetrics;
         StreamEnvironment {
             server_addr: "127.0.0.1:5688".parse().unwrap(),
-            connector_params: ConnectorParams::new(None),
+            connector_params: ConnectorParams::new(None, SinkPayloadFormat::Json),
             config: Arc::new(StreamingConfig::default()),
             worker_id: WorkerNodeId::default(),
             state_store: StateStoreImpl::shared_in_memory_store(Arc::new(
diff --git a/src/stream/src/task/stream_manager.rs b/src/stream/src/task/stream_manager.rs
index c9e26b70b4e61..3edac01990869 100644
--- a/src/stream/src/task/stream_manager.rs
+++ b/src/stream/src/task/stream_manager.rs
@@ -310,18 +310,19 @@ impl LocalStreamManager {
         Ok(())
     }
 
-    pub async fn drop_actor(&self, actors: &[ActorId]) -> StreamResult<()> {
+    /// Drop the resources of the given actors.
+    pub async fn drop_actors(&self, actors: &[ActorId]) -> StreamResult<()> {
         let mut core = self.core.lock().await;
-        for id in actors {
-            core.drop_actor(*id);
+        for &id in actors {
+            core.drop_actor(id);
         }
         tracing::debug!(actors = ?actors, "drop actors");
         Ok(())
     }
 
-    /// Force stop all actors on this worker.
+    /// Force stop all actors on this worker, and then drop their resources.
     pub async fn stop_all_actors(&self) -> StreamResult<()> {
-        self.core.lock().await.drop_all_actors().await;
+        self.core.lock().await.stop_all_actors().await;
         // Clear shared buffer in storage to release memory
         self.clear_storage_buffer().await;
         self.clear_all_senders_and_collect_rx();
@@ -557,7 +558,7 @@ impl LocalStreamManagerCore {
 
         // If there're multiple stateful executors in this actor, we will wrap it into a subtask.
         let executor = if has_stateful && is_stateful {
-            let (subtask, executor) = subtask::wrap(executor);
+            let (subtask, executor) = subtask::wrap(executor, actor_context.id);
             subtasks.push(subtask);
             executor.boxed()
         } else {
@@ -781,14 +782,16 @@ impl LocalStreamManagerCore {
             .inspect(|handle| handle.abort());
         self.context.actor_infos.write().remove(&actor_id);
         self.actors.remove(&actor_id);
-        // Task should have already stopped when this method is invoked.
-        self.handles
-            .remove(&actor_id)
-            .inspect(|handle| handle.abort());
+
+        // Task should have already stopped when this method is invoked. There might be some
+        // clean-up work left (like dropping in-memory data structures), but we don't have to wait
+        // for them to finish, in order to make this request non-blocking.
+        self.handles.remove(&actor_id);
     }
 
-    /// `drop_all_actors` is invoked by meta node via RPC for recovery purpose.
-    async fn drop_all_actors(&mut self) {
+    /// `stop_all_actors` is invoked by meta node via RPC for recovery purpose. Different from the
+    /// `drop_actor`, the execution of the actors will be aborted.
+    async fn stop_all_actors(&mut self) {
         for (actor_id, handle) in &self.handles {
             tracing::debug!("force stopping actor {}", actor_id);
             handle.abort();
diff --git a/src/tests/compaction_test/src/compaction_test_runner.rs b/src/tests/compaction_test/src/compaction_test_runner.rs
index 5636032e64e98..1544214751ae3 100644
--- a/src/tests/compaction_test/src/compaction_test_runner.rs
+++ b/src/tests/compaction_test/src/compaction_test_runner.rs
@@ -24,8 +24,9 @@ use anyhow::anyhow;
 use bytes::{BufMut, Bytes, BytesMut};
 use clap::Parser;
 use futures::TryStreamExt;
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::TableId;
-use risingwave_common::config::{load_config, NO_OVERRIDE};
+use risingwave_common::config::{extract_storage_memory_config, load_config, NO_OVERRIDE};
 use risingwave_common::util::addr::HostAddr;
 use risingwave_common::util::iter_util::ZipEqFast;
 use risingwave_hummock_sdk::{CompactionGroupId, HummockEpoch, FIRST_VERSION_ID};
@@ -33,7 +34,7 @@ use risingwave_pb::common::WorkerType;
 use risingwave_pb::hummock::{HummockVersion, HummockVersionDelta};
 use risingwave_rpc_client::{HummockMetaClient, MetaClient};
 use risingwave_storage::hummock::hummock_meta_client::MonitoredHummockMetaClient;
-use risingwave_storage::hummock::{HummockStorage, TieredCacheMetricsBuilder};
+use risingwave_storage::hummock::{CachePolicy, HummockStorage, TieredCacheMetricsBuilder};
 use risingwave_storage::monitor::{
     CompactorMetrics, HummockMetrics, HummockStateStoreMetrics, MonitoredStateStore,
     MonitoredStorageMetrics, ObjectStoreMetrics,
@@ -82,6 +83,7 @@ pub async fn compaction_test_main(
 
     let _meta_handle = tokio::spawn(start_meta_node(
         meta_listen_addr.clone(),
+        opts.state_store.clone(),
         opts.config_path_for_meta.clone(),
     ));
 
@@ -92,7 +94,6 @@ pub async fn compaction_test_main(
     let (compactor_thrd, compactor_shutdown_tx) = start_compactor_thread(
         opts.meta_address.clone(),
         advertise_addr.to_string(),
-        opts.state_store.clone(),
         opts.config_path.clone(),
     );
 
@@ -124,25 +125,30 @@ pub async fn compaction_test_main(
     Ok(())
 }
 
-pub async fn start_meta_node(listen_addr: String, config_path: String) {
+pub async fn start_meta_node(listen_addr: String, state_store: String, config_path: String) {
     let meta_opts = risingwave_meta::MetaNodeOpts::parse_from([
         "meta-node",
         "--listen-addr",
         &listen_addr,
+        "--advertise-addr",
+        &listen_addr,
         "--backend",
         "mem",
-        "--checkpoint-frequency",
-        &CHECKPOINT_FREQ_FOR_REPLAY.to_string(),
+        "--state-store",
+        &state_store,
         "--config-path",
         &config_path,
     ]);
-    // We set a large checkpoint frequency to prevent the embedded meta node
-    // to commit new epochs to avoid bumping the hummock version during version log replay.
-    assert_eq!(CHECKPOINT_FREQ_FOR_REPLAY, meta_opts.checkpoint_frequency);
     let config = load_config(
         &meta_opts.config_path,
         Some(meta_opts.override_opts.clone()),
     );
+    // We set a large checkpoint frequency to prevent the embedded meta node
+    // to commit new epochs to avoid bumping the hummock version during version log replay.
+    assert_eq!(
+        CHECKPOINT_FREQ_FOR_REPLAY,
+        config.system.checkpoint_frequency
+    );
     assert!(
         config.meta.enable_compaction_deterministic,
         "enable_compaction_deterministic should be set"
@@ -154,19 +160,16 @@ pub async fn start_meta_node(listen_addr: String, config_path: String) {
 async fn start_compactor_node(
     meta_rpc_endpoint: String,
     advertise_addr: String,
-    state_store: String,
     config_path: String,
 ) {
     let opts = risingwave_compactor::CompactorOpts::parse_from([
         "compactor-node",
-        "--host",
+        "--listen-addr",
         "127.0.0.1:5550",
         "--advertise-addr",
         &advertise_addr,
         "--meta-address",
         &meta_rpc_endpoint,
-        "--state-store",
-        &state_store,
         "--config-path",
         &config_path,
     ]);
@@ -176,7 +179,6 @@ async fn start_compactor_node(
 pub fn start_compactor_thread(
     meta_endpoint: String,
     advertise_addr: String,
-    state_store: String,
     config_path: String,
 ) -> (JoinHandle<()>, std::sync::mpsc::Sender<()>) {
     let (tx, rx) = std::sync::mpsc::channel();
@@ -188,7 +190,7 @@ pub fn start_compactor_thread(
         runtime.block_on(async {
             tokio::spawn(async {
                 tracing::info!("Starting compactor node");
-                start_compactor_node(meta_endpoint, advertise_addr, state_store, config_path).await
+                start_compactor_node(meta_endpoint, advertise_addr, config_path).await
             });
             rx.recv().unwrap();
         });
@@ -349,7 +351,12 @@ async fn start_replay(
     }
 
     // Creates a hummock state store *after* we reset the hummock version
-    let storage_opts = Arc::new(StorageOpts::from((&config, &system_params)));
+    let storage_memory_config = extract_storage_memory_config(&config);
+    let storage_opts = Arc::new(StorageOpts::from((
+        &config,
+        &system_params,
+        &storage_memory_config,
+    )));
     let hummock = create_hummock_store_with_metrics(&meta_client, storage_opts, &opts).await?;
 
     // Replay version deltas from FIRST_VERSION_ID to the version before reset
@@ -623,6 +630,7 @@ async fn open_hummock_iters(
                     ignore_range_tombstone: false,
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await?;
diff --git a/src/tests/compaction_test/src/delete_range_runner.rs b/src/tests/compaction_test/src/delete_range_runner.rs
index aab5ab40a7901..ddbc3afe8175f 100644
--- a/src/tests/compaction_test/src/delete_range_runner.rs
+++ b/src/tests/compaction_test/src/delete_range_runner.rs
@@ -23,9 +23,12 @@ use bytes::Bytes;
 use futures::StreamExt;
 use rand::rngs::StdRng;
 use rand::{RngCore, SeedableRng};
+use risingwave_common::cache::CachePriority;
 use risingwave_common::catalog::hummock::PROPERTIES_RETENTION_SECOND_KEY;
 use risingwave_common::catalog::TableId;
-use risingwave_common::config::{load_config, RwConfig, NO_OVERRIDE};
+use risingwave_common::config::{
+    extract_storage_memory_config, load_config, RwConfig, NO_OVERRIDE,
+};
 use risingwave_hummock_sdk::compact::CompactorRuntimeConfig;
 use risingwave_hummock_sdk::compaction_group::StaticCompactionGroupId;
 use risingwave_hummock_sdk::filter_key_extractor::{
@@ -37,14 +40,14 @@ use risingwave_meta::hummock::test_utils::setup_compute_env_with_config;
 use risingwave_meta::hummock::MockHummockMetaClient;
 use risingwave_object_store::object::object_metrics::ObjectStoreMetrics;
 use risingwave_object_store::object::parse_remote_object_store;
-use risingwave_pb::catalog::Table as ProstTable;
+use risingwave_pb::catalog::PbTable;
 use risingwave_pb::hummock::{CompactionConfig, CompactionGroupInfo};
 use risingwave_pb::meta::SystemParams;
 use risingwave_rpc_client::HummockMetaClient;
 use risingwave_storage::hummock::compactor::{CompactionExecutor, CompactorContext};
 use risingwave_storage::hummock::sstable_store::SstableStoreRef;
 use risingwave_storage::hummock::{
-    HummockStorage, MemoryLimiter, SstableObjectIdManager, SstableStore, TieredCache,
+    CachePolicy, HummockStorage, MemoryLimiter, SstableObjectIdManager, SstableStore, TieredCache,
 };
 use risingwave_storage::monitor::{CompactorMetrics, HummockStateStoreMetrics};
 use risingwave_storage::opts::StorageOpts;
@@ -102,7 +105,7 @@ async fn compaction_test(
         worker_node.id,
     ));
 
-    let delete_key_table = ProstTable {
+    let delete_key_table = PbTable {
         id: 1,
         schema_id: 1,
         database_id: 1,
@@ -163,7 +166,12 @@ async fn compaction_test(
         ..Default::default()
     }
     .into();
-    let storage_opts = Arc::new(StorageOpts::from((&config, &system_params)));
+    let storage_memory_config = extract_storage_memory_config(&config);
+    let storage_opts = Arc::new(StorageOpts::from((
+        &config,
+        &system_params,
+        &storage_memory_config,
+    )));
     let state_store_metrics = Arc::new(HummockStateStoreMetrics::unused());
     let compactor_metrics = Arc::new(CompactorMetrics::unused());
     let object_store_metrics = Arc::new(ObjectStoreMetrics::unused());
@@ -176,8 +184,9 @@ async fn compaction_test(
     let sstable_store = Arc::new(SstableStore::new(
         Arc::new(remote_object_store),
         system_params.data_directory().to_string(),
-        config.storage.block_cache_capacity_mb * (1 << 20),
-        config.storage.meta_cache_capacity_mb * (1 << 20),
+        storage_memory_config.block_cache_capacity_mb * (1 << 20),
+        storage_memory_config.meta_cache_capacity_mb * (1 << 20),
+        0,
         TieredCache::none(),
     ));
 
@@ -392,6 +401,7 @@ impl NormalState {
                     table_id: self.table_id,
                     read_version_from_backup: false,
                     prefetch_options: Default::default(),
+                    cache_policy: CachePolicy::Fill(CachePriority::High),
                 },
             )
             .await
@@ -418,6 +428,7 @@ impl NormalState {
                         table_id: self.table_id,
                         read_version_from_backup: false,
                         prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
@@ -450,6 +461,7 @@ impl CheckState for NormalState {
                         table_id: self.table_id,
                         read_version_from_backup: false,
                         prefetch_options: PrefetchOptions::new_for_exhaust_iter(),
+                        cache_policy: CachePolicy::Fill(CachePriority::High),
                     },
                 )
                 .await
diff --git a/src/tests/e2e_extended_mode/Cargo.toml b/src/tests/e2e_extended_mode/Cargo.toml
new file mode 100644
index 0000000000000..831c7ba35a636
--- /dev/null
+++ b/src/tests/e2e_extended_mode/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "risingwave_e2e_extended_mode_test"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+
+[package.metadata.cargo-machete]
+ignored = ["workspace-hack"]
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["workspace-hack"]
+
+[dependencies]
+anyhow = { version = "1", features = ["backtrace"] }
+chrono = { version = "0.4", features = ['serde'] }
+clap = { version = "4", features = ["derive"] }
+pg_interval = "0.4"
+rust_decimal ={ version = "1.25", features = ["db-postgres","db-tokio-postgres"] }
+tokio = { version = "1", features = ["rt", "macros","rt-multi-thread"] }
+tokio-postgres = { version = "0.7", features = ["with-chrono-0_4"] }
+tracing = "0.1"
+tracing-subscriber = "0.3.16"
+
+[[bin]]
+name = "risingwave_e2e_extended_mode_test"
+path = "src/main.rs"
diff --git a/src/tests/e2e_extended_mode/README.md b/src/tests/e2e_extended_mode/README.md
new file mode 100644
index 0000000000000..5c0a1fbc96871
--- /dev/null
+++ b/src/tests/e2e_extended_mode/README.md
@@ -0,0 +1,21 @@
+This is a program used for e2e test in extended mode.
+
+## What is difference between it and extended_mode/*.slt in e2e_test
+
+For e2e test in extended query mode, there are two thing we can't test in sqllogitest
+1. bind parameter 
+2. max row number 
+See [detail](https://www.postgresql.org/docs/15/protocol-flow.html#PROTOCOL-FLOW-PIPELINING:~:text=Once%20a%20portal,count%20is%20ignored)
+
+So before sqllogictest supporting these, we test these function in this program. 
+
+In the future, we may merge it to e2e_text/extended_query
+
+# How to run
+
+```shell
+RUST_BACKTRACE=1 target/debug/risingwave_e2e_extended_mode_test --host 127.0.0.1 \
+  -p 4566 \
+  -u root \
+  --database dev \
+```
\ No newline at end of file
diff --git a/src/tests/e2e_extended_mode/src/main.rs b/src/tests/e2e_extended_mode/src/main.rs
new file mode 100644
index 0000000000000..32f5419048492
--- /dev/null
+++ b/src/tests/e2e_extended_mode/src/main.rs
@@ -0,0 +1,48 @@
+// Copyright 2023 RisingWave Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod opts;
+mod test;
+
+use std::process::exit;
+
+use clap::Parser;
+use tracing::{error, info};
+
+use crate::opts::Opts;
+use crate::test::TestSuite;
+
+#[tokio::main(flavor = "multi_thread", worker_threads = 5)]
+async fn main() {
+    exit(run_test().await)
+}
+
+async fn run_test() -> i32 {
+    let opts = Opts::parse();
+
+    tracing_subscriber::fmt::init();
+
+    let test_suite = TestSuite::new(opts);
+
+    match test_suite.test().await {
+        Ok(_) => {
+            info!("Risingwave e2e extended mode test completed successfully!");
+            0
+        }
+        Err(e) => {
+            error!("Risingwave e2e extended mode test failed: {:?}. Please ensure that your psql version is larger than 14.1", e);
+            1
+        }
+    }
+}
diff --git a/src/tests/e2e_extended_mode/src/opts.rs b/src/tests/e2e_extended_mode/src/opts.rs
new file mode 100644
index 0000000000000..bd83c54e3e8ff
--- /dev/null
+++ b/src/tests/e2e_extended_mode/src/opts.rs
@@ -0,0 +1,33 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 clap::{Parser, ValueHint};
+
+#[derive(Parser, Debug, Clone)]
+pub struct Opts {
+    /// Database name used to connect to pg.
+    #[clap(name = "DB", long = "database", default_value = "dev")]
+    pub pg_db_name: String,
+    /// Username used to connect to postgresql.
+    #[clap(name = "PG_USERNAME", short = 'u', long = "user", default_value="postgres", value_hint=ValueHint::Username)]
+    pub pg_user_name: String,
+    /// Postgresql server address to test against.
+    #[clap(name = "PG_SERVER_ADDRESS", long = "host", default_value = "localhost")]
+    pub pg_server_host: String,
+    /// Postgresql server port to test against.
+    #[clap(name = "PG_SERVER_PORT", short = 'p', long = "port")]
+    pub pg_server_port: u16,
+    #[clap(name = "PG_PASSWARD", long = "password", default_value = "")]
+    pub pg_password: String,
+}
diff --git a/src/tests/e2e_extended_mode/src/test.rs b/src/tests/e2e_extended_mode/src/test.rs
new file mode 100644
index 0000000000000..abf701af763ce
--- /dev/null
+++ b/src/tests/e2e_extended_mode/src/test.rs
@@ -0,0 +1,334 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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 anyhow::anyhow;
+use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
+use pg_interval::Interval;
+use rust_decimal::prelude::FromPrimitive;
+use rust_decimal::Decimal;
+use tokio_postgres::types::Type;
+use tokio_postgres::NoTls;
+
+use crate::opts::Opts;
+
+pub struct TestSuite {
+    config: String,
+}
+
+macro_rules! test_eq {
+    ($left:expr, $right:expr $(,)?) => {
+        match (&$left, &$right) {
+            (left_val, right_val) => {
+                if !(*left_val == *right_val) {
+                    return Err(anyhow!(
+                        "assertion failed: `(left == right)` \
+                                (left: `{:?}`, right: `{:?}`)",
+                        left_val,
+                        right_val
+                    ));
+                }
+            }
+        }
+    };
+}
+
+impl TestSuite {
+    pub fn new(opts: Opts) -> Self {
+        let config = if !opts.pg_password.is_empty() {
+            format!(
+                "dbname={} user={} host={} port={} password={}",
+                opts.pg_db_name,
+                opts.pg_user_name,
+                opts.pg_server_host,
+                opts.pg_server_port,
+                opts.pg_password
+            )
+        } else {
+            format!(
+                "dbname={} user={} host={} port={}",
+                opts.pg_db_name, opts.pg_user_name, opts.pg_server_host, opts.pg_server_port
+            )
+        };
+        Self { config }
+    }
+
+    pub async fn test(&self) -> anyhow::Result<()> {
+        self.binary_param_and_result().await?;
+        self.dql_dml_with_param().await?;
+        self.max_row().await?;
+        Ok(())
+    }
+
+    pub async fn binary_param_and_result(&self) -> anyhow::Result<()> {
+        // Connect to the database.
+        let (client, connection) = tokio_postgres::connect(&self.config, NoTls).await?;
+
+        // The connection object performs the actual communication with the database,
+        // so spawn it off to run on its own.
+        tokio::spawn(async move {
+            if let Err(e) = connection.await {
+                eprintln!("connection error: {}", e);
+            }
+        });
+
+        for row in client.query("select $1::SMALLINT;", &[&1024_i16]).await? {
+            let data: i16 = row.try_get(0)?;
+            test_eq!(data, 1024);
+        }
+
+        for row in client.query("select $1::INT;", &[&144232_i32]).await? {
+            let data: i32 = row.try_get(0)?;
+            test_eq!(data, 144232);
+        }
+
+        for row in client.query("select $1::BIGINT;", &[&99999999_i64]).await? {
+            let data: i64 = row.try_get(0)?;
+            test_eq!(data, 99999999);
+        }
+
+        for row in client
+            .query("select $1::DECIMAL;", &[&Decimal::from_f32(2.33454_f32)])
+            .await?
+        {
+            let data: Decimal = row.try_get(0)?;
+            test_eq!(data, Decimal::from_f32(2.33454_f32).unwrap());
+        }
+
+        for row in client.query("select $1::BOOL;", &[&true]).await? {
+            let data: bool = row.try_get(0)?;
+            assert!(data);
+        }
+
+        for row in client.query("select $1::REAL;", &[&1.234234_f32]).await? {
+            let data: f32 = row.try_get(0)?;
+            test_eq!(data, 1.234234);
+        }
+
+        // TODO(ZENOTME): After #8112, risingwave should support this case. (DOUBLE PRECISION TYPE)
+        // for row in client
+        //     .query("select $1::DOUBLE PRECISION;", &[&234234.23490238483_f64])
+        //     .await?
+        // {
+        //     let data: f64 = row.try_get(0)?;
+        //     test_eq!(data, 234234.23490238483);
+        // }
+        for row in client
+            .query("select $1::FLOAT8;", &[&234234.23490238483_f64])
+            .await?
+        {
+            let data: f64 = row.try_get(0)?;
+            test_eq!(data, 234234.23490238483);
+        }
+
+        for row in client
+            .query(
+                "select $1::date;",
+                &[&NaiveDate::from_ymd_opt(2022, 1, 1).unwrap()],
+            )
+            .await?
+        {
+            let data: NaiveDate = row.try_get(0)?;
+            test_eq!(data, NaiveDate::from_ymd_opt(2022, 1, 1).unwrap());
+        }
+
+        for row in client
+            .query(
+                "select $1::time",
+                &[&NaiveTime::from_hms_opt(10, 0, 0).unwrap()],
+            )
+            .await?
+        {
+            let data: NaiveTime = row.try_get(0)?;
+            test_eq!(data, NaiveTime::from_hms_opt(10, 0, 0).unwrap());
+        }
+
+        for row in client
+            .query(
+                "select $1::timestamp",
+                &[&NaiveDate::from_ymd_opt(2022, 1, 1)
+                    .unwrap()
+                    .and_hms_opt(10, 0, 0)
+                    .unwrap()],
+            )
+            .await?
+        {
+            let data: NaiveDateTime = row.try_get(0)?;
+            test_eq!(
+                data,
+                NaiveDate::from_ymd_opt(2022, 1, 1)
+                    .unwrap()
+                    .and_hms_opt(10, 0, 0)
+                    .unwrap()
+            );
+        }
+
+        let timestamptz = DateTime::<Utc>::from_utc(
+            NaiveDate::from_ymd_opt(2022, 1, 1)
+                .unwrap()
+                .and_hms_opt(10, 0, 0)
+                .unwrap(),
+            Utc,
+        );
+        for row in client
+            .query("select $1::timestamptz", &[&timestamptz])
+            .await?
+        {
+            let data: DateTime<Utc> = row.try_get(0)?;
+            test_eq!(data, timestamptz);
+        }
+
+        for row in client
+            .query("select $1::interval", &[&Interval::new(1, 1, 24000000)])
+            .await?
+        {
+            let data: Interval = row.try_get(0)?;
+            test_eq!(data, Interval::new(1, 1, 24000000));
+        }
+
+        Ok(())
+    }
+
+    /// TODO(ZENOTME): After #8112, risingwave should support to change all `prepare_typed` to
+    /// `prepare`. We don't need to provide the type explicitly.
+    async fn dql_dml_with_param(&self) -> anyhow::Result<()> {
+        let (client, connection) = tokio_postgres::connect(&self.config, NoTls).await?;
+
+        // The connection object performs the actual communication with the database,
+        // so spawn it off to run on its own.
+        tokio::spawn(async move {
+            if let Err(e) = connection.await {
+                eprintln!("connection error: {}", e);
+            }
+        });
+
+        client.query("create table t(id int)", &[]).await?;
+
+        let insert_statement = client
+            .prepare_typed("insert INTO t (id) VALUES ($1)", &[Type::INT4])
+            .await?;
+
+        for i in 0..20 {
+            client.execute(&insert_statement, &[&i]).await?;
+        }
+        client.execute("flush", &[]).await?;
+
+        let update_statement = client
+            .prepare_typed(
+                "update t set id = $1 where id < $2",
+                &[Type::INT4, Type::INT4],
+            )
+            .await?;
+        let query_statement = client
+            .prepare_typed(
+                "select * FROM t where id < $1 order by id ASC",
+                &[Type::INT4],
+            )
+            .await?;
+        let delete_statement = client
+            .prepare_typed("delete FROM t where id < $1", &[Type::INT4])
+            .await?;
+
+        let mut i = 0;
+        for row in client.query(&query_statement, &[&10_i32]).await? {
+            let id: i32 = row.try_get(0)?;
+            test_eq!(id, i);
+            i += 1;
+        }
+        test_eq!(i, 10);
+
+        client
+            .execute(&update_statement, &[&100_i32, &10_i32])
+            .await?;
+        client.execute("flush", &[]).await?;
+
+        let mut i = 0;
+        for _ in client.query(&query_statement, &[&10_i32]).await? {
+            i += 1;
+        }
+        test_eq!(i, 0);
+
+        client.execute(&delete_statement, &[&20_i32]).await?;
+        client.execute("flush", &[]).await?;
+
+        let mut i = 0;
+        for row in client.query(&query_statement, &[&101_i32]).await? {
+            let id: i32 = row.try_get(0)?;
+            test_eq!(id, 100);
+            i += 1;
+        }
+        test_eq!(i, 10);
+
+        client.execute("drop table t", &[]).await?;
+
+        Ok(())
+    }
+
+    async fn max_row(&self) -> anyhow::Result<()> {
+        let (mut client, connection) = tokio_postgres::connect(&self.config, NoTls).await?;
+
+        // The connection object performs the actual communication with the database,
+        // so spawn it off to run on its own.
+        tokio::spawn(async move {
+            if let Err(e) = connection.await {
+                eprintln!("connection error: {}", e);
+            }
+        });
+
+        client.query("create table t(id int)", &[]).await?;
+
+        let insert_statement = client
+            .prepare_typed("insert INTO t (id) VALUES ($1)", &[Type::INT4])
+            .await?;
+
+        for i in 0..10 {
+            client.execute(&insert_statement, &[&i]).await?;
+        }
+        client.execute("flush", &[]).await?;
+
+        let transaction = client.transaction().await?;
+        let statement = transaction
+            .prepare_typed("SELECT * FROM t order by id", &[])
+            .await?;
+        let portal = transaction.bind(&statement, &[]).await?;
+
+        for t in 0..5 {
+            let rows = transaction.query_portal(&portal, 1).await?;
+            test_eq!(rows.len(), 1);
+            let row = rows.get(0).unwrap();
+            let id: i32 = row.get(0);
+            test_eq!(id, t);
+        }
+
+        let mut i = 5;
+        for row in transaction.query_portal(&portal, 3).await? {
+            let id: i32 = row.get(0);
+            test_eq!(id, i);
+            i += 1;
+        }
+        test_eq!(i, 8);
+
+        for row in transaction.query_portal(&portal, 5).await? {
+            let id: i32 = row.get(0);
+            test_eq!(id, i);
+            i += 1;
+        }
+        test_eq!(i, 10);
+
+        transaction.rollback().await?;
+
+        client.execute("drop table t", &[]).await?;
+
+        Ok(())
+    }
+}
diff --git a/src/tests/regress/data/schedule b/src/tests/regress/data/schedule
index 21773c1177d02..712e4420f2999 100644
--- a/src/tests/regress/data/schedule
+++ b/src/tests/regress/data/schedule
@@ -9,4 +9,5 @@
 
 test: boolean varchar int2 int4 int8 float4 float8 comments
 test: date time timestamp interval
+test: arrays
 test: jsonb
diff --git a/src/tests/regress/data/sql/arrays.sql b/src/tests/regress/data/sql/arrays.sql
index 912233ef96810..923d9ebab2e06 100644
--- a/src/tests/regress/data/sql/arrays.sql
+++ b/src/tests/regress/data/sql/arrays.sql
@@ -2,245 +2,245 @@
 -- ARRAYS
 --
 
-CREATE TABLE arrtest (
-	a 			int2[],
-	b 			int4[][][],
-	c 			name[],
-	d			text[][],
-	e 			float8[],
-	f			char(5)[],
-	g			varchar(5)[]
-);
+--@ CREATE TABLE arrtest (
+--@ 	a 			int2[],
+--@ 	b 			int4[][][],
+--@ 	c 			name[],
+--@ 	d			text[][],
+--@ 	e 			float8[],
+--@ 	f			char(5)[],
+--@ 	g			varchar(5)[]
+--@ );
 
 --
 -- only the 'e' array is 0-based, the others are 1-based.
 --
 
-INSERT INTO arrtest (a[1:5], b[1:1][1:2][1:2], c, d, f, g)
-   VALUES ('{1,2,3,4,5}', '{{{0,0},{1,2}}}', '{}', '{}', '{}', '{}');
-
-UPDATE arrtest SET e[0] = '1.1';
-
-UPDATE arrtest SET e[1] = '2.2';
-
-INSERT INTO arrtest (f)
-   VALUES ('{"too long"}');
-
-INSERT INTO arrtest (a, b[1:2][1:2], c, d, e, f, g)
-   VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}',
-           '{{"elt1", "elt2"}}', '{"3.4", "6.7"}',
-           '{"abc","abcde"}', '{"abc","abcde"}');
-
-INSERT INTO arrtest (a, b[1:2], c, d[1:2])
-   VALUES ('{}', '{3,4}', '{foo,bar}', '{bar,foo}');
-
-INSERT INTO arrtest (b[2]) VALUES(now());  -- error, type mismatch
-
-INSERT INTO arrtest (b[1:2]) VALUES(now());  -- error, type mismatch
-
-SELECT * FROM arrtest;
-
-SELECT arrtest.a[1],
-          arrtest.b[1][1][1],
-          arrtest.c[1],
-          arrtest.d[1][1],
-          arrtest.e[0]
-   FROM arrtest;
-
-SELECT a[1], b[1][1][1], c[1], d[1][1], e[0]
-   FROM arrtest;
-
-SELECT a[1:3],
-          b[1:1][1:2][1:2],
-          c[1:2],
-          d[1:1][1:2]
-   FROM arrtest;
-
-SELECT array_ndims(a) AS a,array_ndims(b) AS b,array_ndims(c) AS c
-   FROM arrtest;
-
-SELECT array_dims(a) AS a,array_dims(b) AS b,array_dims(c) AS c
-   FROM arrtest;
+--@ INSERT INTO arrtest (a[1:5], b[1:1][1:2][1:2], c, d, f, g)
+--@    VALUES ('{1,2,3,4,5}', '{{{0,0},{1,2}}}', '{}', '{}', '{}', '{}');
+--@ 
+--@ UPDATE arrtest SET e[0] = '1.1';
+--@ 
+--@ UPDATE arrtest SET e[1] = '2.2';
+--@ 
+--@ INSERT INTO arrtest (f)
+--@    VALUES ('{"too long"}');
+--@ 
+--@ INSERT INTO arrtest (a, b[1:2][1:2], c, d, e, f, g)
+--@    VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}',
+--@            '{{"elt1", "elt2"}}', '{"3.4", "6.7"}',
+--@            '{"abc","abcde"}', '{"abc","abcde"}');
+--@ 
+--@ INSERT INTO arrtest (a, b[1:2], c, d[1:2])
+--@    VALUES ('{}', '{3,4}', '{foo,bar}', '{bar,foo}');
+--@ 
+--@ INSERT INTO arrtest (b[2]) VALUES(now());  -- error, type mismatch
+--@ 
+--@ INSERT INTO arrtest (b[1:2]) VALUES(now());  -- error, type mismatch
+--@ 
+--@ SELECT * FROM arrtest;
+--@ 
+--@ SELECT arrtest.a[1],
+--@           arrtest.b[1][1][1],
+--@           arrtest.c[1],
+--@           arrtest.d[1][1],
+--@           arrtest.e[0]
+--@    FROM arrtest;
+--@ 
+--@ SELECT a[1], b[1][1][1], c[1], d[1][1], e[0]
+--@    FROM arrtest;
+--@ 
+--@ SELECT a[1:3],
+--@           b[1:1][1:2][1:2],
+--@           c[1:2],
+--@           d[1:1][1:2]
+--@    FROM arrtest;
+--@ 
+--@ SELECT array_ndims(a) AS a,array_ndims(b) AS b,array_ndims(c) AS c
+--@    FROM arrtest;
+--@ 
+--@ SELECT array_dims(a) AS a,array_dims(b) AS b,array_dims(c) AS c
+--@    FROM arrtest;
 
 -- returns nothing
-SELECT *
-   FROM arrtest
-   WHERE a[1] < 5 and
-         c = '{"foobar"}'::_name;
-
-UPDATE arrtest
-  SET a[1:2] = '{16,25}'
-  WHERE NOT a = '{}'::_int2;
-
-UPDATE arrtest
-  SET b[1:1][1:1][1:2] = '{113, 117}',
-      b[1:1][1:2][2:2] = '{142, 147}'
-  WHERE array_dims(b) = '[1:1][1:2][1:2]';
-
-UPDATE arrtest
-  SET c[2:2] = '{"new_word"}'
-  WHERE array_dims(c) is not null;
-
-SELECT a,b,c FROM arrtest;
-
-SELECT a[1:3],
-          b[1:1][1:2][1:2],
-          c[1:2],
-          d[1:1][2:2]
-   FROM arrtest;
-
-SELECT b[1:1][2][2],
-       d[1:1][2]
-   FROM arrtest;
-
-INSERT INTO arrtest(a) VALUES('{1,null,3}');
-SELECT a FROM arrtest;
-UPDATE arrtest SET a[4] = NULL WHERE a[2] IS NULL;
-SELECT a FROM arrtest WHERE a[2] IS NULL;
-DELETE FROM arrtest WHERE a[2] IS NULL AND b IS NULL;
-SELECT a,b,c FROM arrtest;
+--@ SELECT *
+--@    FROM arrtest
+--@    WHERE a[1] < 5 and
+--@          c = '{"foobar"}'::_name;
+--@ 
+--@ UPDATE arrtest
+--@   SET a[1:2] = '{16,25}'
+--@   WHERE NOT a = '{}'::_int2;
+--@ 
+--@ UPDATE arrtest
+--@   SET b[1:1][1:1][1:2] = '{113, 117}',
+--@       b[1:1][1:2][2:2] = '{142, 147}'
+--@   WHERE array_dims(b) = '[1:1][1:2][1:2]';
+--@ 
+--@ UPDATE arrtest
+--@   SET c[2:2] = '{"new_word"}'
+--@   WHERE array_dims(c) is not null;
+--@ 
+--@ SELECT a,b,c FROM arrtest;
+--@ 
+--@ SELECT a[1:3],
+--@           b[1:1][1:2][1:2],
+--@           c[1:2],
+--@           d[1:1][2:2]
+--@    FROM arrtest;
+--@ 
+--@ SELECT b[1:1][2][2],
+--@        d[1:1][2]
+--@    FROM arrtest;
+--@ 
+--@ INSERT INTO arrtest(a) VALUES('{1,null,3}');
+--@ SELECT a FROM arrtest;
+--@ UPDATE arrtest SET a[4] = NULL WHERE a[2] IS NULL;
+--@ SELECT a FROM arrtest WHERE a[2] IS NULL;
+--@ DELETE FROM arrtest WHERE a[2] IS NULL AND b IS NULL;
+--@ SELECT a,b,c FROM arrtest;
 
 -- test mixed slice/scalar subscripting
-select '{{1,2,3},{4,5,6},{7,8,9}}'::int[];
-select ('{{1,2,3},{4,5,6},{7,8,9}}'::int[])[1:2][2];
-select '[0:2][0:2]={{1,2,3},{4,5,6},{7,8,9}}'::int[];
-select ('[0:2][0:2]={{1,2,3},{4,5,6},{7,8,9}}'::int[])[1:2][2];
+--@ select '{{1,2,3},{4,5,6},{7,8,9}}'::int[];
+--@ select ('{{1,2,3},{4,5,6},{7,8,9}}'::int[])[1:2][2];
+--@ select '[0:2][0:2]={{1,2,3},{4,5,6},{7,8,9}}'::int[];
+--@ select ('[0:2][0:2]={{1,2,3},{4,5,6},{7,8,9}}'::int[])[1:2][2];
 
 --
 -- check subscription corner cases
 --
 -- More subscripts than MAXDIM (6)
-SELECT ('{}'::int[])[1][2][3][4][5][6][7];
+--@ SELECT ('{}'::int[])[1][2][3][4][5][6][7];
 -- NULL index yields NULL when selecting
-SELECT ('{{{1},{2},{3}},{{4},{5},{6}}}'::int[])[1][NULL][1];
-SELECT ('{{{1},{2},{3}},{{4},{5},{6}}}'::int[])[1][NULL:1][1];
-SELECT ('{{{1},{2},{3}},{{4},{5},{6}}}'::int[])[1][1:NULL][1];
+--@ SELECT ('{{{1},{2},{3}},{{4},{5},{6}}}'::int[])[1][NULL][1];
+--@ SELECT ('{{{1},{2},{3}},{{4},{5},{6}}}'::int[])[1][NULL:1][1];
+--@ SELECT ('{{{1},{2},{3}},{{4},{5},{6}}}'::int[])[1][1:NULL][1];
 -- NULL index in assignment is an error
-UPDATE arrtest
-  SET c[NULL] = '{"can''t assign"}'
-  WHERE array_dims(c) is not null;
-UPDATE arrtest
-  SET c[NULL:1] = '{"can''t assign"}'
-  WHERE array_dims(c) is not null;
-UPDATE arrtest
-  SET c[1:NULL] = '{"can''t assign"}'
-  WHERE array_dims(c) is not null;
+--@ UPDATE arrtest
+--@   SET c[NULL] = '{"can''t assign"}'
+--@   WHERE array_dims(c) is not null;
+--@ UPDATE arrtest
+--@   SET c[NULL:1] = '{"can''t assign"}'
+--@   WHERE array_dims(c) is not null;
+--@ UPDATE arrtest
+--@   SET c[1:NULL] = '{"can''t assign"}'
+--@   WHERE array_dims(c) is not null;
 -- Un-subscriptable type
 SELECT (now())[1];
 
 -- test slices with empty lower and/or upper index
-CREATE TEMP TABLE arrtest_s (
-  a       int2[],
-  b       int2[][]
-);
-INSERT INTO arrtest_s VALUES ('{1,2,3,4,5}', '{{1,2,3}, {4,5,6}, {7,8,9}}');
-INSERT INTO arrtest_s VALUES ('[0:4]={1,2,3,4,5}', '[0:2][0:2]={{1,2,3}, {4,5,6}, {7,8,9}}');
-
-SELECT * FROM arrtest_s;
-SELECT a[:3], b[:2][:2] FROM arrtest_s;
-SELECT a[2:], b[2:][2:] FROM arrtest_s;
-SELECT a[:], b[:] FROM arrtest_s;
+--@ CREATE TEMP TABLE arrtest_s (
+--@   a       int2[],
+--@   b       int2[][]
+--@ );
+--@ INSERT INTO arrtest_s VALUES ('{1,2,3,4,5}', '{{1,2,3}, {4,5,6}, {7,8,9}}');
+--@ INSERT INTO arrtest_s VALUES ('[0:4]={1,2,3,4,5}', '[0:2][0:2]={{1,2,3}, {4,5,6}, {7,8,9}}');
+--@ 
+--@ SELECT * FROM arrtest_s;
+--@ SELECT a[:3], b[:2][:2] FROM arrtest_s;
+--@ SELECT a[2:], b[2:][2:] FROM arrtest_s;
+--@ SELECT a[:], b[:] FROM arrtest_s;
 
 -- updates
-UPDATE arrtest_s SET a[:3] = '{11, 12, 13}', b[:2][:2] = '{{11,12}, {14,15}}'
-  WHERE array_lower(a,1) = 1;
-SELECT * FROM arrtest_s;
-UPDATE arrtest_s SET a[3:] = '{23, 24, 25}', b[2:][2:] = '{{25,26}, {28,29}}';
-SELECT * FROM arrtest_s;
-UPDATE arrtest_s SET a[:] = '{11, 12, 13, 14, 15}';
-SELECT * FROM arrtest_s;
-UPDATE arrtest_s SET a[:] = '{23, 24, 25}';  -- fail, too small
-INSERT INTO arrtest_s VALUES(NULL, NULL);
-UPDATE arrtest_s SET a[:] = '{11, 12, 13, 14, 15}';  -- fail, no good with null
+--@ UPDATE arrtest_s SET a[:3] = '{11, 12, 13}', b[:2][:2] = '{{11,12}, {14,15}}'
+--@   WHERE array_lower(a,1) = 1;
+--@ SELECT * FROM arrtest_s;
+--@ UPDATE arrtest_s SET a[3:] = '{23, 24, 25}', b[2:][2:] = '{{25,26}, {28,29}}';
+--@ SELECT * FROM arrtest_s;
+--@ UPDATE arrtest_s SET a[:] = '{11, 12, 13, 14, 15}';
+--@ SELECT * FROM arrtest_s;
+--@ UPDATE arrtest_s SET a[:] = '{23, 24, 25}';  -- fail, too small
+--@ INSERT INTO arrtest_s VALUES(NULL, NULL);
+--@ UPDATE arrtest_s SET a[:] = '{11, 12, 13, 14, 15}';  -- fail, no good with null
 
 -- check with fixed-length-array type, such as point
-SELECT f1[0:1] FROM POINT_TBL;
-SELECT f1[0:] FROM POINT_TBL;
-SELECT f1[:1] FROM POINT_TBL;
-SELECT f1[:] FROM POINT_TBL;
+--@ SELECT f1[0:1] FROM POINT_TBL;
+--@ SELECT f1[0:] FROM POINT_TBL;
+--@ SELECT f1[:1] FROM POINT_TBL;
+--@ SELECT f1[:] FROM POINT_TBL;
 
 -- subscript assignments to fixed-width result in NULL if previous value is NULL
-UPDATE point_tbl SET f1[0] = 10 WHERE f1 IS NULL RETURNING *;
-INSERT INTO point_tbl(f1[0]) VALUES(0) RETURNING *;
+--@ UPDATE point_tbl SET f1[0] = 10 WHERE f1 IS NULL RETURNING *;
+--@ INSERT INTO point_tbl(f1[0]) VALUES(0) RETURNING *;
 -- NULL assignments get ignored
-UPDATE point_tbl SET f1[0] = NULL WHERE f1::text = '(10,10)'::point::text RETURNING *;
+--@ UPDATE point_tbl SET f1[0] = NULL WHERE f1::text = '(10,10)'::point::text RETURNING *;
 -- but non-NULL subscript assignments work
-UPDATE point_tbl SET f1[0] = -10, f1[1] = -10 WHERE f1::text = '(10,10)'::point::text RETURNING *;
+--@ UPDATE point_tbl SET f1[0] = -10, f1[1] = -10 WHERE f1::text = '(10,10)'::point::text RETURNING *;
 -- but not to expand the range
-UPDATE point_tbl SET f1[3] = 10 WHERE f1::text = '(-10,-10)'::point::text RETURNING *;
+--@ UPDATE point_tbl SET f1[3] = 10 WHERE f1::text = '(-10,-10)'::point::text RETURNING *;
 
 --
 -- test array extension
 --
-CREATE TEMP TABLE arrtest1 (i int[], t text[]);
-insert into arrtest1 values(array[1,2,null,4], array['one','two',null,'four']);
-select * from arrtest1;
-update arrtest1 set i[2] = 22, t[2] = 'twenty-two';
-select * from arrtest1;
-update arrtest1 set i[5] = 5, t[5] = 'five';
-select * from arrtest1;
-update arrtest1 set i[8] = 8, t[8] = 'eight';
-select * from arrtest1;
-update arrtest1 set i[0] = 0, t[0] = 'zero';
-select * from arrtest1;
-update arrtest1 set i[-3] = -3, t[-3] = 'minus-three';
-select * from arrtest1;
-update arrtest1 set i[0:2] = array[10,11,12], t[0:2] = array['ten','eleven','twelve'];
-select * from arrtest1;
-update arrtest1 set i[8:10] = array[18,null,20], t[8:10] = array['p18',null,'p20'];
-select * from arrtest1;
-update arrtest1 set i[11:12] = array[null,22], t[11:12] = array[null,'p22'];
-select * from arrtest1;
-update arrtest1 set i[15:16] = array[null,26], t[15:16] = array[null,'p26'];
-select * from arrtest1;
-update arrtest1 set i[-5:-3] = array[-15,-14,-13], t[-5:-3] = array['m15','m14','m13'];
-select * from arrtest1;
-update arrtest1 set i[-7:-6] = array[-17,null], t[-7:-6] = array['m17',null];
-select * from arrtest1;
-update arrtest1 set i[-12:-10] = array[-22,null,-20], t[-12:-10] = array['m22',null,'m20'];
-select * from arrtest1;
-delete from arrtest1;
-insert into arrtest1 values(array[1,2,null,4], array['one','two',null,'four']);
-select * from arrtest1;
-update arrtest1 set i[0:5] = array[0,1,2,null,4,5], t[0:5] = array['z','p1','p2',null,'p4','p5'];
-select * from arrtest1;
+--@ CREATE TEMP TABLE arrtest1 (i int[], t text[]);
+--@ insert into arrtest1 values(array[1,2,null,4], array['one','two',null,'four']);
+--@ select * from arrtest1;
+--@ update arrtest1 set i[2] = 22, t[2] = 'twenty-two';
+--@ select * from arrtest1;
+--@ update arrtest1 set i[5] = 5, t[5] = 'five';
+--@ select * from arrtest1;
+--@ update arrtest1 set i[8] = 8, t[8] = 'eight';
+--@ select * from arrtest1;
+--@ update arrtest1 set i[0] = 0, t[0] = 'zero';
+--@ select * from arrtest1;
+--@ update arrtest1 set i[-3] = -3, t[-3] = 'minus-three';
+--@ select * from arrtest1;
+--@ update arrtest1 set i[0:2] = array[10,11,12], t[0:2] = array['ten','eleven','twelve'];
+--@ select * from arrtest1;
+--@ update arrtest1 set i[8:10] = array[18,null,20], t[8:10] = array['p18',null,'p20'];
+--@ select * from arrtest1;
+--@ update arrtest1 set i[11:12] = array[null,22], t[11:12] = array[null,'p22'];
+--@ select * from arrtest1;
+--@ update arrtest1 set i[15:16] = array[null,26], t[15:16] = array[null,'p26'];
+--@ select * from arrtest1;
+--@ update arrtest1 set i[-5:-3] = array[-15,-14,-13], t[-5:-3] = array['m15','m14','m13'];
+--@ select * from arrtest1;
+--@ update arrtest1 set i[-7:-6] = array[-17,null], t[-7:-6] = array['m17',null];
+--@ select * from arrtest1;
+--@ update arrtest1 set i[-12:-10] = array[-22,null,-20], t[-12:-10] = array['m22',null,'m20'];
+--@ select * from arrtest1;
+--@ delete from arrtest1;
+--@ insert into arrtest1 values(array[1,2,null,4], array['one','two',null,'four']);
+--@ select * from arrtest1;
+--@ update arrtest1 set i[0:5] = array[0,1,2,null,4,5], t[0:5] = array['z','p1','p2',null,'p4','p5'];
+--@ select * from arrtest1;
 
 --
 -- array expressions and operators
 --
 
 -- table creation and INSERTs
-CREATE TEMP TABLE arrtest2 (i integer ARRAY[4], f float8[], n numeric[], t text[], d timestamp[]);
-INSERT INTO arrtest2 VALUES(
-  ARRAY[[[113,142],[1,147]]],
-  ARRAY[1.1,1.2,1.3]::float8[],
-  ARRAY[1.1,1.2,1.3],
-  ARRAY[[['aaa','aab'],['aba','abb'],['aca','acb']],[['baa','bab'],['bba','bbb'],['bca','bcb']]],
-  ARRAY['19620326','19931223','19970117']::timestamp[]
-);
+--@ CREATE TEMP TABLE arrtest2 (i integer ARRAY[4], f float8[], n numeric[], t text[], d timestamp[]);
+--@ INSERT INTO arrtest2 VALUES(
+--@   ARRAY[[[113,142],[1,147]]],
+--@   ARRAY[1.1,1.2,1.3]::float8[],
+--@   ARRAY[1.1,1.2,1.3],
+--@   ARRAY[[['aaa','aab'],['aba','abb'],['aca','acb']],[['baa','bab'],['bba','bbb'],['bca','bcb']]],
+--@   ARRAY['19620326','19931223','19970117']::timestamp[]
+--@ );
 
 -- some more test data
-CREATE TEMP TABLE arrtest_f (f0 int, f1 text, f2 float8);
-insert into arrtest_f values(1,'cat1',1.21);
-insert into arrtest_f values(2,'cat1',1.24);
-insert into arrtest_f values(3,'cat1',1.18);
-insert into arrtest_f values(4,'cat1',1.26);
-insert into arrtest_f values(5,'cat1',1.15);
-insert into arrtest_f values(6,'cat2',1.15);
-insert into arrtest_f values(7,'cat2',1.26);
-insert into arrtest_f values(8,'cat2',1.32);
-insert into arrtest_f values(9,'cat2',1.30);
-
-CREATE TEMP TABLE arrtest_i (f0 int, f1 text, f2 int);
-insert into arrtest_i values(1,'cat1',21);
-insert into arrtest_i values(2,'cat1',24);
-insert into arrtest_i values(3,'cat1',18);
-insert into arrtest_i values(4,'cat1',26);
-insert into arrtest_i values(5,'cat1',15);
-insert into arrtest_i values(6,'cat2',15);
-insert into arrtest_i values(7,'cat2',26);
-insert into arrtest_i values(8,'cat2',32);
-insert into arrtest_i values(9,'cat2',30);
+--@ CREATE TEMP TABLE arrtest_f (f0 int, f1 text, f2 float8);
+--@ insert into arrtest_f values(1,'cat1',1.21);
+--@ insert into arrtest_f values(2,'cat1',1.24);
+--@ insert into arrtest_f values(3,'cat1',1.18);
+--@ insert into arrtest_f values(4,'cat1',1.26);
+--@ insert into arrtest_f values(5,'cat1',1.15);
+--@ insert into arrtest_f values(6,'cat2',1.15);
+--@ insert into arrtest_f values(7,'cat2',1.26);
+--@ insert into arrtest_f values(8,'cat2',1.32);
+--@ insert into arrtest_f values(9,'cat2',1.30);
+--@ 
+--@ CREATE TEMP TABLE arrtest_i (f0 int, f1 text, f2 int);
+--@ insert into arrtest_i values(1,'cat1',21);
+--@ insert into arrtest_i values(2,'cat1',24);
+--@ insert into arrtest_i values(3,'cat1',18);
+--@ insert into arrtest_i values(4,'cat1',26);
+--@ insert into arrtest_i values(5,'cat1',15);
+--@ insert into arrtest_i values(6,'cat2',15);
+--@ insert into arrtest_i values(7,'cat2',26);
+--@ insert into arrtest_i values(8,'cat2',32);
+--@ insert into arrtest_i values(9,'cat2',30);
 
 -- expressions
 SELECT t.f[1][3][1] AS "131", t.f[2][2][1] AS "221" FROM (
@@ -248,10 +248,10 @@ SELECT t.f[1][3][1] AS "131", t.f[2][2][1] AS "221" FROM (
 ) AS t;
 SELECT ARRAY[[[[[['hello'],['world']]]]]];
 SELECT ARRAY[ARRAY['hello'],ARRAY['world']];
-SELECT ARRAY(select f2 from arrtest_f order by f2) AS "ARRAY";
+--@ SELECT ARRAY(select f2 from arrtest_f order by f2) AS "ARRAY";
 
 -- with nulls
-SELECT '{1,null,3}'::int[];
+--@ SELECT '{1,null,3}'::int[];
 SELECT ARRAY[1,NULL,3];
 
 -- functions
@@ -261,53 +261,53 @@ SELECT array_cat(ARRAY[1,2], ARRAY[3,4]) AS "{1,2,3,4}";
 SELECT array_cat(ARRAY[1,2], ARRAY[[3,4],[5,6]]) AS "{{1,2},{3,4},{5,6}}";
 SELECT array_cat(ARRAY[[3,4],[5,6]], ARRAY[1,2]) AS "{{3,4},{5,6},{1,2}}";
 
-SELECT array_position(ARRAY[1,2,3,4,5], 4);
-SELECT array_position(ARRAY[5,3,4,2,1], 4);
-SELECT array_position(ARRAY[[1,2],[3,4]], 3);
-SELECT array_position(ARRAY['sun','mon','tue','wed','thu','fri','sat'], 'mon');
-SELECT array_position(ARRAY['sun','mon','tue','wed','thu','fri','sat'], 'sat');
-SELECT array_position(ARRAY['sun','mon','tue','wed','thu','fri','sat'], NULL);
-SELECT array_position(ARRAY['sun','mon','tue','wed','thu',NULL,'fri','sat'], NULL);
-SELECT array_position(ARRAY['sun','mon','tue','wed','thu',NULL,'fri','sat'], 'sat');
-
-SELECT array_positions(NULL, 10);
-SELECT array_positions(NULL, NULL::int);
-SELECT array_positions(ARRAY[1,2,3,4,5,6,1,2,3,4,5,6], 4);
-SELECT array_positions(ARRAY[[1,2],[3,4]], 4);
-SELECT array_positions(ARRAY[1,2,3,4,5,6,1,2,3,4,5,6], NULL);
-SELECT array_positions(ARRAY[1,2,3,NULL,5,6,1,2,3,NULL,5,6], NULL);
-SELECT array_length(array_positions(ARRAY(SELECT 'AAAAAAAAAAAAAAAAAAAAAAAAA'::text || i % 10
-                                          FROM generate_series(1,100) g(i)),
-                                  'AAAAAAAAAAAAAAAAAAAAAAAAA5'), 1);
-
-DO $$
-DECLARE
-  o int;
-  a int[] := ARRAY[1,2,3,2,3,1,2];
-BEGIN
-  o := array_position(a, 2);
-  WHILE o IS NOT NULL
-  LOOP
-    RAISE NOTICE '%', o;
-    o := array_position(a, 2, o + 1);
-  END LOOP;
-END
-$$ LANGUAGE plpgsql;
-
-SELECT array_position('[2:4]={1,2,3}'::int[], 1);
-SELECT array_positions('[2:4]={1,2,3}'::int[], 1);
-
-SELECT
-    array_position(ids, (1, 1)),
-    array_positions(ids, (1, 1))
-        FROM
-(VALUES
-    (ARRAY[(0, 0), (1, 1)]),
-    (ARRAY[(1, 1)])
-) AS f (ids);
+--@ SELECT array_position(ARRAY[1,2,3,4,5], 4);
+--@ SELECT array_position(ARRAY[5,3,4,2,1], 4);
+--@ SELECT array_position(ARRAY[[1,2],[3,4]], 3);
+--@ SELECT array_position(ARRAY['sun','mon','tue','wed','thu','fri','sat'], 'mon');
+--@ SELECT array_position(ARRAY['sun','mon','tue','wed','thu','fri','sat'], 'sat');
+--@ SELECT array_position(ARRAY['sun','mon','tue','wed','thu','fri','sat'], NULL);
+--@ SELECT array_position(ARRAY['sun','mon','tue','wed','thu',NULL,'fri','sat'], NULL);
+--@ SELECT array_position(ARRAY['sun','mon','tue','wed','thu',NULL,'fri','sat'], 'sat');
+--@ 
+--@ SELECT array_positions(NULL, 10);
+--@ SELECT array_positions(NULL, NULL::int);
+--@ SELECT array_positions(ARRAY[1,2,3,4,5,6,1,2,3,4,5,6], 4);
+--@ SELECT array_positions(ARRAY[[1,2],[3,4]], 4);
+--@ SELECT array_positions(ARRAY[1,2,3,4,5,6,1,2,3,4,5,6], NULL);
+--@ SELECT array_positions(ARRAY[1,2,3,NULL,5,6,1,2,3,NULL,5,6], NULL);
+--@ SELECT array_length(array_positions(ARRAY(SELECT 'AAAAAAAAAAAAAAAAAAAAAAAAA'::text || i % 10
+--@                                           FROM generate_series(1,100) g(i)),
+--@                                   'AAAAAAAAAAAAAAAAAAAAAAAAA5'), 1);
+
+--@ DO $$
+--@ DECLARE
+--@   o int;
+--@   a int[] := ARRAY[1,2,3,2,3,1,2];
+--@ BEGIN
+--@   o := array_position(a, 2);
+--@   WHILE o IS NOT NULL
+--@   LOOP
+--@     RAISE NOTICE '%', o;
+--@     o := array_position(a, 2, o + 1);
+--@   END LOOP;
+--@ END
+--@ $$ LANGUAGE plpgsql;
+
+--@ SELECT array_position('[2:4]={1,2,3}'::int[], 1);
+--@ SELECT array_positions('[2:4]={1,2,3}'::int[], 1);
+--@ 
+--@ SELECT
+--@     array_position(ids, (1, 1)),
+--@     array_positions(ids, (1, 1))
+--@         FROM
+--@ (VALUES
+--@     (ARRAY[(0, 0), (1, 1)]),
+--@     (ARRAY[(1, 1)])
+--@ ) AS f (ids);
 
 -- operators
-SELECT a FROM arrtest WHERE b = ARRAY[[[113,142],[1,147]]];
+--@ SELECT a FROM arrtest WHERE b = ARRAY[[[113,142],[1,147]]];
 SELECT NOT ARRAY[1.1,1.2,1.3] = ARRAY[1.1,1.2,1.3] AS "FALSE";
 SELECT ARRAY[1,2] || 3 AS "{1,2,3}";
 SELECT 0 || ARRAY[1,2] AS "{0,1,2}";
@@ -318,40 +318,40 @@ SELECT ARRAY[0,0] || ARRAY[1,1] || ARRAY[2,2] AS "{0,0,1,1,2,2}";
 SELECT 0 || ARRAY[1,2] || 3 AS "{0,1,2,3}";
 SELECT ARRAY[1.1] || ARRAY[2,3,4];
 
-SELECT * FROM array_op_test WHERE i @> '{32}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i && '{32}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i @> '{17}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i && '{17}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i @> '{32,17}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i && '{32,17}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i <@ '{38,34,32,89}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i = '{}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i @> '{}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i && '{}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i <@ '{}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i = '{NULL}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i @> '{NULL}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i && '{NULL}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE i <@ '{NULL}' ORDER BY seqno;
-
-SELECT * FROM array_op_test WHERE t @> '{AAAAAAAA72908}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t && '{AAAAAAAA72908}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t @> '{AAAAAAAAAA646}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t && '{AAAAAAAAAA646}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t @> '{AAAAAAAA72908,AAAAAAAAAA646}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t && '{AAAAAAAA72908,AAAAAAAAAA646}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t <@ '{AAAAAAAA72908,AAAAAAAAAAAAAAAAAAA17075,AA88409,AAAAAAAAAAAAAAAAAA36842,AAAAAAA48038,AAAAAAAAAAAAAA10611}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t = '{}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t @> '{}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t && '{}' ORDER BY seqno;
-SELECT * FROM array_op_test WHERE t <@ '{}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i @> '{32}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i && '{32}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i @> '{17}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i && '{17}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i @> '{32,17}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i && '{32,17}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i <@ '{38,34,32,89}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i = '{}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i @> '{}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i && '{}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i <@ '{}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i = '{NULL}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i @> '{NULL}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i && '{NULL}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE i <@ '{NULL}' ORDER BY seqno;
+--@ 
+--@ SELECT * FROM array_op_test WHERE t @> '{AAAAAAAA72908}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t && '{AAAAAAAA72908}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t @> '{AAAAAAAAAA646}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t && '{AAAAAAAAAA646}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t @> '{AAAAAAAA72908,AAAAAAAAAA646}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t && '{AAAAAAAA72908,AAAAAAAAAA646}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t <@ '{AAAAAAAA72908,AAAAAAAAAAAAAAAAAAA17075,AA88409,AAAAAAAAAAAAAAAAAA36842,AAAAAAA48038,AAAAAAAAAAAAAA10611}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t = '{}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t @> '{}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t && '{}' ORDER BY seqno;
+--@ SELECT * FROM array_op_test WHERE t <@ '{}' ORDER BY seqno;
 
 -- array casts
 SELECT ARRAY[1,2,3]::text[]::int[]::float8[] AS "{1,2,3}";
 SELECT pg_typeof(ARRAY[1,2,3]::text[]::int[]::float8[]) AS "double precision[]";
-SELECT ARRAY[['a','bc'],['def','hijk']]::text[]::varchar[] AS "{{a,bc},{def,hijk}}";
-SELECT pg_typeof(ARRAY[['a','bc'],['def','hijk']]::text[]::varchar[]) AS "character varying[]";
-SELECT CAST(ARRAY[[[[[['a','bb','ccc']]]]]] as text[]) as "{{{{{{a,bb,ccc}}}}}}";
+--@ SELECT ARRAY[['a','bc'],['def','hijk']]::text[]::varchar[] AS "{{a,bc},{def,hijk}}";
+--@ SELECT pg_typeof(ARRAY[['a','bc'],['def','hijk']]::text[]::varchar[]) AS "character varying[]";
+--@ SELECT CAST(ARRAY[[[[[['a','bb','ccc']]]]]] as text[]) as "{{{{{{a,bb,ccc}}}}}}";
 SELECT NULL::text[]::int[] AS "NULL";
 
 -- scalar op any/all (array)
@@ -372,46 +372,46 @@ select 33 * any (44);
 -- nulls
 select 33 = any (null::int[]);
 select null::int = any ('{1,2,3}');
-select 33 = any ('{1,null,3}');
-select 33 = any ('{1,null,33}');
+--@ select 33 = any ('{1,null,3}');
+--@ select 33 = any ('{1,null,33}');
 select 33 = all (null::int[]);
 select null::int = all ('{1,2,3}');
-select 33 = all ('{1,null,3}');
-select 33 = all ('{33,null,33}');
+--@ select 33 = all ('{1,null,3}');
+--@ select 33 = all ('{33,null,33}');
 -- nulls later in the bitmap
-SELECT -1 != ALL(ARRAY(SELECT NULLIF(g.i, 900) FROM generate_series(1,1000) g(i)));
+--@ SELECT -1 != ALL(ARRAY(SELECT NULLIF(g.i, 900) FROM generate_series(1,1000) g(i)));
 
 -- test indexes on arrays
-create temp table arr_tbl (f1 int[] unique);
-insert into arr_tbl values ('{1,2,3}');
-insert into arr_tbl values ('{1,2}');
+--@ create temp table arr_tbl (f1 int[] unique);
+--@ insert into arr_tbl values ('{1,2,3}');
+--@ insert into arr_tbl values ('{1,2}');
 -- failure expected:
-insert into arr_tbl values ('{1,2,3}');
-insert into arr_tbl values ('{2,3,4}');
-insert into arr_tbl values ('{1,5,3}');
-insert into arr_tbl values ('{1,2,10}');
-
-set enable_seqscan to off;
-set enable_bitmapscan to off;
-select * from arr_tbl where f1 > '{1,2,3}' and f1 <= '{1,5,3}';
-select * from arr_tbl where f1 >= '{1,2,3}' and f1 < '{1,5,3}';
+--@ insert into arr_tbl values ('{1,2,3}');
+--@ insert into arr_tbl values ('{2,3,4}');
+--@ insert into arr_tbl values ('{1,5,3}');
+--@ insert into arr_tbl values ('{1,2,10}');
+--@ 
+--@ set enable_seqscan to off;
+--@ set enable_bitmapscan to off;
+--@ select * from arr_tbl where f1 > '{1,2,3}' and f1 <= '{1,5,3}';
+--@ select * from arr_tbl where f1 >= '{1,2,3}' and f1 < '{1,5,3}';
 
 -- test ON CONFLICT DO UPDATE with arrays
-create temp table arr_pk_tbl (pk int4 primary key, f1 int[]);
-insert into arr_pk_tbl values (1, '{1,2,3}');
-insert into arr_pk_tbl values (1, '{3,4,5}') on conflict (pk)
-  do update set f1[1] = excluded.f1[1], f1[3] = excluded.f1[3]
-  returning pk, f1;
-insert into arr_pk_tbl(pk, f1[1:2]) values (1, '{6,7,8}') on conflict (pk)
-  do update set f1[1] = excluded.f1[1],
-    f1[2] = excluded.f1[2],
-    f1[3] = excluded.f1[3]
-  returning pk, f1;
+--@ create temp table arr_pk_tbl (pk int4 primary key, f1 int[]);
+--@ insert into arr_pk_tbl values (1, '{1,2,3}');
+--@ insert into arr_pk_tbl values (1, '{3,4,5}') on conflict (pk)
+--@   do update set f1[1] = excluded.f1[1], f1[3] = excluded.f1[3]
+--@   returning pk, f1;
+--@ insert into arr_pk_tbl(pk, f1[1:2]) values (1, '{6,7,8}') on conflict (pk)
+--@   do update set f1[1] = excluded.f1[1],
+--@     f1[2] = excluded.f1[2],
+--@     f1[3] = excluded.f1[3]
+--@   returning pk, f1;
 
 -- note: if above selects don't produce the expected tuple order,
 -- then you didn't get an indexscan plan, and something is busted.
-reset enable_seqscan;
-reset enable_bitmapscan;
+--@ reset enable_seqscan;
+--@ reset enable_bitmapscan;
 
 -- test [not] (like|ilike) (any|all) (...)
 select 'foo' like any (array['%a', '%o']); -- t
@@ -420,18 +420,18 @@ select 'foo' like all (array['f%', '%o']); -- t
 select 'foo' like all (array['f%', '%b']); -- f
 select 'foo' not like any (array['%a', '%b']); -- t
 select 'foo' not like all (array['%a', '%o']); -- f
-select 'foo' ilike any (array['%A', '%O']); -- t
-select 'foo' ilike all (array['F%', '%O']); -- t
+--@ select 'foo' ilike any (array['%A', '%O']); -- t
+--@ select 'foo' ilike all (array['F%', '%O']); -- t
 
 --
 -- General array parser tests
 --
 
 -- none of the following should be accepted
-select '{{1,{2}},{2,3}}'::text[];
-select '{{},{}}'::text[];
-select E'{{1,2},\\{2,3}}'::text[];
-select '{{"1 2" x},{3}}'::text[];
+--@ select '{{1,{2}},{2,3}}'::text[];
+--@ select '{{},{}}'::text[];
+--@ select E'{{1,2},\\{2,3}}'::text[];
+--@ select '{{"1 2" x},{3}}'::text[];
 select '{}}'::text[];
 select '{ }}'::text[];
 select array[];
@@ -439,177 +439,177 @@ select array[];
 
 -- all of the following should be accepted
 select '{}'::text[];
-select '{{{1,2,3,4},{2,3,4,5}},{{3,4,5,6},{4,5,6,7}}}'::text[];
-select '{0 second  ,0 second}'::interval[];
-select '{ { "," } , { 3 } }'::text[];
-select '  {   {  "  0 second  "   ,  0 second  }   }'::text[];
-select '{
-           0 second,
-           @ 1 hour @ 42 minutes @ 20 seconds
-         }'::interval[];
+--@ select '{{{1,2,3,4},{2,3,4,5}},{{3,4,5,6},{4,5,6,7}}}'::text[];
+--@ select '{0 second  ,0 second}'::interval[];
+--@ select '{ { "," } , { 3 } }'::text[];
+--@ select '  {   {  "  0 second  "   ,  0 second  }   }'::text[];
+--@ select '{
+--@            0 second,
+--@            @ 1 hour @ 42 minutes @ 20 seconds
+--@          }'::interval[];
 select array[]::text[];
-select '[0:1]={1.1,2.2}'::float8[];
+--@ select '[0:1]={1.1,2.2}'::float8[];
 -- all of the above should be accepted
 
 -- tests for array aggregates
-CREATE TEMP TABLE arraggtest ( f1 INT[], f2 TEXT[][], f3 FLOAT[]);
-
-INSERT INTO arraggtest (f1, f2, f3) VALUES
-('{1,2,3,4}','{{grey,red},{blue,blue}}','{1.6, 0.0}');
-INSERT INTO arraggtest (f1, f2, f3) VALUES
-('{1,2,3}','{{grey,red},{grey,blue}}','{1.6}');
-SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
-
-INSERT INTO arraggtest (f1, f2, f3) VALUES
-('{3,3,2,4,5,6}','{{white,yellow},{pink,orange}}','{2.1,3.3,1.8,1.7,1.6}');
-SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
-
-INSERT INTO arraggtest (f1, f2, f3) VALUES
-('{2}','{{black,red},{green,orange}}','{1.6,2.2,2.6,0.4}');
-SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
-
-INSERT INTO arraggtest (f1, f2, f3) VALUES
-('{4,2,6,7,8,1}','{{red},{black},{purple},{blue},{blue}}',NULL);
-SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
-
-INSERT INTO arraggtest (f1, f2, f3) VALUES
-('{}','{{pink,white,blue,red,grey,orange}}','{2.1,1.87,1.4,2.2}');
-SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
+--@ CREATE TEMP TABLE arraggtest ( f1 INT[], f2 TEXT[][], f3 FLOAT[]);
+--@ 
+--@ INSERT INTO arraggtest (f1, f2, f3) VALUES
+--@ ('{1,2,3,4}','{{grey,red},{blue,blue}}','{1.6, 0.0}');
+--@ INSERT INTO arraggtest (f1, f2, f3) VALUES
+--@ ('{1,2,3}','{{grey,red},{grey,blue}}','{1.6}');
+--@ SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
+--@ 
+--@ INSERT INTO arraggtest (f1, f2, f3) VALUES
+--@ ('{3,3,2,4,5,6}','{{white,yellow},{pink,orange}}','{2.1,3.3,1.8,1.7,1.6}');
+--@ SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
+--@ 
+--@ INSERT INTO arraggtest (f1, f2, f3) VALUES
+--@ ('{2}','{{black,red},{green,orange}}','{1.6,2.2,2.6,0.4}');
+--@ SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
+--@ 
+--@ INSERT INTO arraggtest (f1, f2, f3) VALUES
+--@ ('{4,2,6,7,8,1}','{{red},{black},{purple},{blue},{blue}}',NULL);
+--@ SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
+--@ 
+--@ INSERT INTO arraggtest (f1, f2, f3) VALUES
+--@ ('{}','{{pink,white,blue,red,grey,orange}}','{2.1,1.87,1.4,2.2}');
+--@ SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
 
 -- A few simple tests for arrays of composite types
 
-create type comptype as (f1 int, f2 text);
-
-create table comptable (c1 comptype, c2 comptype[]);
+--@ create type comptype as (f1 int, f2 text);
+--@ 
+--@ create table comptable (c1 comptype, c2 comptype[]);
 
 -- XXX would like to not have to specify row() construct types here ...
-insert into comptable
-  values (row(1,'foo'), array[row(2,'bar')::comptype, row(3,'baz')::comptype]);
+--@ insert into comptable
+--@   values (row(1,'foo'), array[row(2,'bar')::comptype, row(3,'baz')::comptype]);
 
 -- check that implicitly named array type _comptype isn't a problem
-create type _comptype as enum('fooey');
-
-select * from comptable;
-select c2[2].f2 from comptable;
-
-drop type _comptype;
-drop table comptable;
-drop type comptype;
-
-create or replace function unnest1(anyarray)
-returns setof anyelement as $$
-select $1[s] from generate_subscripts($1,1) g(s);
-$$ language sql immutable;
-
-create or replace function unnest2(anyarray)
-returns setof anyelement as $$
-select $1[s1][s2] from generate_subscripts($1,1) g1(s1),
-                   generate_subscripts($1,2) g2(s2);
-$$ language sql immutable;
-
-select * from unnest1(array[1,2,3]);
-select * from unnest2(array[[1,2,3],[4,5,6]]);
-
-drop function unnest1(anyarray);
-drop function unnest2(anyarray);
-
-select array_fill(null::integer, array[3,3],array[2,2]);
-select array_fill(null::integer, array[3,3]);
-select array_fill(null::text, array[3,3],array[2,2]);
-select array_fill(null::text, array[3,3]);
-select array_fill(7, array[3,3],array[2,2]);
-select array_fill(7, array[3,3]);
-select array_fill('juhu'::text, array[3,3],array[2,2]);
-select array_fill('juhu'::text, array[3,3]);
-select a, a = '{}' as is_eq, array_dims(a)
-  from (select array_fill(42, array[0]) as a) ss;
-select a, a = '{}' as is_eq, array_dims(a)
-  from (select array_fill(42, '{}') as a) ss;
-select a, a = '{}' as is_eq, array_dims(a)
-  from (select array_fill(42, '{}', '{}') as a) ss;
--- raise exception
-select array_fill(1, null, array[2,2]);
-select array_fill(1, array[2,2], null);
-select array_fill(1, array[2,2], '{}');
-select array_fill(1, array[3,3], array[1,1,1]);
-select array_fill(1, array[1,2,null]);
-select array_fill(1, array[[1,2],[3,4]]);
-
-select string_to_array('1|2|3', '|');
-select string_to_array('1|2|3|', '|');
-select string_to_array('1||2|3||', '||');
-select string_to_array('1|2|3', '');
-select string_to_array('', '|');
-select string_to_array('1|2|3', NULL);
-select string_to_array(NULL, '|') IS NULL;
-select string_to_array('abc', '');
-select string_to_array('abc', '', 'abc');
-select string_to_array('abc', ',');
-select string_to_array('abc', ',', 'abc');
-select string_to_array('1,2,3,4,,6', ',');
-select string_to_array('1,2,3,4,,6', ',', '');
-select string_to_array('1,2,3,4,*,6', ',', '*');
-
-select v, v is null as "is null" from string_to_table('1|2|3', '|') g(v);
-select v, v is null as "is null" from string_to_table('1|2|3|', '|') g(v);
-select v, v is null as "is null" from string_to_table('1||2|3||', '||') g(v);
-select v, v is null as "is null" from string_to_table('1|2|3', '') g(v);
-select v, v is null as "is null" from string_to_table('', '|') g(v);
-select v, v is null as "is null" from string_to_table('1|2|3', NULL) g(v);
-select v, v is null as "is null" from string_to_table(NULL, '|') g(v);
-select v, v is null as "is null" from string_to_table('abc', '') g(v);
-select v, v is null as "is null" from string_to_table('abc', '', 'abc') g(v);
-select v, v is null as "is null" from string_to_table('abc', ',') g(v);
-select v, v is null as "is null" from string_to_table('abc', ',', 'abc') g(v);
-select v, v is null as "is null" from string_to_table('1,2,3,4,,6', ',') g(v);
-select v, v is null as "is null" from string_to_table('1,2,3,4,,6', ',', '') g(v);
-select v, v is null as "is null" from string_to_table('1,2,3,4,*,6', ',', '*') g(v);
+--@ create type _comptype as enum('fooey');
+--@ 
+--@ select * from comptable;
+--@ select c2[2].f2 from comptable;
+--@ 
+--@ drop type _comptype;
+--@ drop table comptable;
+--@ drop type comptype;
+--@ 
+--@ create or replace function unnest1(anyarray)
+--@ returns setof anyelement as $$
+--@ select $1[s] from generate_subscripts($1,1) g(s);
+--@ $$ language sql immutable;
+--@ 
+--@ create or replace function unnest2(anyarray)
+--@ returns setof anyelement as $$
+--@ select $1[s1][s2] from generate_subscripts($1,1) g1(s1),
+--@                    generate_subscripts($1,2) g2(s2);
+--@ $$ language sql immutable;
+--@ 
+--@ select * from unnest1(array[1,2,3]);
+--@ select * from unnest2(array[[1,2,3],[4,5,6]]);
+--@ 
+--@ drop function unnest1(anyarray);
+--@ drop function unnest2(anyarray);
+
+--@ select array_fill(null::integer, array[3,3],array[2,2]);
+--@ select array_fill(null::integer, array[3,3]);
+--@ select array_fill(null::text, array[3,3],array[2,2]);
+--@ select array_fill(null::text, array[3,3]);
+--@ select array_fill(7, array[3,3],array[2,2]);
+--@ select array_fill(7, array[3,3]);
+--@ select array_fill('juhu'::text, array[3,3],array[2,2]);
+--@ select array_fill('juhu'::text, array[3,3]);
+--@ select a, a = '{}' as is_eq, array_dims(a)
+--@   from (select array_fill(42, array[0]) as a) ss;
+--@ select a, a = '{}' as is_eq, array_dims(a)
+--@   from (select array_fill(42, '{}') as a) ss;
+--@ select a, a = '{}' as is_eq, array_dims(a)
+--@   from (select array_fill(42, '{}', '{}') as a) ss;
+--@ -- raise exception
+--@ select array_fill(1, null, array[2,2]);
+--@ select array_fill(1, array[2,2], null);
+--@ select array_fill(1, array[2,2], '{}');
+--@ select array_fill(1, array[3,3], array[1,1,1]);
+--@ select array_fill(1, array[1,2,null]);
+--@ select array_fill(1, array[[1,2],[3,4]]);
+
+--@ select string_to_array('1|2|3', '|');
+--@ select string_to_array('1|2|3|', '|');
+--@ select string_to_array('1||2|3||', '||');
+--@ select string_to_array('1|2|3', '');
+--@ select string_to_array('', '|');
+--@ select string_to_array('1|2|3', NULL);
+--@ select string_to_array(NULL, '|') IS NULL;
+--@ select string_to_array('abc', '');
+--@ select string_to_array('abc', '', 'abc');
+--@ select string_to_array('abc', ',');
+--@ select string_to_array('abc', ',', 'abc');
+--@ select string_to_array('1,2,3,4,,6', ',');
+--@ select string_to_array('1,2,3,4,,6', ',', '');
+--@ select string_to_array('1,2,3,4,*,6', ',', '*');
+
+--@ select v, v is null as "is null" from string_to_table('1|2|3', '|') g(v);
+--@ select v, v is null as "is null" from string_to_table('1|2|3|', '|') g(v);
+--@ select v, v is null as "is null" from string_to_table('1||2|3||', '||') g(v);
+--@ select v, v is null as "is null" from string_to_table('1|2|3', '') g(v);
+--@ select v, v is null as "is null" from string_to_table('', '|') g(v);
+--@ select v, v is null as "is null" from string_to_table('1|2|3', NULL) g(v);
+--@ select v, v is null as "is null" from string_to_table(NULL, '|') g(v);
+--@ select v, v is null as "is null" from string_to_table('abc', '') g(v);
+--@ select v, v is null as "is null" from string_to_table('abc', '', 'abc') g(v);
+--@ select v, v is null as "is null" from string_to_table('abc', ',') g(v);
+--@ select v, v is null as "is null" from string_to_table('abc', ',', 'abc') g(v);
+--@ select v, v is null as "is null" from string_to_table('1,2,3,4,,6', ',') g(v);
+--@ select v, v is null as "is null" from string_to_table('1,2,3,4,,6', ',', '') g(v);
+--@ select v, v is null as "is null" from string_to_table('1,2,3,4,*,6', ',', '*') g(v);
 
 select array_to_string(NULL::int4[], ',') IS NULL;
 select array_to_string('{}'::int4[], ',');
 select array_to_string(array[1,2,3,4,NULL,6], ',');
 select array_to_string(array[1,2,3,4,NULL,6], ',', '*');
 select array_to_string(array[1,2,3,4,NULL,6], NULL);
-select array_to_string(array[1,2,3,4,NULL,6], ',', NULL);
+--@ select array_to_string(array[1,2,3,4,NULL,6], ',', NULL);
 
-select array_to_string(string_to_array('1|2|3', '|'), '|');
+--@ select array_to_string(string_to_array('1|2|3', '|'), '|');
 
-select array_length(array[1,2,3], 1);
-select array_length(array[[1,2,3], [4,5,6]], 0);
-select array_length(array[[1,2,3], [4,5,6]], 1);
-select array_length(array[[1,2,3], [4,5,6]], 2);
-select array_length(array[[1,2,3], [4,5,6]], 3);
+--@ select array_length(array[1,2,3], 1);
+--@ select array_length(array[[1,2,3], [4,5,6]], 0);
+--@ select array_length(array[[1,2,3], [4,5,6]], 1);
+--@ select array_length(array[[1,2,3], [4,5,6]], 2);
+--@ select array_length(array[[1,2,3], [4,5,6]], 3);
 
-select cardinality(NULL::int[]);
-select cardinality('{}'::int[]);
-select cardinality(array[1,2,3]);
-select cardinality('[2:4]={5,6,7}'::int[]);
-select cardinality('{{1,2}}'::int[]);
-select cardinality('{{1,2},{3,4},{5,6}}'::int[]);
-select cardinality('{{{1,9},{5,6}},{{2,3},{3,4}}}'::int[]);
+--@ select cardinality(NULL::int[]);
+--@ select cardinality('{}'::int[]);
+--@ select cardinality(array[1,2,3]);
+--@ select cardinality('[2:4]={5,6,7}'::int[]);
+--@ select cardinality('{{1,2}}'::int[]);
+--@ select cardinality('{{1,2},{3,4},{5,6}}'::int[]);
+--@ select cardinality('{{{1,9},{5,6}},{{2,3},{3,4}}}'::int[]);
 
 -- array_agg(anynonarray)
-select array_agg(unique1) from (select unique1 from tenk1 where unique1 < 15 order by unique1) ss;
-select array_agg(ten) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
-select array_agg(nullif(ten, 4)) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
-select array_agg(unique1) from tenk1 where unique1 < -15;
+--@ select array_agg(unique1) from (select unique1 from tenk1 where unique1 < 15 order by unique1) ss;
+--@ select array_agg(ten) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
+--@ select array_agg(nullif(ten, 4)) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
+--@ select array_agg(unique1) from tenk1 where unique1 < -15;
 
 -- array_agg(anyarray)
 select array_agg(ar)
   from (values ('{1,2}'::int[]), ('{3,4}'::int[])) v(ar);
-select array_agg(distinct ar order by ar desc)
-  from (select array[i / 2] from generate_series(1,10) a(i)) b(ar);
-select array_agg(ar)
-  from (select array_agg(array[i, i+1, i-1])
-        from generate_series(1,2) a(i)) b(ar);
-select array_agg(array[i+1.2, i+1.3, i+1.4]) from generate_series(1,3) g(i);
-select array_agg(array['Hello', i::text]) from generate_series(9,11) g(i);
-select array_agg(array[i, nullif(i, 3), i+1]) from generate_series(1,4) g(i);
+--@ select array_agg(distinct ar order by ar desc)
+--@   from (select array[i / 2] from generate_series(1,10) a(i)) b(ar);
+--@ select array_agg(ar)
+--@   from (select array_agg(array[i, i+1, i-1])
+--@         from generate_series(1,2) a(i)) b(ar);
+--@ select array_agg(array[i+1.2, i+1.3, i+1.4]) from generate_series(1,3) g(i);
+--@ select array_agg(array['Hello', i::text]) from generate_series(9,11) g(i);
+--@ select array_agg(array[i, nullif(i, 3), i+1]) from generate_series(1,4) g(i);
 -- errors
-select array_agg('{}'::int[]) from generate_series(1,2);
-select array_agg(null::int[]) from generate_series(1,2);
-select array_agg(ar)
-  from (values ('{1,2}'::int[]), ('{3}'::int[])) v(ar);
+--@ select array_agg('{}'::int[]) from generate_series(1,2);
+--@ select array_agg(null::int[]) from generate_series(1,2);
+--@ select array_agg(ar)
+--@   from (values ('{1,2}'::int[]), ('{3}'::int[])) v(ar);
 
 select unnest(array[1,2,3]);
 select * from unnest(array[1,2,3]);
@@ -618,120 +618,120 @@ select unnest(array[1,2,3,4.5]::numeric[]);
 select unnest(array[1,2,3,null,4,null,null,5,6]);
 select unnest(array[1,2,3,null,4,null,null,5,6]::text[]);
 select abs(unnest(array[1,2,null,-3]));
-select array_remove(array[1,2,2,3], 2);
-select array_remove(array[1,2,2,3], 5);
-select array_remove(array[1,NULL,NULL,3], NULL);
-select array_remove(array['A','CC','D','C','RR'], 'RR');
-select array_remove(array[1.0, 2.1, 3.3], 1);
-select array_remove('{{1,2,2},{1,4,3}}', 2); -- not allowed
-select array_remove(array['X','X','X'], 'X') = '{}';
-select array_replace(array[1,2,5,4],5,3);
-select array_replace(array[1,2,5,4],5,NULL);
-select array_replace(array[1,2,NULL,4,NULL],NULL,5);
-select array_replace(array['A','B','DD','B'],'B','CC');
-select array_replace(array[1,NULL,3],NULL,NULL);
-select array_replace(array['AB',NULL,'CDE'],NULL,'12');
+--@ select array_remove(array[1,2,2,3], 2);
+--@ select array_remove(array[1,2,2,3], 5);
+--@ select array_remove(array[1,NULL,NULL,3], NULL);
+--@ select array_remove(array['A','CC','D','C','RR'], 'RR');
+--@ select array_remove(array[1.0, 2.1, 3.3], 1);
+--@ select array_remove('{{1,2,2},{1,4,3}}', 2); -- not allowed
+--@ select array_remove(array['X','X','X'], 'X') = '{}';
+--@ select array_replace(array[1,2,5,4],5,3);
+--@ select array_replace(array[1,2,5,4],5,NULL);
+--@ select array_replace(array[1,2,NULL,4,NULL],NULL,5);
+--@ select array_replace(array['A','B','DD','B'],'B','CC');
+--@ select array_replace(array[1,NULL,3],NULL,NULL);
+--@ select array_replace(array['AB',NULL,'CDE'],NULL,'12');
 
 -- array(select array-value ...)
-select array(select array[i,i/2] from generate_series(1,5) i);
-select array(select array['Hello', i::text] from generate_series(9,11) i);
+--@ select array(select array[i,i/2] from generate_series(1,5) i);
+--@ select array(select array['Hello', i::text] from generate_series(9,11) i);
 
 -- Insert/update on a column that is array of composite
 
-create temp table t1 (f1 int8_tbl[]);
-insert into t1 (f1[5].q1) values(42);
-select * from t1;
-update t1 set f1[5].q2 = 43;
-select * from t1;
+--@ create temp table t1 (f1 int8_tbl[]);
+--@ insert into t1 (f1[5].q1) values(42);
+--@ select * from t1;
+--@ update t1 set f1[5].q2 = 43;
+--@ select * from t1;
 
 -- Check that arrays of composites are safely detoasted when needed
 
-create temp table src (f1 text);
-insert into src
-  select string_agg(random()::text,'') from generate_series(1,10000);
-create type textandtext as (c1 text, c2 text);
-create temp table dest (f1 textandtext[]);
-insert into dest select array[row(f1,f1)::textandtext] from src;
-select length(md5((f1[1]).c2)) from dest;
-delete from src;
-select length(md5((f1[1]).c2)) from dest;
-truncate table src;
-drop table src;
-select length(md5((f1[1]).c2)) from dest;
-drop table dest;
-drop type textandtext;
+--@ create temp table src (f1 text);
+--@ insert into src
+--@   select string_agg(random()::text,'') from generate_series(1,10000);
+--@ create type textandtext as (c1 text, c2 text);
+--@ create temp table dest (f1 textandtext[]);
+--@ insert into dest select array[row(f1,f1)::textandtext] from src;
+--@ select length(md5((f1[1]).c2)) from dest;
+--@ delete from src;
+--@ select length(md5((f1[1]).c2)) from dest;
+--@ truncate table src;
+--@ drop table src;
+--@ select length(md5((f1[1]).c2)) from dest;
+--@ drop table dest;
+--@ drop type textandtext;
 
 -- Tests for polymorphic-array form of width_bucket()
 
 -- this exercises the varwidth and float8 code paths
-SELECT
-    op,
-    width_bucket(op::numeric, ARRAY[1, 3, 5, 10.0]::numeric[]) AS wb_n1,
-    width_bucket(op::numeric, ARRAY[0, 5.5, 9.99]::numeric[]) AS wb_n2,
-    width_bucket(op::numeric, ARRAY[-6, -5, 2.0]::numeric[]) AS wb_n3,
-    width_bucket(op::float8, ARRAY[1, 3, 5, 10.0]::float8[]) AS wb_f1,
-    width_bucket(op::float8, ARRAY[0, 5.5, 9.99]::float8[]) AS wb_f2,
-    width_bucket(op::float8, ARRAY[-6, -5, 2.0]::float8[]) AS wb_f3
-FROM (VALUES
-  (-5.2),
-  (-0.0000000001),
-  (0.000000000001),
-  (1),
-  (1.99999999999999),
-  (2),
-  (2.00000000000001),
-  (3),
-  (4),
-  (4.5),
-  (5),
-  (5.5),
-  (6),
-  (7),
-  (8),
-  (9),
-  (9.99999999999999),
-  (10),
-  (10.0000000000001)
-) v(op);
+--@ SELECT
+--@     op,
+--@     width_bucket(op::numeric, ARRAY[1, 3, 5, 10.0]::numeric[]) AS wb_n1,
+--@     width_bucket(op::numeric, ARRAY[0, 5.5, 9.99]::numeric[]) AS wb_n2,
+--@     width_bucket(op::numeric, ARRAY[-6, -5, 2.0]::numeric[]) AS wb_n3,
+--@     width_bucket(op::float8, ARRAY[1, 3, 5, 10.0]::float8[]) AS wb_f1,
+--@     width_bucket(op::float8, ARRAY[0, 5.5, 9.99]::float8[]) AS wb_f2,
+--@     width_bucket(op::float8, ARRAY[-6, -5, 2.0]::float8[]) AS wb_f3
+--@ FROM (VALUES
+--@   (-5.2),
+--@   (-0.0000000001),
+--@   (0.000000000001),
+--@   (1),
+--@   (1.99999999999999),
+--@   (2),
+--@   (2.00000000000001),
+--@   (3),
+--@   (4),
+--@   (4.5),
+--@   (5),
+--@   (5.5),
+--@   (6),
+--@   (7),
+--@   (8),
+--@   (9),
+--@   (9.99999999999999),
+--@   (10),
+--@   (10.0000000000001)
+--@ ) v(op);
 
 -- ensure float8 path handles NaN properly
-SELECT
-    op,
-    width_bucket(op, ARRAY[1, 3, 9, 'NaN', 'NaN']::float8[]) AS wb
-FROM (VALUES
-  (-5.2::float8),
-  (4::float8),
-  (77::float8),
-  ('NaN'::float8)
-) v(op);
+--@ SELECT
+--@     op,
+--@     width_bucket(op, ARRAY[1, 3, 9, 'NaN', 'NaN']::float8[]) AS wb
+--@ FROM (VALUES
+--@   (-5.2::float8),
+--@   (4::float8),
+--@   (77::float8),
+--@   ('NaN'::float8)
+--@ ) v(op);
 
 -- these exercise the generic fixed-width code path
-SELECT
-    op,
-    width_bucket(op, ARRAY[1, 3, 5, 10]) AS wb_1
-FROM generate_series(0,11) as op;
-
-SELECT width_bucket(now(),
-                    array['yesterday', 'today', 'tomorrow']::timestamptz[]);
+--@ SELECT
+--@     op,
+--@     width_bucket(op, ARRAY[1, 3, 5, 10]) AS wb_1
+--@ FROM generate_series(0,11) as op;
+--@ 
+--@ SELECT width_bucket(now(),
+--@                     array['yesterday', 'today', 'tomorrow']::timestamptz[]);
 
 -- corner cases
-SELECT width_bucket(5, ARRAY[3]);
-SELECT width_bucket(5, '{}');
+--@ SELECT width_bucket(5, ARRAY[3]);
+--@ SELECT width_bucket(5, '{}');
 
 -- error cases
-SELECT width_bucket('5'::text, ARRAY[3, 4]::integer[]);
-SELECT width_bucket(5, ARRAY[3, 4, NULL]);
-SELECT width_bucket(5, ARRAY[ARRAY[1, 2], ARRAY[3, 4]]);
+--@ SELECT width_bucket('5'::text, ARRAY[3, 4]::integer[]);
+--@ SELECT width_bucket(5, ARRAY[3, 4, NULL]);
+--@ SELECT width_bucket(5, ARRAY[ARRAY[1, 2], ARRAY[3, 4]]);
 
 -- trim_array
 
-SELECT arr, trim_array(arr, 2)
-FROM
-(VALUES ('{1,2,3,4,5,6}'::bigint[]),
-        ('{1,2}'),
-        ('[10:16]={1,2,3,4,5,6,7}'),
-        ('[-15:-10]={1,2,3,4,5,6}'),
-        ('{{1,10},{2,20},{3,30},{4,40}}')) v(arr);
-
-SELECT trim_array(ARRAY[1, 2, 3], -1); -- fail
-SELECT trim_array(ARRAY[1, 2, 3], 10); -- fail
+--@ SELECT arr, trim_array(arr, 2)
+--@ FROM
+--@ (VALUES ('{1,2,3,4,5,6}'::bigint[]),
+--@         ('{1,2}'),
+--@         ('[10:16]={1,2,3,4,5,6,7}'),
+--@         ('[-15:-10]={1,2,3,4,5,6}'),
+--@         ('{{1,10},{2,20},{3,30},{4,40}}')) v(arr);
+--@ 
+--@ SELECT trim_array(ARRAY[1, 2, 3], -1); -- fail
+--@ SELECT trim_array(ARRAY[1, 2, 3], 10); -- fail
diff --git a/src/tests/regress/data/sql/interval.sql b/src/tests/regress/data/sql/interval.sql
index b0c22dcb25159..fd8fbcf14c502 100644
--- a/src/tests/regress/data/sql/interval.sql
+++ b/src/tests/regress/data/sql/interval.sql
@@ -111,17 +111,17 @@ INSERT INTO INTERVAL_MULDIV_TBL VALUES
 ('14 mon'),
 ('999 mon 999 days');
 
---@ SELECT span * 0.3 AS product
---@ FROM INTERVAL_MULDIV_TBL;
---@ 
---@ SELECT span * 8.2 AS product
---@ FROM INTERVAL_MULDIV_TBL;
---@ 
---@ SELECT span / 10 AS quotient
---@ FROM INTERVAL_MULDIV_TBL;
---@ 
---@ SELECT span / 100 AS quotient
---@ FROM INTERVAL_MULDIV_TBL;
+SELECT span * 0.3 AS product
+FROM INTERVAL_MULDIV_TBL;
+
+SELECT span * 8.2 AS product
+FROM INTERVAL_MULDIV_TBL;
+
+SELECT span / 10 AS quotient
+FROM INTERVAL_MULDIV_TBL;
+
+SELECT span / 100 AS quotient
+FROM INTERVAL_MULDIV_TBL;
 
 DROP TABLE INTERVAL_MULDIV_TBL;
 
diff --git a/src/tests/simulation/Cargo.toml b/src/tests/simulation/Cargo.toml
index 55e1c6ba4fd73..6fd353dfb56c5 100644
--- a/src/tests/simulation/Cargo.toml
+++ b/src/tests/simulation/Cargo.toml
@@ -23,6 +23,7 @@ itertools = "0.10"
 lru = { git = "https://github.com/risingwavelabs/lru-rs.git", branch = "evict_by_timestamp" }
 madsim = "0.2.17"
 paste = "1"
+pin-project = "1.0"
 pretty_assertions = "1"
 rand = "0.8"
 rdkafka = { package = "madsim-rdkafka", version = "=0.2.14-alpha", features = ["cmake-build"] }
diff --git a/src/tests/simulation/src/cluster.rs b/src/tests/simulation/src/cluster.rs
index 5224f389e1b67..78d2a03902858 100644
--- a/src/tests/simulation/src/cluster.rs
+++ b/src/tests/simulation/src/cluster.rs
@@ -16,19 +16,30 @@ use std::collections::HashMap;
 use std::future::Future;
 use std::io::Write;
 use std::path::PathBuf;
-use std::sync::LazyLock;
+use std::sync::{Arc, LazyLock};
 use std::time::Duration;
 
 use anyhow::{bail, Result};
 use clap::Parser;
+use futures::channel::{mpsc, oneshot};
 use futures::future::join_all;
+use futures::{SinkExt, StreamExt};
 use madsim::net::ipvs::*;
 use madsim::runtime::{Handle, NodeHandle};
+use madsim::task::JoinHandle;
 use rand::Rng;
 use sqllogictest::AsyncDB;
 
 use crate::client::RisingWave;
 
+/// Embed the config file and create a temporary file at runtime.
+static CONFIG_PATH: LazyLock<tempfile::TempPath> = LazyLock::new(|| {
+    let mut file = tempfile::NamedTempFile::new().expect("failed to create temp config file");
+    file.write_all(include_bytes!("risingwave.toml"))
+        .expect("failed to write config file");
+    file.into_temp_path()
+});
+
 /// RisingWave cluster configuration.
 #[derive(Debug, Clone)]
 pub struct Configuration {
@@ -46,9 +57,6 @@ pub struct Configuration {
     /// The number of meta nodes.
     pub meta_nodes: usize,
 
-    /// Extra CLI arguments for meta nodes.
-    pub meta_node_extra_args: Vec<&'static str>,
-
     /// The number of compactor nodes.
     pub compactor_nodes: usize,
 
@@ -68,16 +76,10 @@ impl Configuration {
     /// Returns the config for scale test.
     pub fn for_scale() -> Self {
         Configuration {
-            config_path: "".to_string(),
+            config_path: CONFIG_PATH.as_os_str().to_string_lossy().into(),
             frontend_nodes: 2,
             compute_nodes: 3,
             meta_nodes: 1,
-            meta_node_extra_args: vec![
-                "--barrier-interval-ms",
-                "250",
-                "--checkpoint-frequency",
-                "4",
-            ],
             compactor_nodes: 2,
             compute_node_cores: 2,
             etcd_timeout_rate: 0.0,
@@ -196,25 +198,21 @@ impl Cluster {
 
         // meta node
         for i in 1..=conf.meta_nodes {
-            let opts = risingwave_meta::MetaNodeOpts::parse_from(
-                [
-                    vec![
-                        "meta-node",
-                        "--config-path",
-                        &conf.config_path,
-                        "--listen-addr",
-                        "0.0.0.0:5690",
-                        "--advertise-addr",
-                        &format!("meta-{i}:5690"),
-                        "--backend",
-                        "etcd",
-                        "--etcd-endpoints",
-                        "etcd:2388",
-                    ],
-                    conf.meta_node_extra_args.clone(),
-                ]
-                .concat(),
-            );
+            let opts = risingwave_meta::MetaNodeOpts::parse_from([
+                "meta-node",
+                "--config-path",
+                &conf.config_path,
+                "--listen-addr",
+                "0.0.0.0:5690",
+                "--advertise-addr",
+                &format!("meta-{i}:5690"),
+                "--backend",
+                "etcd",
+                "--etcd-endpoints",
+                "etcd:2388",
+                "--state-store",
+                "hummock+minio://hummockadmin:hummockadmin@192.168.12.1:9301/hummock001",
+            ]);
             handle
                 .create_node()
                 .name(format!("meta-{i}"))
@@ -255,8 +253,8 @@ impl Cluster {
                 "0.0.0.0:5688",
                 "--advertise-addr",
                 &format!("192.168.3.{i}:5688"),
-                "--state-store",
-                "hummock+minio://hummockadmin:hummockadmin@192.168.12.1:9301/hummock001",
+                "--total-memory-bytes",
+                "6979321856",
                 "--parallelism",
                 &conf.compute_node_cores.to_string(),
             ]);
@@ -279,8 +277,6 @@ impl Cluster {
                 "0.0.0.0:6660",
                 "--advertise-addr",
                 &format!("192.168.4.{i}:6660"),
-                "--state-store",
-                "hummock+minio://hummockadmin:hummockadmin@192.168.12.1:9301/hummock001",
             ]);
             handle
                 .create_node()
@@ -315,35 +311,47 @@ impl Cluster {
         })
     }
 
-    /// Run a SQL query from the client.
-    pub async fn run(&mut self, sql: impl Into<String>) -> Result<String> {
-        let sql = sql.into();
+    /// Start a SQL session on the client node.
+    pub fn start_session(&mut self) -> Session {
+        let (query_tx, mut query_rx) = mpsc::channel::<SessionRequest>(0);
 
-        let result = self
-            .client
-            .spawn(async move {
-                // TODO: reuse session
-                let mut session = RisingWave::connect("frontend".into(), "dev".into())
+        self.client.spawn(async move {
+            let mut client = RisingWave::connect("frontend".into(), "dev".into()).await?;
+
+            while let Some((sql, tx)) = query_rx.next().await {
+                let result = client
+                    .run(&sql)
                     .await
-                    .expect("failed to connect to RisingWave");
-                let result = session.run(&sql).await?;
-                Ok::<_, anyhow::Error>(result)
-            })
-            .await??;
-
-        match result {
-            sqllogictest::DBOutput::Rows { rows, .. } => Ok(rows
-                .into_iter()
-                .map(|row| {
-                    row.into_iter()
-                        .map(|v| v.to_string())
-                        .collect::<Vec<_>>()
-                        .join(" ")
-                })
-                .collect::<Vec<_>>()
-                .join("\n")),
-            _ => Ok("".to_string()),
-        }
+                    .map(|output| match output {
+                        sqllogictest::DBOutput::Rows { rows, .. } => rows
+                            .into_iter()
+                            .map(|row| {
+                                row.into_iter()
+                                    .map(|v| v.to_string())
+                                    .collect::<Vec<_>>()
+                                    .join(" ")
+                            })
+                            .collect::<Vec<_>>()
+                            .join("\n"),
+                        _ => "".to_string(),
+                    })
+                    .map_err(Into::into);
+
+                let _ = tx.send(result);
+            }
+
+            Ok::<_, anyhow::Error>(())
+        });
+
+        Session { query_tx }
+    }
+
+    /// Run a SQL query on a **new** session of the client node.
+    ///
+    /// This is a convenience method that creates a new session and runs the query on it. If you
+    /// want to run multiple queries on the same session, use `start_session` and `Session::run`.
+    pub async fn run(&mut self, sql: impl Into<String>) -> Result<String> {
+        self.start_session().run(sql).await
     }
 
     /// Run a future on the client node.
@@ -524,6 +532,26 @@ impl Cluster {
     }
 }
 
+type SessionRequest = (
+    String,                          // query sql
+    oneshot::Sender<Result<String>>, // channel to send result back
+);
+
+/// A SQL session on the simulated client node.
+#[derive(Debug, Clone)]
+pub struct Session {
+    query_tx: mpsc::Sender<SessionRequest>,
+}
+
+impl Session {
+    /// Run the given SQL query on the session.
+    pub async fn run(&mut self, sql: impl Into<String>) -> Result<String> {
+        let (tx, rx) = oneshot::channel();
+        self.query_tx.send((sql.into(), tx)).await?;
+        rx.await?
+    }
+}
+
 /// Options for killing nodes.
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub struct KillOpts {
diff --git a/src/tests/simulation/src/ctl_ext.rs b/src/tests/simulation/src/ctl_ext.rs
index 562ee1345737b..769a331f5f1b6 100644
--- a/src/tests/simulation/src/ctl_ext.rs
+++ b/src/tests/simulation/src/ctl_ext.rs
@@ -24,7 +24,7 @@ use rand::seq::{IteratorRandom, SliceRandom};
 use rand::Rng;
 use risingwave_common::hash::ParallelUnitId;
 use risingwave_pb::meta::table_fragments::fragment::FragmentDistributionType;
-use risingwave_pb::meta::table_fragments::Fragment as ProstFragment;
+use risingwave_pb::meta::table_fragments::PbFragment;
 use risingwave_pb::meta::GetClusterInfoResponse;
 use risingwave_pb::stream_plan::StreamNode;
 
@@ -35,10 +35,10 @@ use crate::cluster::Cluster;
 pub mod predicate {
     use super::*;
 
-    trait Predicate = Fn(&ProstFragment) -> bool + Send + 'static;
+    trait Predicate = Fn(&PbFragment) -> bool + Send + 'static;
     pub type BoxedPredicate = Box<dyn Predicate>;
 
-    fn root(fragment: &ProstFragment) -> &StreamNode {
+    fn root(fragment: &PbFragment) -> &StreamNode {
         fragment.actors.first().unwrap().nodes.as_ref().unwrap()
     }
 
@@ -58,7 +58,7 @@ pub mod predicate {
     /// There're exactly `n` operators whose identity contains `s` in the fragment.
     pub fn identity_contains_n(n: usize, s: impl Into<String>) -> BoxedPredicate {
         let s: String = s.into();
-        let p = move |f: &ProstFragment| {
+        let p = move |f: &PbFragment| {
             count(root(f), &|n| {
                 n.identity.to_lowercase().contains(&s.to_lowercase())
             }) == n
@@ -69,7 +69,7 @@ pub mod predicate {
     /// There exists operators whose identity contains `s` in the fragment.
     pub fn identity_contains(s: impl Into<String>) -> BoxedPredicate {
         let s: String = s.into();
-        let p = move |f: &ProstFragment| {
+        let p = move |f: &PbFragment| {
             any(root(f), &|n| {
                 n.identity.to_lowercase().contains(&s.to_lowercase())
             })
@@ -80,7 +80,7 @@ pub mod predicate {
     /// There does not exist any operator whose identity contains `s` in the fragment.
     pub fn no_identity_contains(s: impl Into<String>) -> BoxedPredicate {
         let s: String = s.into();
-        let p = move |f: &ProstFragment| {
+        let p = move |f: &PbFragment| {
             all(root(f), &|n| {
                 !n.identity.to_lowercase().contains(&s.to_lowercase())
             })
@@ -90,20 +90,22 @@ pub mod predicate {
 
     /// There're `n` upstream fragments of the fragment.
     pub fn upstream_fragment_count(n: usize) -> BoxedPredicate {
-        let p = move |f: &ProstFragment| f.upstream_fragment_ids.len() == n;
+        let p = move |f: &PbFragment| f.upstream_fragment_ids.len() == n;
         Box::new(p)
     }
 
     /// The fragment is able to be rescheduled. Used for locating random fragment.
     pub fn can_reschedule() -> BoxedPredicate {
-        // The rescheduling of `Chain` must be derived from the upstream `Materialize`, not
-        // specified by the user.
-        no_identity_contains("StreamTableScan")
+        // The rescheduling of no-shuffle downstreams must be derived from the upstream
+        // `Materialize`, not specified by the user.
+        let p =
+            |f: &PbFragment| no_identity_contains("Chain")(f) && no_identity_contains("Lookup")(f);
+        Box::new(p)
     }
 
     /// The fragment with the given id.
     pub fn id(id: u32) -> BoxedPredicate {
-        let p = move |f: &ProstFragment| f.fragment_id == id;
+        let p = move |f: &PbFragment| f.fragment_id == id;
         Box::new(p)
     }
 }
diff --git a/src/tests/simulation/src/main.rs b/src/tests/simulation/src/main.rs
index 92607c205b8f0..219db2ae4844c 100644
--- a/src/tests/simulation/src/main.rs
+++ b/src/tests/simulation/src/main.rs
@@ -159,7 +159,6 @@ async fn main() {
         compactor_nodes: args.compactor_nodes,
         compute_node_cores: args.compute_node_cores,
         meta_nodes: args.meta_nodes,
-        meta_node_extra_args: vec![],
         etcd_timeout_rate: args.etcd_timeout_rate,
         etcd_data_path: args.etcd_data,
     };
diff --git a/src/tests/simulation/src/nexmark/create_source.sql b/src/tests/simulation/src/nexmark/create_source.sql
index b2676f0c597df..e2624e6a716c6 100644
--- a/src/tests/simulation/src/nexmark/create_source.sql
+++ b/src/tests/simulation/src/nexmark/create_source.sql
@@ -1,14 +1,14 @@
 create source auction (
     id BIGINT,
-    "item_name" VARCHAR,
+    item_name VARCHAR,
     description VARCHAR,
-    "initial_bid" BIGINT,
+    initial_bid BIGINT,
     reserve BIGINT,
-    "date_time" TIMESTAMP,
+    date_time TIMESTAMP,
     expires TIMESTAMP,
     seller BIGINT,
     category BIGINT,
-    "extra" VARCHAR
+    extra VARCHAR
     {watermark_column})
 with (
     connector = 'nexmark',
@@ -20,10 +20,10 @@ create source bid (
     auction BIGINT,
     bidder BIGINT,
     price BIGINT,
-    "channel" VARCHAR,
-    "url" VARCHAR,
-    "date_time" TIMESTAMP,
-    "extra" VARCHAR
+    channel VARCHAR,
+    url VARCHAR,
+    date_time TIMESTAMP,
+    extra VARCHAR
     {watermark_column})
 with (
     connector = 'nexmark',
@@ -34,12 +34,12 @@ with (
 create source person (
     id BIGINT,
     name VARCHAR,
-    "email_address" VARCHAR,
-    "credit_card" VARCHAR,
+    email_address VARCHAR,
+    credit_card VARCHAR,
     city VARCHAR,
     state VARCHAR,
-    "date_time" TIMESTAMP,
-    "extra" VARCHAR
+    date_time TIMESTAMP,
+    extra VARCHAR
     {watermark_column})
 with (
     connector = 'nexmark',
diff --git a/src/tests/simulation/src/risingwave.toml b/src/tests/simulation/src/risingwave.toml
new file mode 100644
index 0000000000000..b88e8a0644f7c
--- /dev/null
+++ b/src/tests/simulation/src/risingwave.toml
@@ -0,0 +1,10 @@
+# The configuration for scaling simulation test.
+#
+# Note: this file is embedded in the binary and cannot be changed without recompiling.
+
+[system]
+barrier_interval_ms = 250
+checkpoint_frequency = 4
+
+[server]
+telemetry_enabled = false
diff --git a/src/tests/simulation/src/slt.rs b/src/tests/simulation/src/slt.rs
index d85d1d6bf7b3e..9dc83472b98e6 100644
--- a/src/tests/simulation/src/slt.rs
+++ b/src/tests/simulation/src/slt.rs
@@ -21,6 +21,7 @@ use sqllogictest::ParallelTestError;
 
 use crate::client::RisingWave;
 use crate::cluster::{Cluster, KillOpts};
+use crate::utils::TimedExt;
 
 fn is_create_table_as(sql: &str) -> bool {
     let parts: Vec<String> = sql
@@ -112,7 +113,13 @@ pub async fn run_slt_task(cluster: Arc<Cluster>, glob: &str, opts: &KillOpts) {
 
             // For normal records.
             if !kill {
-                match tester.run_async(record).await {
+                match tester
+                    .run_async(record.clone())
+                    .timed(|_res, elapsed| {
+                        tracing::debug!("Record {:?} finished in {:?}", record, elapsed)
+                    })
+                    .await
+                {
                     Ok(_) => continue,
                     Err(e) => panic!("{}", e),
                 }
@@ -128,7 +135,13 @@ pub async fn run_slt_task(cluster: Arc<Cluster>, glob: &str, opts: &KillOpts) {
             if cmd.ignore_kill() {
                 for i in 0usize.. {
                     let delay = Duration::from_secs(1 << i);
-                    if let Err(err) = tester.run_async(record.clone()).await {
+                    if let Err(err) = tester
+                        .run_async(record.clone())
+                        .timed(|_res, elapsed| {
+                            tracing::debug!("Record {:?} finished in {:?}", record, elapsed)
+                        })
+                        .await
+                    {
                         // cluster could be still under recovering if killed before, retry if
                         // meets `no reader for dml in table with id {}`.
                         let should_retry =
@@ -162,7 +175,13 @@ pub async fn run_slt_task(cluster: Arc<Cluster>, glob: &str, opts: &KillOpts) {
             // retry up to 5 times until it succeed
             for i in 0usize.. {
                 let delay = Duration::from_secs(1 << i);
-                match tester.run_async(record.clone()).await {
+                match tester
+                    .run_async(record.clone())
+                    .timed(|_res, elapsed| {
+                        tracing::debug!("Record {:?} finished in {:?}", record, elapsed)
+                    })
+                    .await
+                {
                     Ok(_) => break,
                     // allow 'table exists' error when retry CREATE statement
                     Err(e)
diff --git a/src/tests/simulation/src/utils.rs b/src/tests/simulation/src/utils/assert_result.rs
similarity index 100%
rename from src/tests/simulation/src/utils.rs
rename to src/tests/simulation/src/utils/assert_result.rs
diff --git a/src/tests/simulation/src/utils/mod.rs b/src/tests/simulation/src/utils/mod.rs
new file mode 100644
index 0000000000000..b3b726467e613
--- /dev/null
+++ b/src/tests/simulation/src/utils/mod.rs
@@ -0,0 +1,19 @@
+// Copyright 2023 RisingWave Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod assert_result;
+pub use assert_result::*;
+
+mod timed_future;
+pub use timed_future::*;
diff --git a/src/tests/simulation/src/utils/timed_future.rs b/src/tests/simulation/src/utils/timed_future.rs
new file mode 100644
index 0000000000000..b9003552a0ac8
--- /dev/null
+++ b/src/tests/simulation/src/utils/timed_future.rs
@@ -0,0 +1,76 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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::future::Future;
+use std::pin::{pin, Pin};
+use std::task::{Context, Poll};
+use std::time::{Duration, Instant};
+
+use pin_project::pin_project;
+
+/// Inspired by https://stackoverflow.com/a/59935743/2990323
+/// A wrapper around a Future which adds timing data.
+#[pin_project]
+pub struct Timed<Fut, F>
+where
+    Fut: Future,
+    F: Fn(&Fut::Output, Duration),
+{
+    #[pin]
+    inner: Fut,
+    f: F,
+    start: Option<Instant>,
+}
+
+impl<Fut, F> Future for Timed<Fut, F>
+where
+    Fut: Future,
+    F: Fn(&Fut::Output, Duration),
+{
+    type Output = Fut::Output;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
+        let this = self.project();
+        let start = this.start.get_or_insert_with(Instant::now);
+
+        match this.inner.poll(cx) {
+            // If the inner future is still pending, this wrapper is still pending.
+            Poll::Pending => Poll::Pending,
+
+            // If the inner future is done, measure the elapsed time and finish this wrapper future.
+            Poll::Ready(v) => {
+                let elapsed = start.elapsed();
+                (this.f)(&v, elapsed);
+
+                Poll::Ready(v)
+            }
+        }
+    }
+}
+
+pub trait TimedExt: Sized + Future {
+    fn timed<F>(self, f: F) -> Timed<Self, F>
+    where
+        F: Fn(&Self::Output, Duration),
+    {
+        Timed {
+            inner: self,
+            f,
+            start: None,
+        }
+    }
+}
+
+// All futures can use the `.timed` method defined above
+impl<F: Future> TimedExt for F {}
diff --git a/src/tests/simulation/tests/it/cascade_materialized_view.rs b/src/tests/simulation/tests/it/cascade_materialized_view.rs
index f3bcaf7c82283..4e3dd4a2695de 100644
--- a/src/tests/simulation/tests/it/cascade_materialized_view.rs
+++ b/src/tests/simulation/tests/it/cascade_materialized_view.rs
@@ -33,9 +33,10 @@ const MV5: &str = "create materialized view m5 as select * from m4;";
 #[madsim::test]
 async fn test_simple_cascade_materialized_view() -> Result<()> {
     let mut cluster = Cluster::start(Configuration::for_scale()).await?;
+    let mut session = cluster.start_session();
 
-    cluster.run(ROOT_TABLE_CREATE).await?;
-    cluster.run(MV1).await?;
+    session.run(ROOT_TABLE_CREATE).await?;
+    session.run(MV1).await?;
 
     let fragment = cluster
         .locate_one_fragment([
@@ -62,17 +63,17 @@ async fn test_simple_cascade_materialized_view() -> Result<()> {
         fragment.inner.actors.len()
     );
 
-    cluster
+    session
         .run(&format!(
             "insert into t1 values {}",
             (1..=10).map(|x| format!("({x})")).join(",")
         ))
         .await?;
 
-    cluster.run("flush").await?;
+    session.run("flush").await?;
 
     // v1 > 5, result is [6, 7, 8, 9, 10]
-    cluster
+    session
         .run("select count(*) from m1")
         .await?
         .assert_result_eq("5");
@@ -92,21 +93,21 @@ async fn test_simple_cascade_materialized_view() -> Result<()> {
         fragment.inner.actors.len()
     );
 
-    cluster
+    session
         .run("select count(*) from m1")
         .await?
         .assert_result_eq("5");
 
-    cluster
+    session
         .run(&format!(
             "insert into t1 values {}",
             (11..=20).map(|x| format!("({x})")).join(",")
         ))
         .await?;
 
-    cluster.run("flush").await?;
+    session.run("flush").await?;
     // 10 < v1 < 15, result is [11, 12, 13, 14]
-    cluster
+    session
         .run("select count(*) from m1")
         .await?
         .assert_result_eq("15");
@@ -117,13 +118,14 @@ async fn test_simple_cascade_materialized_view() -> Result<()> {
 #[madsim::test]
 async fn test_diamond_cascade_materialized_view() -> Result<()> {
     let mut cluster = Cluster::start(Configuration::for_scale()).await?;
+    let mut session = cluster.start_session();
 
-    cluster.run(ROOT_TABLE_CREATE).await?;
-    cluster.run(MV1).await?;
-    cluster.run(MV2).await?;
-    cluster.run(MV3).await?;
-    cluster.run(MV4).await?;
-    cluster.run(MV5).await?;
+    session.run(ROOT_TABLE_CREATE).await?;
+    session.run(MV1).await?;
+    session.run(MV2).await?;
+    session.run(MV3).await?;
+    session.run(MV4).await?;
+    session.run(MV5).await?;
 
     let fragment = cluster
         .locate_one_fragment([
@@ -141,15 +143,15 @@ async fn test_diamond_cascade_materialized_view() -> Result<()> {
     let fragment = cluster.locate_fragment_by_id(id).await?;
     assert_eq!(fragment.inner.actors.len(), 1);
 
-    cluster
+    session
         .run(&format!(
             "insert into t1 values {}",
             (1..=10).map(|x| format!("({x})")).join(",")
         ))
         .await?;
 
-    cluster.run("flush").await?;
-    cluster
+    session.run("flush").await?;
+    session
         .run("select count(*) from m5")
         .await?
         .assert_result_eq("0");
@@ -160,20 +162,20 @@ async fn test_diamond_cascade_materialized_view() -> Result<()> {
     let fragment = cluster.locate_fragment_by_id(id).await?;
     assert_eq!(fragment.inner.actors.len(), 6);
 
-    cluster
+    session
         .run("select count(*) from m5")
         .await?
         .assert_result_eq("0");
 
-    cluster
+    session
         .run(&format!(
             "insert into t1 values {}",
             (11..=20).map(|x| format!("({x})")).join(",")
         ))
         .await?;
 
-    cluster.run("flush").await?;
-    cluster
+    session.run("flush").await?;
+    session
         .run("select count(*) from m5")
         .await?
         .assert_result_eq("4");
diff --git a/src/tests/simulation/tests/it/delta_join.rs b/src/tests/simulation/tests/it/delta_join.rs
new file mode 100644
index 0000000000000..7f109e7db3126
--- /dev/null
+++ b/src/tests/simulation/tests/it/delta_join.rs
@@ -0,0 +1,123 @@
+// Copyright 2023 RisingWave Labs
+//
+// 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.
+
+#![cfg(madsim)]
+
+use anyhow::Result;
+use itertools::Itertools;
+use risingwave_simulation::cluster::{Cluster, Configuration};
+use risingwave_simulation::ctl_ext::predicate::identity_contains;
+use risingwave_simulation::utils::AssertResult;
+
+#[madsim::test]
+async fn test_delta_join() -> Result<()> {
+    let mut cluster = Cluster::start(Configuration::for_scale()).await?;
+    let mut session = cluster.start_session();
+
+    session.run("set rw_implicit_flush = true;").await?;
+    session
+        .run("set rw_streaming_enable_delta_join = true;")
+        .await?;
+
+    session
+        .run("create table a (a1 int primary key, a2 int);")
+        .await?;
+    session
+        .run("create table b (b1 int primary key, b2 int);")
+        .await?;
+    let [t1, t2]: [_; 2] = cluster
+        .locate_fragments([identity_contains("materialize")])
+        .await?
+        .try_into()
+        .unwrap();
+
+    session
+        .run("create materialized view v as select * from a join b on a.a1 = b.b1;")
+        .await?;
+    let lookup_fragments = cluster
+        .locate_fragments([identity_contains("lookup")])
+        .await?;
+    assert_eq!(lookup_fragments.len(), 2, "failed to plan delta join");
+    let union_fragment = cluster
+        .locate_one_fragment([identity_contains("union")])
+        .await?;
+
+    let mut test_times = 0;
+    macro_rules! test_works {
+        () => {
+            let keys = || (0..100).map(|i| test_times * 100 + i);
+
+            for key in keys() {
+                session
+                    .run(format!("insert into a values ({key}, 233)"))
+                    .await?;
+                session
+                    .run(format!("insert into b values ({key}, 666)"))
+                    .await?;
+            }
+            session.run("flush").await?;
+
+            let result = keys()
+                .rev()
+                .map(|key| format!("{key} 233 {key} 666"))
+                .join("\n");
+
+            session
+                .run("select * from v order by a1 desc limit 100;")
+                .await?
+                .assert_result_eq(result);
+
+            #[allow(unused_assignments)]
+            test_times += 1;
+        };
+    }
+
+    test_works!();
+
+    // Scale-in one side
+    cluster.reschedule(format!("{}-[0]", t1.id())).await?;
+    test_works!();
+
+    // Scale-in both sides together
+    cluster
+        .reschedule(format!("{}-[2];{}-[0,2]", t1.id(), t2.id()))
+        .await?;
+    test_works!();
+
+    // Scale-out one side
+    cluster.reschedule(format!("{}+[0]", t2.id())).await?;
+    test_works!();
+
+    // Scale-out both sides together
+    cluster
+        .reschedule(format!("{}+[0,2];{}+[2]", t1.id(), t2.id()))
+        .await?;
+    test_works!();
+
+    // Scale-in join with union
+    cluster
+        .reschedule(format!("{}-[5];{}-[5]", t1.id(), union_fragment.id()))
+        .await?;
+    test_works!();
+
+    let result = cluster
+        .reschedule(format!("{}-[0]", lookup_fragments[0].id()))
+        .await;
+    assert!(
+        result.is_err(),
+        "directly scale-in lookup (downstream) should fail"
+    );
+
+    Ok(())
+}
diff --git a/src/tests/simulation/tests/it/dynamic_filter.rs b/src/tests/simulation/tests/it/dynamic_filter.rs
index e03432498d5dc..4736a2cdcfd1d 100644
--- a/src/tests/simulation/tests/it/dynamic_filter.rs
+++ b/src/tests/simulation/tests/it/dynamic_filter.rs
@@ -28,12 +28,13 @@ const SELECT: &str = "select * from mv1 order by v1;";
 #[madsim::test]
 async fn test_dynamic_filter() -> Result<()> {
     let mut cluster = Cluster::start(Configuration::for_scale()).await?;
+    let mut session = cluster.start_session();
 
-    cluster.run("create table t1 (v1 int);").await?;
-    cluster.run("create table t2 (v2 int);").await?;
-    cluster.run("create materialized view mv1 as with max_v2 as (select max(v2) max from t2) select v1 from t1, max_v2 where v1 > max;").await?;
-    cluster.run("insert into t1 values (1), (2), (3)").await?;
-    cluster.run("flush").await?;
+    session.run("create table t1 (v1 int);").await?;
+    session.run("create table t2 (v2 int);").await?;
+    session.run("create materialized view mv1 as with max_v2 as (select max(v2) max from t2) select v1 from t1, max_v2 where v1 > max;").await?;
+    session.run("insert into t1 values (1), (2), (3)").await?;
+    session.run("flush").await?;
     sleep(Duration::from_secs(5)).await;
 
     let dynamic_filter_fragment = cluster
@@ -60,53 +61,53 @@ async fn test_dynamic_filter() -> Result<()> {
     cluster.reschedule(format!("{id}-[1,2,3]")).await?;
     sleep(Duration::from_secs(3)).await;
 
-    cluster.run(SELECT).await?.assert_result_eq("");
-    cluster.run("insert into t2 values (0)").await?;
-    cluster.run("flush").await?;
+    session.run(SELECT).await?.assert_result_eq("");
+    session.run("insert into t2 values (0)").await?;
+    session.run("flush").await?;
     sleep(Duration::from_secs(5)).await;
-    cluster.run(SELECT).await?.assert_result_eq("1\n2\n3");
+    session.run(SELECT).await?.assert_result_eq("1\n2\n3");
     // 1
     // 2
     // 3
 
     cluster.reschedule(format!("{id}-[4,5]+[1,2,3]")).await?;
     sleep(Duration::from_secs(3)).await;
-    cluster.run(SELECT).await?.assert_result_eq("1\n2\n3");
+    session.run(SELECT).await?.assert_result_eq("1\n2\n3");
 
-    cluster.run("insert into t2 values (2)").await?;
-    cluster.run("flush").await?;
+    session.run("insert into t2 values (2)").await?;
+    session.run("flush").await?;
     sleep(Duration::from_secs(5)).await;
-    cluster.run(SELECT).await?.assert_result_eq("3");
+    session.run(SELECT).await?.assert_result_eq("3");
     // 3
 
     cluster.reschedule(format!("{id}-[1,2,3]+[4,5]")).await?;
     sleep(Duration::from_secs(3)).await;
-    cluster.run(SELECT).await?.assert_result_eq("3");
+    session.run(SELECT).await?.assert_result_eq("3");
 
-    cluster.run("update t2 set v2 = 1 where v2 = 2").await?;
-    cluster.run("flush").await?;
+    session.run("update t2 set v2 = 1 where v2 = 2").await?;
+    session.run("flush").await?;
     sleep(Duration::from_secs(5)).await;
-    cluster.run(SELECT).await?.assert_result_eq("2\n3");
+    session.run(SELECT).await?.assert_result_eq("2\n3");
     // 2
     // 3
     //
     cluster.reschedule(format!("{id}+[1,2,3]")).await?;
     sleep(Duration::from_secs(3)).await;
-    cluster.run(SELECT).await?.assert_result_eq("2\n3");
+    session.run(SELECT).await?.assert_result_eq("2\n3");
 
-    cluster.run("delete from t2 where true").await?;
-    cluster.run("flush").await?;
+    session.run("delete from t2 where true").await?;
+    session.run("flush").await?;
     sleep(Duration::from_secs(5)).await;
-    cluster.run(SELECT).await?.assert_result_eq("");
+    session.run(SELECT).await?.assert_result_eq("");
 
     cluster.reschedule(format!("{id}-[1]")).await?;
     sleep(Duration::from_secs(3)).await;
-    cluster.run(SELECT).await?.assert_result_eq("");
+    session.run(SELECT).await?.assert_result_eq("");
 
-    cluster.run("insert into t2 values (1)").await?;
-    cluster.run("flush").await?;
+    session.run("insert into t2 values (1)").await?;
+    session.run("flush").await?;
     sleep(Duration::from_secs(5)).await;
-    cluster.run(SELECT).await?.assert_result_eq("2\n3");
+    session.run(SELECT).await?.assert_result_eq("2\n3");
 
     Ok(())
 }
diff --git a/src/tests/simulation/tests/it/main.rs b/src/tests/simulation/tests/it/main.rs
index 6fed15c83f22c..ee2f7f003b535 100644
--- a/src/tests/simulation/tests/it/main.rs
+++ b/src/tests/simulation/tests/it/main.rs
@@ -17,7 +17,10 @@
 //! See [this post](https://matklad.github.io/2021/02/27/delete-cargo-integration-tests.html)
 //! for the rationale behind this approach.
 
+#![feature(stmt_expr_attributes)]
+
 mod cascade_materialized_view;
+mod delta_join;
 mod dynamic_filter;
 mod hello;
 mod nexmark_chaos;
diff --git a/src/tests/simulation/tests/it/nexmark_chaos.rs b/src/tests/simulation/tests/it/nexmark_chaos.rs
index f800b8ade7034..34905b5e2f199 100644
--- a/src/tests/simulation/tests/it/nexmark_chaos.rs
+++ b/src/tests/simulation/tests/it/nexmark_chaos.rs
@@ -41,15 +41,17 @@ async fn nexmark_chaos_common_inner(
 ) -> Result<()> {
     let mut cluster =
         NexmarkCluster::new(Configuration::for_scale(), 6, Some(20 * THROUGHPUT), false).await?;
-    cluster.run(create).await?;
+    let mut session = cluster.start_session();
+    session.run(create).await?;
     sleep(Duration::from_secs(30)).await;
-    let final_result = cluster.run(select).await?;
-    cluster.run(drop).await?;
+    let final_result = session.run(select).await?;
+    session.run(drop).await?;
     sleep(Duration::from_secs(5)).await;
 
     println!("Reference run done.");
-
-    cluster.run(create).await?;
+    // Create a new session for the chaos run.
+    let mut session = cluster.start_session();
+    session.run(create).await?;
 
     let _initial_result = cluster
         .wait_until_non_empty(select, initial_interval, initial_timeout)
@@ -68,7 +70,7 @@ async fn nexmark_chaos_common_inner(
         cluster.reschedule(join_plans(fragments)).await?;
 
         sleep(after_scale_duration).await;
-        cluster.run(select).await?.assert_result_ne(&final_result);
+        session.run(select).await?.assert_result_ne(&final_result);
 
         let fragments = cluster.locate_random_fragments().await?;
         cluster.reschedule(join_plans(fragments)).await?;
@@ -78,7 +80,7 @@ async fn nexmark_chaos_common_inner(
         cluster.reschedule(fragment.random_reschedule()).await?;
 
         sleep(after_scale_duration).await;
-        cluster.run(select).await?.assert_result_ne(&final_result);
+        session.run(select).await?.assert_result_ne(&final_result);
 
         let fragment = cluster.locate_fragment_by_id(id).await?;
         cluster.reschedule(fragment.random_reschedule()).await?;
@@ -86,7 +88,7 @@ async fn nexmark_chaos_common_inner(
 
     sleep(Duration::from_secs(50)).await;
 
-    cluster.run(select).await?.assert_result_eq(&final_result);
+    session.run(select).await?.assert_result_eq(&final_result);
 
     Ok(())
 }
diff --git a/src/tests/simulation/tests/it/singleton_migration.rs b/src/tests/simulation/tests/it/singleton_migration.rs
index e480b7aedb555..7b4482de26c1a 100644
--- a/src/tests/simulation/tests/it/singleton_migration.rs
+++ b/src/tests/simulation/tests/it/singleton_migration.rs
@@ -32,10 +32,11 @@ const CASCADE_MV: &str = "create materialized view m2 as select * from m1;";
 #[madsim::test]
 async fn test_singleton_migration() -> Result<()> {
     let mut cluster = Cluster::start(Configuration::for_scale()).await?;
+    let mut session = cluster.start_session();
 
-    cluster.run(ROOT_TABLE_CREATE).await?;
-    cluster.run(ROOT_MV).await?;
-    cluster.run(CASCADE_MV).await?;
+    session.run(ROOT_TABLE_CREATE).await?;
+    session.run(ROOT_MV).await?;
+    session.run(CASCADE_MV).await?;
 
     let fragment = cluster
         .locate_one_fragment(vec![
@@ -69,16 +70,16 @@ async fn test_singleton_migration() -> Result<()> {
 
     sleep(Duration::from_secs(3)).await;
 
-    cluster
+    session
         .run(&format!(
             "insert into t values {}",
             (1..=10).map(|x| format!("({x})")).join(",")
         ))
         .await?;
 
-    cluster.run("flush").await?;
+    session.run("flush").await?;
 
-    cluster
+    session
         .run("select * from m2")
         .await?
         .assert_result_eq("10");
@@ -94,16 +95,16 @@ async fn test_singleton_migration() -> Result<()> {
 
     sleep(Duration::from_secs(3)).await;
 
-    cluster
+    session
         .run(&format!(
             "insert into t values {}",
             (11..=20).map(|x| format!("({x})")).join(",")
         ))
         .await?;
 
-    cluster.run("flush").await?;
+    session.run("flush").await?;
 
-    cluster
+    session
         .run("select * from m2")
         .await?
         .assert_result_eq("20");
diff --git a/src/tests/simulation/tests/it/sink.rs b/src/tests/simulation/tests/it/sink.rs
index a92043c3c5a90..ac95d98cffade 100644
--- a/src/tests/simulation/tests/it/sink.rs
+++ b/src/tests/simulation/tests/it/sink.rs
@@ -28,9 +28,9 @@ use risingwave_simulation::cluster::{Cluster, Configuration};
 use risingwave_simulation::ctl_ext::predicate::{identity_contains, no_identity_contains};
 
 const ROOT_TABLE_CREATE: &str = "create table t (v1 int) append only;";
-const APPEND_ONLY_SINK_CREATE: &str = "create sink s1 from t with (connector='kafka', properties.bootstrap.server='192.168.11.1:29092', topic='t_sink_append_only', format='append_only');";
+const APPEND_ONLY_SINK_CREATE: &str = "create sink s1 from t with (connector='kafka', properties.bootstrap.server='192.168.11.1:29092', topic='t_sink_append_only', type='append-only');";
 const MV_CREATE: &str = "create materialized view m as select count(*) from t;";
-const DEBEZIUM_SINK_CREATE: &str = "create sink s2 from m with (connector='kafka', properties.bootstrap.server='192.168.11.1:29092', topic='t_sink_debezium', format='debezium');";
+const DEBEZIUM_SINK_CREATE: &str = "create sink s2 from m with (connector='kafka', properties.bootstrap.server='192.168.11.1:29092', topic='t_sink_debezium', type='debezium');";
 
 const APPEND_ONLY_TOPIC: &str = "t_sink_append_only";
 const DEBEZIUM_TOPIC: &str = "t_sink_debezium";
diff --git a/src/tests/simulation/tests/it/streaming_parallelism.rs b/src/tests/simulation/tests/it/streaming_parallelism.rs
index 24d678eb7234b..38c074aeeed2a 100644
--- a/src/tests/simulation/tests/it/streaming_parallelism.rs
+++ b/src/tests/simulation/tests/it/streaming_parallelism.rs
@@ -15,10 +15,8 @@
 #![cfg(madsim)]
 
 use anyhow::Result;
-use risingwave_simulation::client::RisingWave;
 use risingwave_simulation::cluster::{Cluster, Configuration};
 use risingwave_simulation::ctl_ext::predicate::identity_contains;
-use sqllogictest::runner::AsyncDB;
 
 #[madsim::test]
 async fn test_streaming_parallelism_default() -> Result<()> {
@@ -32,33 +30,19 @@ async fn test_streaming_parallelism_default() -> Result<()> {
     Ok(())
 }
 
-async fn run_sqls_in_session(cluster: &Cluster, sqls: Vec<String>) {
-    cluster
-        .run_on_client(async move {
-            let mut session = RisingWave::connect("frontend".into(), "dev".into())
-                .await
-                .expect("failed to connect to RisingWave");
-            for sql in sqls {
-                session.run(&sql).await.unwrap();
-            }
-        })
-        .await;
-}
-
 #[madsim::test]
 async fn test_streaming_parallelism_set_some() -> Result<()> {
     let mut cluster = Cluster::start(Configuration::for_scale()).await?;
     let default_parallelism = cluster.config().compute_nodes * cluster.config().compute_node_cores;
     let target_parallelism = default_parallelism - 1;
     assert!(target_parallelism > 0);
-    run_sqls_in_session(
-        &cluster,
-        vec![
-            format!("set streaming_parallelism={};", target_parallelism),
-            "create table t1 (c1 int, c2 int);".to_string(),
-        ],
-    )
-    .await;
+
+    let mut session = cluster.start_session();
+    session
+        .run(format!("set streaming_parallelism={};", target_parallelism))
+        .await?;
+    session.run("create table t1 (c1 int, c2 int);").await?;
+
     let materialize_fragment = cluster
         .locate_one_fragment([identity_contains("materialize")])
         .await?;
@@ -70,14 +54,11 @@ async fn test_streaming_parallelism_set_some() -> Result<()> {
 async fn test_streaming_parallelism_set_zero() -> Result<()> {
     let mut cluster = Cluster::start(Configuration::for_scale()).await?;
     let default_parallelism = cluster.config().compute_nodes * cluster.config().compute_node_cores;
-    run_sqls_in_session(
-        &cluster,
-        vec![
-            "set streaming_parallelism=0;".to_string(),
-            "create table t1 (c1 int, c2 int);".to_string(),
-        ],
-    )
-    .await;
+
+    let mut session = cluster.start_session();
+    session.run("set streaming_parallelism=0;").await?;
+    session.run("create table t1 (c1 int, c2 int);").await?;
+
     let materialize_fragment = cluster
         .locate_one_fragment([identity_contains("materialize")])
         .await?;
@@ -91,17 +72,22 @@ async fn test_streaming_parallelism_mv_on_mv() -> Result<()> {
     let default_parallelism = cluster.config().compute_nodes * cluster.config().compute_node_cores;
     let target_parallelism = default_parallelism - 1;
     assert!(target_parallelism - 1 > 0);
-    run_sqls_in_session(
-        &cluster,
-        vec![
-            format!("set streaming_parallelism={};", target_parallelism),
-            "create table t1 (c1 int, c2 int);".to_string(),
-            format!("set streaming_parallelism={};", target_parallelism - 1),
-            "create materialized view mv3 as select c1,count(*) as cc from t1 group by c1;"
-                .to_string(),
-        ],
-    )
-    .await;
+
+    let mut session = cluster.start_session();
+    session
+        .run(format!("set streaming_parallelism={};", target_parallelism))
+        .await?;
+    session.run("create table t1 (c1 int, c2 int);").await?;
+    session
+        .run(format!(
+            "set streaming_parallelism={};",
+            target_parallelism - 1
+        ))
+        .await?;
+    session
+        .run("create materialized view mv1 as select c1,count(*) as cc from t1 group by c1;")
+        .await?;
+
     let materialize_fragments = cluster
         .locate_fragments([identity_contains("materialize")])
         .await?;
@@ -123,16 +109,20 @@ async fn test_streaming_parallelism_index() -> Result<()> {
     let default_parallelism = cluster.config().compute_nodes * cluster.config().compute_node_cores;
     let target_parallelism = default_parallelism - 1;
     assert!(target_parallelism - 1 > 0);
-    run_sqls_in_session(
-        &cluster,
-        vec![
-            format!("set streaming_parallelism={};", target_parallelism),
-            "create table t1 (c1 int, c2 int);".to_string(),
-            format!("set streaming_parallelism={};", target_parallelism - 1),
-            "create index idx1 on t1(c2);".to_string(),
-        ],
-    )
-    .await;
+
+    let mut session = cluster.start_session();
+    session
+        .run(format!("set streaming_parallelism={};", target_parallelism))
+        .await?;
+    session.run("create table t1 (c1 int, c2 int);").await?;
+    session
+        .run(format!(
+            "set streaming_parallelism={};",
+            target_parallelism - 1
+        ))
+        .await?;
+    session.run("create index idx1 on t1(c2);").await?;
+
     let materialize_fragments = cluster
         .locate_fragments([identity_contains("materialize")])
         .await?;
diff --git a/src/tests/state_cleaning_test/Cargo.toml b/src/tests/state_cleaning_test/Cargo.toml
index 9129a282ecf99..738b4108b82ec 100644
--- a/src/tests/state_cleaning_test/Cargo.toml
+++ b/src/tests/state_cleaning_test/Cargo.toml
@@ -26,7 +26,7 @@ serde_with = "2"
 tokio = { version = "0.2", package = "madsim-tokio" }
 tokio-postgres = "0.7.7"
 tokio-stream = { version = "0.1", features = ["fs"] }
-toml = "0.4"
+toml = "0.7"
 tracing = "0.1"
 
 [target.'cfg(not(madsim))'.dependencies]
diff --git a/src/udf/python/example.py b/src/udf/python/example.py
index 86c4b8716d794..9b57315b6880a 100644
--- a/src/udf/python/example.py
+++ b/src/udf/python/example.py
@@ -1,6 +1,8 @@
+import socket
 from typing import Iterator
 from risingwave.udf import udf, udtf, UdfServer
 import random
+import struct
 
 
 @udf(input_types=[], result_type='INT')
@@ -32,6 +34,15 @@ def series2(n: int) -> Iterator[tuple[int, str]]:
         yield i, str(i)
 
 
+@udf(input_types=['BINARY'], result_type='STRUCT<src_ip VARCHAR, dst_ip VARCHAR, src_port SMALLINT, dst_port SMALLINT>')
+def extract_tcp_info(tcp_packet: bytes):
+    src_addr, dst_addr = struct.unpack('!4s4s', tcp_packet[12:20])
+    src_port, dst_port = struct.unpack('!HH', tcp_packet[20:24])
+    src_addr = socket.inet_ntoa(src_addr)
+    dst_addr = socket.inet_ntoa(dst_addr)
+    return src_addr, dst_addr, src_port, dst_port
+
+
 if __name__ == '__main__':
     server = UdfServer(location="0.0.0.0:8815")
     server.add_function(random_int)
@@ -39,4 +50,5 @@ def series2(n: int) -> Iterator[tuple[int, str]]:
     server.add_function(gcd3)
     server.add_function(series)
     server.add_function(series2)
+    server.add_function(extract_tcp_info)
     server.serve()
diff --git a/src/udf/python/risingwave/udf.py b/src/udf/python/risingwave/udf.py
index 55ff4bb99d2cd..c2d617d1068cb 100644
--- a/src/udf/python/risingwave/udf.py
+++ b/src/udf/python/risingwave/udf.py
@@ -3,6 +3,7 @@
 import pyarrow.flight
 import pyarrow.parquet
 import inspect
+import traceback
 
 
 class UserDefinedFunction:
@@ -26,17 +27,17 @@ class ScalarFunction(UserDefinedFunction):
     or multiple scalar values to a new scalar value.
     """
 
-    def eval(self, *args):
+    def eval(self, *args) -> Any:
         """
         Method which defines the logic of the scalar function.
         """
         pass
 
     def eval_batch(self, batch: pa.RecordBatch) -> pa.RecordBatch:
-        result = pa.array([self.eval(*[col[i].as_py() for col in batch])
-                           for i in range(batch.num_rows)],
-                          type=self._result_schema.types[0])
-        return pa.RecordBatch.from_arrays([result], schema=self._result_schema)
+        column = [self.eval(*[col[i].as_py() for col in batch])
+                  for i in range(batch.num_rows)]
+        array = pa.array(column, type=self._result_schema.types[0])
+        return pa.RecordBatch.from_arrays([array], schema=self._result_schema)
 
 
 class TableFunction(UserDefinedFunction):
@@ -45,18 +46,26 @@ class TableFunction(UserDefinedFunction):
     or multiple table values to a new table value.
     """
 
-    def eval(self, *args):
+    def eval(self, *args) -> Iterator:
         """
         Method which defines the logic of the table function.
         """
-        pass
+        yield
 
     def eval_batch(self, batch: pa.RecordBatch) -> pa.RecordBatch:
-        # only the first row from batch is used
-        res = self.eval(*[col[0].as_py() for col in batch])
-        columns = zip(*res) if len(self._result_schema) > 1 else [res]
-        arrays = [pa.array(col, type)
-                  for col, type in zip(columns, self._result_schema.types)]
+        result_rows = []
+        # Iterate through rows in the input RecordBatch
+        for row_index in range(batch.num_rows):
+            row = tuple(column[row_index].as_py() for column in batch)
+            result_rows.extend(self.eval(*row))
+
+        result_columns = zip(
+            *result_rows) if len(self._result_schema) > 1 else [result_rows]
+
+        # Convert the result columns to arrow arrays
+        arrays = [
+            pa.array(col, type) for col, type in zip(result_columns, self._result_schema.types)
+        ]
         return pa.RecordBatch.from_arrays(arrays, schema=self._result_schema)
 
 
@@ -205,7 +214,11 @@ def do_exchange(self, context, descriptor, reader, writer):
         writer.begin(udf._result_schema)
         for chunk in reader:
             # print(pa.Table.from_batches([chunk.data]))
-            result = udf.eval_batch(chunk.data)
+            try:
+                result = udf.eval_batch(chunk.data)
+            except Exception as e:
+                print(traceback.print_exc())
+                raise e
             writer.write_batch(result)
 
     def serve(self):
@@ -253,5 +266,15 @@ def _string_to_data_type(type_str: str):
             return pa.string()
         case 'BINARY' | 'VARBINARY':
             return pa.binary()
-        case _:
-            raise ValueError(f'Unsupported type: {type_str}')
+
+    # extract 'STRUCT<a INT, b VARCHAR, ...>'
+    if type_str.startswith('STRUCT'):
+        type_str = type_str[6:].strip('<>')
+        fields = []
+        for field in type_str.split(','):
+            field = field.strip()
+            name, type_str = field.split(' ')
+            fields.append(pa.field(name, _string_to_data_type(type_str)))
+        return pa.struct(fields)
+
+    raise ValueError(f'Unsupported type: {type_str}')
diff --git a/src/udf/python/setup.py b/src/udf/python/setup.py
index 934d4c1078eae..09b65766853f6 100644
--- a/src/udf/python/setup.py
+++ b/src/udf/python/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="risingwave",
-    version="0.0.2",
+    version="0.0.3",
     author="RisingWave Labs",
     description="RisingWave Python API",
     long_description=long_description,
diff --git a/src/utils/pgwire/Cargo.toml b/src/utils/pgwire/Cargo.toml
index 381aa8e84d20e..58170963f716c 100644
--- a/src/utils/pgwire/Cargo.toml
+++ b/src/utils/pgwire/Cargo.toml
@@ -22,7 +22,7 @@ bytes = "1"
 chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
 itertools = "0.10"
-openssl = "0.10.3"
+openssl = "0.10.48"
 pg_interval = "0.4"
 postgres-types = { version = "0.2.4", features = ["derive","with-chrono-0_4"] }
 regex = "1.5"
diff --git a/src/utils/pgwire/src/pg_extended.rs b/src/utils/pgwire/src/pg_extended.rs
index 32471659ff9f4..4e2b8a509bd76 100644
--- a/src/utils/pgwire/src/pg_extended.rs
+++ b/src/utils/pgwire/src/pg_extended.rs
@@ -625,9 +625,7 @@ mod tests {
     use pg_interval::Interval;
     // Note this useful idiom: importing names from outer (for mod tests) scope.
     use postgres_types::private::BytesMut;
-    use risingwave_common::types::{
-        DataType, NaiveDateTimeWrapper, NaiveDateWrapper, NaiveTimeWrapper,
-    };
+    use risingwave_common::types::{DataType, Date, Time, Timestamp};
     use tokio_postgres::types::{ToSql, Type};
 
     use crate::pg_extended::PreparedStatement;
@@ -815,15 +813,9 @@ mod tests {
         );
 
         let raw_params = vec![
-            NaiveDateWrapper::from_ymd_uncheck(2021, 1, 1)
-                .0
-                .to_string()
-                .into(),
-            NaiveTimeWrapper::from_hms_uncheck(12, 0, 0)
-                .0
-                .to_string()
-                .into(),
-            NaiveDateTimeWrapper::from_timestamp_uncheck(1610000000, 0)
+            Date::from_ymd_uncheck(2021, 1, 1).0.to_string().into(),
+            Time::from_hms_uncheck(12, 0, 0).0.to_string().into(),
+            Timestamp::from_timestamp_uncheck(1610000000, 0)
                 .0
                 .to_string()
                 .into(),
@@ -922,15 +914,15 @@ mod tests {
 
         // Test DATE, TIME, TIMESTAMP type.
         let mut raw_params = vec![BytesMut::new(); 3];
-        NaiveDateWrapper::from_ymd_uncheck(2021, 1, 1)
+        Date::from_ymd_uncheck(2021, 1, 1)
             .0
             .to_sql(&place_hodler, &mut raw_params[0])
             .unwrap();
-        NaiveTimeWrapper::from_hms_uncheck(12, 0, 0)
+        Time::from_hms_uncheck(12, 0, 0)
             .0
             .to_sql(&place_hodler, &mut raw_params[1])
             .unwrap();
-        NaiveDateTimeWrapper::from_timestamp_uncheck(1610000000, 0)
+        Timestamp::from_timestamp_uncheck(1610000000, 0)
             .0
             .to_sql(&place_hodler, &mut raw_params[2])
             .unwrap();
@@ -953,7 +945,7 @@ mod tests {
 
         // Test TIMESTAMPTZ, INTERVAL type.
         let mut raw_params = vec![BytesMut::new(); 2];
-        DateTime::<Utc>::from_utc(NaiveDateTimeWrapper::from_timestamp_uncheck(1200, 0).0, Utc)
+        DateTime::<Utc>::from_utc(Timestamp::from_timestamp_uncheck(1200, 0).0, Utc)
             .to_sql(&place_hodler, &mut raw_params[0])
             .unwrap();
         let interval = Interval::new(1, 1, 24000000);
diff --git a/src/utils/pgwire/src/pg_response.rs b/src/utils/pgwire/src/pg_response.rs
index 14e9c989fb6c6..cc2abfd9900dd 100644
--- a/src/utils/pgwire/src/pg_response.rs
+++ b/src/utils/pgwire/src/pg_response.rs
@@ -63,7 +63,12 @@ pub enum StatementType {
     DROP_SCHEMA,
     DROP_DATABASE,
     DROP_USER,
+    ALTER_INDEX,
+    ALTER_VIEW,
     ALTER_TABLE,
+    ALTER_MATERIALIZED_VIEW,
+    ALTER_SINK,
+    ALTER_SOURCE,
     ALTER_SYSTEM,
     REVOKE_PRIVILEGE,
     // Introduce ORDER_BY statement type cuz Calcite unvalidated AST has SqlKind.ORDER_BY. Note
diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml
index 5c82906fbe736..4b425b9fbe8b8 100644
--- a/src/workspace-hack/Cargo.toml
+++ b/src/workspace-hack/Cargo.toml
@@ -21,7 +21,6 @@ publish = false
 ahash = { version = "0.8" }
 anyhow = { version = "1", features = ["backtrace"] }
 arrayvec = { version = "0.7", default-features = false, features = ["std"] }
-auto_enums = { version = "0.7", features = ["futures"] }
 aws-sdk-s3 = { version = "0.21", features = ["native-tls"] }
 aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] }
 aws-types = { version = "0.51", default-features = false, features = ["hardcoded-credentials"] }
@@ -84,6 +83,7 @@ regex = { version = "1" }
 regex-syntax = { version = "0.6" }
 reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"] }
 ring = { version = "0.16", features = ["std"] }
+rust_decimal = { version = "1", features = ["db-postgres", "db-tokio-postgres"] }
 scopeguard = { version = "1" }
 serde = { version = "1", features = ["alloc", "derive", "rc"] }
 serde_json = { version = "1", features = ["alloc"] }
@@ -94,11 +94,11 @@ strum = { version = "0.24", features = ["derive"] }
 subtle = { version = "2" }
 time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] }
 tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "parking_lot", "process", "rt-multi-thread", "signal", "stats", "sync", "time", "tracing"] }
+tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "87ca1dc", features = ["with-chrono-0_4"] }
 tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "0c25710", features = ["fs", "net"] }
 tokio-util = { version = "0.7", features = ["codec", "io"] }
 tonic = { version = "0.8", features = ["gzip", "tls-webpki-roots"] }
 tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] }
-tower-http = { version = "0.3", features = ["add-extension", "cors", "map-response-body", "util"] }
 tracing = { version = "0.1", features = ["log", "release_max_level_trace"] }
 tracing-core = { version = "0.1" }
 tracing-futures = { version = "0.2" }
@@ -113,8 +113,7 @@ zstd-sys = { version = "2", default-features = false, features = ["legacy", "std
 ahash = { version = "0.8" }
 anyhow = { version = "1", features = ["backtrace"] }
 arrayvec = { version = "0.7", default-features = false, features = ["std"] }
-auto_enums = { version = "0.7", features = ["futures"] }
-auto_enums_derive = { version = "0.7", default-features = false, features = ["futures", "std"] }
+auto_enums = { version = "0.8", features = ["futures03"] }
 aws-sdk-s3 = { version = "0.21", features = ["native-tls"] }
 aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] }
 aws-types = { version = "0.51", default-features = false, features = ["hardcoded-credentials"] }
@@ -179,6 +178,7 @@ regex = { version = "1" }
 regex-syntax = { version = "0.6" }
 reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"] }
 ring = { version = "0.16", features = ["std"] }
+rust_decimal = { version = "1", features = ["db-postgres", "db-tokio-postgres"] }
 scopeguard = { version = "1" }
 serde = { version = "1", features = ["alloc", "derive", "rc"] }
 serde_json = { version = "1", features = ["alloc"] }
@@ -190,12 +190,12 @@ subtle = { version = "2" }
 syn = { version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] }
 time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] }
 tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "parking_lot", "process", "rt-multi-thread", "signal", "stats", "sync", "time", "tracing"] }
+tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "87ca1dc", features = ["with-chrono-0_4"] }
 tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "0c25710", features = ["fs", "net"] }
 tokio-util = { version = "0.7", features = ["codec", "io"] }
 tonic = { version = "0.8", features = ["gzip", "tls-webpki-roots"] }
 tonic-build = { version = "0.8" }
 tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "retry", "timeout", "util"] }
-tower-http = { version = "0.3", features = ["add-extension", "cors", "map-response-body", "util"] }
 tracing = { version = "0.1", features = ["log", "release_max_level_trace"] }
 tracing-core = { version = "0.1" }
 tracing-futures = { version = "0.2" }